X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.cpp;h=650b5e2f8fc7671842356ecbbd7a1f8c3834f6d1;hb=4e1f50035e860a00636ca5d804c267119df99601;hp=7954c8d8003ab6c7e12f9a51bfbb0aaf32e0980b;hpb=6228d634fb31d1ce925d1fdc2dac022629a007ef;p=dragonfireclient.git

diff --git a/src/game.cpp b/src/game.cpp
index 7954c8d80..650b5e2f8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -915,7 +915,6 @@ void the_game(
 	std::string address, // If "", local server is used
 	u16 port,
 	std::wstring &error_message,
-	std::string configpath,
 	ChatBackend &chat_backend,
 	const SubgameSpec &gamespec, // Used for local game,
 	bool simple_singleplayer_mode
@@ -1001,7 +1000,7 @@ void the_game(
 		draw_load_screen(text, device, font,0,25);
 		delete[] text;
 		infostream<<"Creating server"<<std::endl;
-		server = new Server(map_dir, configpath, gamespec,
+		server = new Server(map_dir, gamespec,
 				simple_singleplayer_mode);
 		server->start(port);
 	}
@@ -3340,7 +3339,7 @@ void the_game(
 		*/
 		{
 			TimeTaker timer("endScene");
-			endSceneX(driver);
+			driver->endScene();
 			endscenetime = timer.stop(true);
 		}