server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-09-09 19:27:12 +08:00
parent e83a1d2a4e
commit 711e253f18
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/room.cc
View File

@ -166,7 +166,7 @@ int Room::AliveCount()
void Room::AddPlayer(Player* hum) void Room::AddPlayer(Player* hum)
{ {
assert(gas_data.gas_mode == GasInactive); assert(gas_data.gas_mode == GasInactive);
hum->born_point = AllocBornPoint(); hum->born_point = AllocBornPoint(hum);
if (!hum->born_point) { if (!hum->born_point) {
hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 100; hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 100;
hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 200; hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 200;
@ -268,7 +268,7 @@ void Room::CreateAndroid(int robot_num)
hum->meta = hum_meta; hum->meta = hum_meta;
hum->robot_meta = robot_meta; hum->robot_meta = robot_meta;
hum->entity_uniid = AllocUniid(); hum->entity_uniid = AllocUniid();
hum->born_point = AllocBornPoint(); hum->born_point = AllocBornPoint(hum);
if (!hum->born_point) { if (!hum->born_point) {
hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 1400; hum->pos.x = DEFAULT_BORN_POINT_X + rand() % 1400;
hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 1500; hum->pos.y = DEFAULT_BORN_POINT_Y + rand() % 1500;
@ -1483,7 +1483,7 @@ void Room::NotifyWxVoip()
&xtimer_attacher.timer_list_); &xtimer_attacher.timer_list_);
} }
BornPoint* Room::AllocBornPoint() BornPoint* Room::AllocBornPoint(Human* hum)
{ {
return nullptr; return nullptr;
} }

2
server/gameserver/room.h
View File

@ -120,7 +120,7 @@ private:
void OnGameOver(); void OnGameOver();
void RandRemoveAndroid(); void RandRemoveAndroid();
void NotifyWxVoip(); void NotifyWxVoip();
BornPoint* AllocBornPoint(); BornPoint* AllocBornPoint(Human* hum);
private: private:
int elapsed_time_ = 0; int elapsed_time_ = 0;