diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 9bdf93a..09e5774 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2337,41 +2337,6 @@ a8::Vec2 Room::GetDefaultBornPoint() return pos; } -void Room::AddToEntityHash(Entity* entity) -{ - uniid_hash_[entity->entity_uniid] = entity; -} - -void Room::AddToHumanHash(Human* hum) -{ - human_hash_[hum->entity_uniid] = hum; -} - -void Room::AddToAliveHumanHash(Human* hum) -{ - alive_human_hash_[hum->entity_uniid] = hum; -} - -void Room::AddToMoveableHash(MoveableEntity* entity) -{ - moveable_hash_[entity->entity_uniid] = entity; -} - -void Room::AddToAccountHash(Player* hum) -{ - accountid_hash_[hum->account_id] = hum; -} - -void Room::AddToLaterAddHash(RoomEntity* entity) -{ - later_add_hash_[entity->entity_uniid] = entity; -} - -void Room::AddToRemovedRobotHash(Human* hum) -{ - removed_robot_hash_[hum->entity_uniid] = hum; -} - void Room::AddPlayerPostProc(Player* hum) { if (room_type_ == RT_NewBrid) { @@ -2422,6 +2387,41 @@ void Room::AddPlayerPostProc(Player* hum) #endif } +void Room::AddToEntityHash(Entity* entity) +{ + uniid_hash_[entity->entity_uniid] = entity; +} + +void Room::AddToHumanHash(Human* hum) +{ + human_hash_[hum->entity_uniid] = hum; +} + +void Room::AddToAliveHumanHash(Human* hum) +{ + alive_human_hash_[hum->entity_uniid] = hum; +} + +void Room::AddToMoveableHash(MoveableEntity* entity) +{ + moveable_hash_[entity->entity_uniid] = entity; +} + +void Room::AddToAccountHash(Player* hum) +{ + accountid_hash_[hum->account_id] = hum; +} + +void Room::AddToLaterAddHash(RoomEntity* entity) +{ + later_add_hash_[entity->entity_uniid] = entity; +} + +void Room::AddToRemovedRobotHash(Human* hum) +{ + removed_robot_hash_[hum->entity_uniid] = hum; +} + void Room::RemoveFromEntityHash(Entity* entity) { uniid_hash_.erase(entity->entity_uniid);