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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-04 09:34:07 +08:00
parent ca340b7aa2
commit c028457202
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/human.cc
View File

@ -298,10 +298,7 @@ bool Human::IsCollision()
switch (entity->entity_type) {
case ET_Obstacle:
{
if (
(last_collision_door == nullptr || last_collision_door != entity) &&
TestCollision(entity)
){
if (TestCollision(entity)){
objects.push_back(entity);
}
}

4
server/gameserver/room.cc
View File

@ -250,8 +250,8 @@ void Room::CreateAndroid(int robot_num)
hum->robot_meta = robot_meta;
hum->entity_uniid = AllocUniid();
{
hum->pos.x = 200 + rand() % 1400;
hum->pos.y = 300 + rand() % 1500;
hum->pos.x = 200 + rand() % 500;
hum->pos.y = 300 + rand() % 300;
hum->attack_dir = hum->pos;
hum->attack_dir.Normalize();
hum->attack_dir.Rotate(a8::RandAngle());