1
This commit is contained in:
parent
e83a1d2a4e
commit
711e253f18
@ -166,7 +166,7 @@ int Room::AliveCount()
|
||||
void Room::AddPlayer(Player* hum)
|
||||
{
|
||||
assert(gas_data.gas_mode == GasInactive);
|
||||
hum->born_point = AllocBornPoint();
|
||||
hum->born_point = AllocBornPoint(hum);
|
||||
if (!hum->born_point) {
|
||||
hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 100;
|
||||
hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 200;
|
||||
@ -268,7 +268,7 @@ void Room::CreateAndroid(int robot_num)
|
||||
hum->meta = hum_meta;
|
||||
hum->robot_meta = robot_meta;
|
||||
hum->entity_uniid = AllocUniid();
|
||||
hum->born_point = AllocBornPoint();
|
||||
hum->born_point = AllocBornPoint(hum);
|
||||
if (!hum->born_point) {
|
||||
hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 1400;
|
||||
hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 1500;
|
||||
@ -1483,7 +1483,7 @@ void Room::NotifyWxVoip()
|
||||
&xtimer_attacher.timer_list_);
|
||||
}
|
||||
|
||||
BornPoint* Room::AllocBornPoint()
|
||||
BornPoint* Room::AllocBornPoint(Human* hum)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
@ -120,7 +120,7 @@ private:
|
||||
void OnGameOver();
|
||||
void RandRemoveAndroid();
|
||||
void NotifyWxVoip();
|
||||
BornPoint* AllocBornPoint();
|
||||
BornPoint* AllocBornPoint(Human* hum);
|
||||
|
||||
private:
|
||||
int elapsed_time_ = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user