X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.cpp;h=3193194affe17a83c162b1657c67ed0d183145df;hb=97d659c9fdf359919d1cb53057553604b3357105;hp=9a9b22f87fa54e840f8caa03b39a8400083bcd42;hpb=df27b854325c1fe96b7bc9f8a1cc227b55896f57;p=minetest.git

diff --git a/src/main.cpp b/src/main.cpp
index 9a9b22f87..3193194af 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -367,6 +367,9 @@ TODO: Merge bahamada's audio stuff (clean patch available)
 
 TODO: Move content_features to mapnode_content_features.{h,cpp} or so
 
+TODO: Fix item use() stuff; dropping a stack of cooked rats and eating
+      it gives 3 hearts and consumes all the rats.
+
 Making it more portable:
 ------------------------
  
@@ -1302,7 +1305,7 @@ int main(int argc, char *argv[])
 		g_timegetter = new SimpleTimeGetter();
 		
 		// Create server
-		Server server(map_dir.c_str());
+		Server server(map_dir.c_str(), configpath);
 		server.start(port);
 		
 		// Run server
@@ -1583,6 +1586,8 @@ int main(int argc, char *argv[])
 
 				password = translatePassword(playername, menudata.password);
 
+				//dstream<<"Main: password hash: '"<<password<<"'"<<std::endl;
+
 				address = wide_to_narrow(menudata.address);
 				int newport = stoi(wide_to_narrow(menudata.port));
 				if(newport != 0)
@@ -1641,7 +1646,8 @@ int main(int argc, char *argv[])
 				password,
 				address,
 				port,
-				error_message
+				error_message,
+				configpath
 			);
 
 		} //try