Reimplemented the push/pop entity methods in RoomManager

Some accessors in Entity had to be made const, as they were being called
from lambdas with const parameters.
This commit is contained in:
Kayne Ruse
2015-01-02 23:25:59 +11:00
parent 0344fe0d6d
commit d815f17442
6 changed files with 62 additions and 6 deletions
+31
View File
@@ -57,6 +57,37 @@ void RoomManager::UnloadIf(std::function<bool(std::pair<const int, RoomData cons
}
}
void RoomManager::PushEntity(Entity* entity) {
if (!entity) {
throw(std::runtime_error("Failed to push a null entity to a room"));
}
RoomData* room = Get(entity->GetRoomIndex());
if (!room) {
throw(std::runtime_error("Failed to push an entity to a non-existant room"));
}
room->entityList.push_back(entity);
}
void RoomManager::PopEntity(Entity const* entity) {
//NOTE: to pop an entity from a room, the entity must first exist
if (!entity) {
throw(std::runtime_error("Failed to pop a null entity to a room"));
}
RoomData* room = Get(entity->GetRoomIndex());
if (!room) {
throw(std::runtime_error("Failed to pop an entity to a non-existant room"));
}
room->entityList.remove_if([entity](Entity* ptr) {
return entity == ptr;
});
}
RoomData* RoomManager::Get(int uid) {
std::map<int, RoomData>::iterator it = elementMap.find(uid);