1
This commit is contained in:
parent
9c122135cf
commit
c728ac4ec5
@ -14,7 +14,15 @@ void Incubator::UnInit()
|
|||||||
|
|
||||||
void Incubator::RecycleAndroid(Human* hum)
|
void Incubator::RecycleAndroid(Human* hum)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
|
room->TouchPlayerList
|
||||||
|
(
|
||||||
|
a8::XParams(),
|
||||||
|
[] (Player* hum, a8::XParams& param)
|
||||||
|
{
|
||||||
|
|
||||||
|
});
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Incubator::AddHoldHuman(Human* hum)
|
void Incubator::AddHoldHuman(Human* hum)
|
||||||
|
@ -2993,6 +2993,9 @@ void Room::AddToHumanHash(Human* hum)
|
|||||||
void Room::AddToAliveHumanHash(Human* hum)
|
void Room::AddToAliveHumanHash(Human* hum)
|
||||||
{
|
{
|
||||||
alive_human_hash_[hum->GetEntityUniId()] = hum;
|
alive_human_hash_[hum->GetEntityUniId()] = hum;
|
||||||
|
if (hum->IsPlayer()) {
|
||||||
|
alive_player_hash_[hum->GetEntityUniId()] = hum;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Room::AddToMoveableHash(MoveableEntity* entity)
|
void Room::AddToMoveableHash(MoveableEntity* entity)
|
||||||
@ -3033,6 +3036,9 @@ void Room::RemoveFromHuamnHash(Human* hum)
|
|||||||
void Room::RemoveFromAliveHumanHash(Human* hum)
|
void Room::RemoveFromAliveHumanHash(Human* hum)
|
||||||
{
|
{
|
||||||
alive_human_hash_.erase(hum->GetEntityUniId());
|
alive_human_hash_.erase(hum->GetEntityUniId());
|
||||||
|
if (hum->IsPlayer()) {
|
||||||
|
alive_player_hash_.erase(hum->GetEntityUniId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Room::RemoveFromLaterAddHash(RoomEntity* entity)
|
void Room::RemoveFromLaterAddHash(RoomEntity* entity)
|
||||||
|
@ -311,6 +311,7 @@ private:
|
|||||||
std::map<int, RoomEntity*> later_add_hash_;
|
std::map<int, RoomEntity*> later_add_hash_;
|
||||||
std::map<int, Human*> human_hash_;
|
std::map<int, Human*> human_hash_;
|
||||||
std::map<int, Human*> alive_human_hash_;
|
std::map<int, Human*> alive_human_hash_;
|
||||||
|
std::map<int, Human*> alive_player_hash_;
|
||||||
std::map<int, Human*> last_human_hash_;
|
std::map<int, Human*> last_human_hash_;
|
||||||
std::map<int, BornPoint> born_point_hash_;
|
std::map<int, BornPoint> born_point_hash_;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user