Removed MonsterManager's Singleton status, RoomData now has mgr members

RoomData now has monsterMgr and waypointMgr members, so that it can
compare it's characters to the monster & waypoints, etc.

RoomManager has been updated. It now has a database reference, which is
passed to the monsterMgr of new rooms. The room API also has functions
which expose these managers to lua.
This commit is contained in:
Kayne Ruse
2015-01-11 19:47:42 +11:00
parent 051ed0f14c
commit d0b2f8e12f
11 changed files with 72 additions and 26 deletions
+4
View File
@@ -27,6 +27,7 @@
#include "singleton.hpp"
#include "lua.hpp"
#include "sqlite3.h"
#include <functional>
#include <map>
@@ -51,6 +52,8 @@ public:
//hooks
lua_State* SetLuaState(lua_State* L);
lua_State* GetLuaState();
sqlite3* SetDatabase(sqlite3* db);
sqlite3* GetDatabase();
private:
friend Singleton<RoomManager>;
@@ -61,6 +64,7 @@ private:
//members
std::map<int, RoomData> elementMap;
lua_State* lua = nullptr;
sqlite3* database = nullptr;
int counter = 0;
};