diff options
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server.h b/src/server.h index 7233ffbe8..4292892c5 100644 --- a/src/server.h +++ b/src/server.h @@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mods.h" #include "inventorymanager.h" #include "subgame.h" -#include "rollback_interface.h" // Needed for rollbackRevertActions() #include "util/numeric.h" #include "util/thread.h" #include "environment.h" @@ -50,6 +49,7 @@ class Inventory; class Player; class PlayerSAO; class IRollbackManager; +class RollbackAction; class EmergeManager; class GameScripting; class ServerEnvironment; @@ -268,9 +268,6 @@ public: // Envlock and conlock should be locked when using scriptapi GameScripting *getScriptIface(){ return m_script; } - // Envlock should be locked when using the rollback manager - IRollbackManager *getRollbackManager(){ return m_rollback; } - //TODO: determine what (if anything) should be locked to access EmergeManager EmergeManager *getEmergeManager(){ return m_emerge; } @@ -289,9 +286,10 @@ public: virtual u16 allocateUnknownNodeId(const std::string &name); virtual ISoundManager* getSoundManager(); virtual MtEventManager* getEventManager(); - virtual IRollbackReportSink* getRollbackReportSink(); virtual scene::ISceneManager* getSceneManager(); - + virtual IRollbackManager *getRollbackManager() { return m_rollback; } + + IWritableItemDefManager* getWritableItemDefManager(); IWritableNodeDefManager* getWritableNodeDefManager(); IWritableCraftDefManager* getWritableCraftDefManager(); @@ -488,7 +486,6 @@ private: // Rollback manager (behind m_env_mutex) IRollbackManager *m_rollback; - bool m_rollback_sink_enabled; bool m_enable_rollback_recording; // Updated once in a while // Emerge manager |