summaryrefslogtreecommitdiffstats
path: root/source/Root.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Root.cpp (renamed from source/cRoot.cpp)29
1 files changed, 13 insertions, 16 deletions
diff --git a/source/cRoot.cpp b/source/Root.cpp
index 6cd696da8..2a6afc0e7 100644
--- a/source/cRoot.cpp
+++ b/source/Root.cpp
@@ -1,21 +1,20 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "cRoot.h"
-#include "cServer.h"
-#include "cWorld.h"
-#include "cWebAdmin.h"
-#include "cFurnaceRecipe.h"
-#include "cGroupManager.h"
+#include "Root.h"
+#include "Server.h"
+#include "World.h"
+#include "WebAdmin.h"
+#include "FurnaceRecipe.h"
+#include "GroupManager.h"
#include "CraftingRecipes.h"
-#include "cPluginManager.h"
-#include "cMonsterConfig.h"
-#include "cFileFormatUpdater.h"
-#include "cRedstone.h"
-#include "cPlayer.h"
-#include "blocks/Block.h"
-#include "items/Item.h"
-#include "cChunk.h"
+#include "PluginManager.h"
+#include "MonsterConfig.h"
+#include "Redstone.h"
+#include "Player.h"
+#include "blocks/BlockHandler.h"
+#include "items/ItemHandler.h"
+#include "Chunk.h"
#ifdef USE_SQUIRREL
#include "squirrelbindings/SquirrelFunctions.h"
@@ -94,8 +93,6 @@ void cRoot::Start()
LoadGlobalSettings();
- cFileFormatUpdater::UpdateFileFormat();
-
LOG("Creating new server instance...");
m_Server = new cServer();