Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added creatures to the room containers

Browse Source
This commit is contained in:
Kayne Ruse
2016-03-25 22:29:26 +11:00
parent 18f119224a
commit 9a1714a881
8 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/rooms/room_api.cpp
+12 -16
View File
@@ -50,20 +50,18 @@ static int getTilesetName(lua_State* L) {
return 1;
}
static int getCreatureMgr(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetCreatureMgr()) );
return 1;
}
static int getPager(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetPager()) );
return 1;
}
/*
static int getMonsterMgr(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetMonsterMgr()) );
return 1;
}
*/
static int getTriggerMgr(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetTriggerMgr()) );
@@ -87,12 +85,11 @@ static int forEachCharacter(lua_State* L) {
return 0;
}
/*
static int forEachMonster(lua_State* L) {
static int forEachCreature(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
MonsterManager* monsterMgr = room->GetMonsterMgr();
//pass each monster to the given function
for (auto& it : *monsterMgr->GetContainer()) {
CreatureManager* creatureMgr = room->GetCreatureMgr();
//pass each creature to the given function
for (auto& it : *creatureMgr->GetContainer()) {
lua_pushvalue(L, -1);
lua_pushlightuserdata(L, static_cast<void*>(&it.second));
//call each iteration, throwing an exception if something happened
@@ -105,7 +102,6 @@ static int forEachMonster(lua_State* L) {
}
return 0;
}
*/
static int setOnTick(lua_State* L) {
RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
@@ -139,12 +135,12 @@ static const luaL_Reg roomLib[] = {
{"SetTileset", setTilesetName},
{"GetTileset", getTilesetName},
{"GetCreatureMgr",getCreatureMgr},
{"GetPager",getPager},
// {"GetMonsterMgr",getMonsterMgr},
{"GetTriggerMgr",getTriggerMgr},
{"ForEachCharacter", forEachCharacter},
// {"ForEachMonster", forEachMonster},
{"ForEachCreature", forEachCreature},
{"SetOnTick", setOnTick},
{"GetOnTick", getOnTick},