Correcting a bug with unimplemented MonsterManager

This commit is contained in:
Kayne Ruse
2015-03-07 15:09:19 +11:00
parent a8c309ec9d
commit 01502372c9
3 changed files with 18 additions and 14 deletions
+6
View File
@@ -67,6 +67,12 @@ function dumpTrigger(t)
print(triggerSystem.Trigger.GetHandle(t), originX, originY, bx, by, bw, bh, s) print(triggerSystem.Trigger.GetHandle(t), originX, originY, bx, by, bw, bh, s)
end end
function dumpTable(t)
for k, v in pairs(t) do
print("", k, v)
end
end
--[[ --[[
triggerMgr = roomSystem.Room.GetTriggerMgr(overworld) triggerMgr = roomSystem.Room.GetTriggerMgr(overworld)
trigger1, uid1 = triggerSystem.TriggerManager.Create(triggerMgr, "handle1") trigger1, uid1 = triggerSystem.TriggerManager.Create(triggerMgr, "handle1")
+11 -11
View File
@@ -30,45 +30,45 @@ MonsterManager::~MonsterManager() {
} }
int MonsterManager::Create(std::string) { int MonsterManager::Create(std::string) {
//Create //TODO: (9) MonsterManager::Create()
} }
void MonsterManager::Unload(int uid) { void MonsterManager::Unload(int uid) {
//Unload //TODO: (9) MonsterManager::Unload()
} }
void MonsterManager::UnloadAll() { void MonsterManager::UnloadAll() {
//UnloadAll //TODO: (9) MonsterManager::UnloadAll()
} }
void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData const&>)> fn) { void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData const&>)> fn) {
//UnloadIf //TODO: (9) MonsterManager::UnloadIf()
} }
MonsterData* MonsterManager::Get(int uid) { MonsterData* MonsterManager::Get(int uid) {
//Get //TODO: (9) MonsterManager::Get()
} }
int MonsterManager::GetLoadedCount() { int MonsterManager::GetLoadedCount() {
//GetLoadedCount //TODO: (9) MonsterManager::GetLoadedCount()
} }
std::map<int, MonsterData>* MonsterManager::GetContainer() { std::map<int, MonsterData>* MonsterManager::GetContainer() {
//GetContainer //TODO: (9) MonsterManager::GetContainer()
} }
lua_State* MonsterManager::SetLuaState(lua_State* L) { lua_State* MonsterManager::SetLuaState(lua_State* L) {
//SetLuaState //TODO: (9) MonsterManager::SetLuaState()
} }
lua_State* MonsterManager::GetLuaState() { lua_State* MonsterManager::GetLuaState() {
//GetLuaState //TODO: (9) MonsterManager::GetLuaState()
} }
sqlite3* MonsterManager::SetDatabase(sqlite3* db) { sqlite3* MonsterManager::SetDatabase(sqlite3* db) {
//SetDatabase //TODO: (9) MonsterManager::SetDatabase()
} }
sqlite3* MonsterManager::GetDatabase() { sqlite3* MonsterManager::GetDatabase() {
//GetDatabase //TODO: (9) MonsterManager::GetDatabase()
} }
+1 -3
View File
@@ -43,9 +43,7 @@ void RoomData::RunFrame() {
for (auto& it : characterList) { for (auto& it : characterList) {
it->Update(); it->Update();
} }
for (auto& it : *monsterMgr.GetContainer()) { //TODO: (3) iterate through the monster map
it.second.Update();
}
//compare the triggers to the entities, using their real hitboxes //compare the triggers to the entities, using their real hitboxes
for (auto& it : *triggerMgr.GetContainer()) { for (auto& it : *triggerMgr.GetContainer()) {