X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fruntime.cpp;h=486259a45cb0d89eb25d265ed8a9becf0d7b0c2b;hb=e1209ec25c4cc91e13889876106f56bd51aa96e2;hp=8ce7b5dd59562fa989487ae635cc266849939349;hpb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;p=blank.git

diff --git a/src/app/runtime.cpp b/src/app/runtime.cpp
index 8ce7b5d..486259a 100644
--- a/src/app/runtime.cpp
+++ b/src/app/runtime.cpp
@@ -1,13 +1,13 @@
 #include "Application.hpp"
 #include "Environment.hpp"
 #include "Runtime.hpp"
-#include "ServerState.hpp"
-#include "WorldState.hpp"
 
 #include "init.hpp"
 #include "../client/MasterState.hpp"
 #include "../io/filesystem.hpp"
 #include "../io/WorldSave.hpp"
+#include "../server/ServerState.hpp"
+#include "../standalone/MasterState.hpp"
 
 #include <cctype>
 #include <cstdlib>
@@ -324,7 +324,7 @@ void Runtime::RunStandalone() {
 	}
 
 	Application app(env);
-	WorldState world_state(env, config.gen, config.interface, config.world, save);
+	standalone::MasterState world_state(env, config.gen, config.interface, config.world, save);
 	app.PushState(&world_state);
 	Run(app);
 }
@@ -342,7 +342,7 @@ void Runtime::RunServer() {
 	}
 
 	HeadlessApplication app(env);
-	ServerState server_state(env, config.gen, config.world, save, config.server);
+	server::ServerState server_state(env, config.gen, config.world, save, config.server);
 	app.PushState(&server_state);
 	Run(app);
 }