summaryrefslogtreecommitdiffstats
path: root/src/Root.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Root.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/Root.h b/src/Root.h
index 2393871da..2092bb9be 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -1,13 +1,13 @@
#pragma once
-#include "Protocol/Authenticator.h"
-#include "Protocol/MojangAPI.h"
-#include "HTTP/HTTPServer.h"
+#include "BlockTypeRegistry.h"
#include "Defines.h"
#include "FunctionRef.h"
+#include "HTTP/HTTPServer.h"
+#include "Protocol/Authenticator.h"
+#include "Protocol/MojangAPI.h"
#include "RankManager.h"
-#include "BlockTypeRegistry.h"
@@ -146,7 +146,7 @@ public:
void TickCommands(void);
/** Returns the number of chunks loaded */
- int GetTotalChunkCount(void); // tolua_export
+ size_t GetTotalChunkCount(void); // tolua_export
/** Saves all chunks in all worlds */
void SaveAllChunks(void); // tolua_export
@@ -214,7 +214,7 @@ private:
cCommandOutputCallback * m_Output;
} ;
- typedef std::map<AString, cWorld *> WorldMap;
+ typedef std::map<AString, cWorld> WorldMap;
typedef std::vector<cCommand> cCommandQueue;
cWorld * m_pDefaultWorld;
@@ -268,12 +268,6 @@ private:
/** Stops each world's threads, so that it's safe to unload them */
void StopWorlds(cDeadlockDetect & a_DeadlockDetect);
- /** Unloads all worlds from memory */
- void UnloadWorlds(void);
-
- /** Does the actual work of executing a command */
- void DoExecuteConsoleCommand(const AString & a_Cmd);
-
static cRoot * s_Root;
static void InputThread(cRoot & a_Params);