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

1

Browse Source
This commit is contained in:
aozhiwei 2019-11-20 17:57:22 +08:00
parent e0ff02c234
commit f976854d2d
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/constant.h
View File

@ -81,7 +81,7 @@ enum PropertyType_e
enum MapObjectType_e enum MapObjectType_e
{ {
kMOT_Object = 1, kMOT_Object = 1,
kMOT_SpawnPoint = 2 kMOT_SpawnPoint = 2,
}; };
const char* const PROJ_NAME_FMT = "game%d_gameserver"; const char* const PROJ_NAME_FMT = "game%d_gameserver";

1
server/gameserver/entity.h
View File

@ -30,7 +30,6 @@ class Entity
int grid_id = 0; int grid_id = 0;
std::set<GridCell*> grid_list; std::set<GridCell*> grid_list;
Entity* last_collision_door = nullptr;
Entity(); Entity();
virtual ~Entity(); virtual ~Entity();

1
server/gameserver/framemaker.cc
View File

@ -17,7 +17,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
Entity* entity = itr; Entity* entity = itr;
if (entity->dead && hum->room->frame_no - entity->dead_frameno > 10) { if (entity->dead && hum->room->frame_no - entity->dead_frameno > 10) {
continue; continue;
} else {
} }
entity->FillMFObjectPart(msg->add_part_objects()); entity->FillMFObjectPart(msg->add_part_objects());
} }

5
server/gameserver/human.cc
View File

@ -189,7 +189,6 @@ bool Human::IsCollisionInMapService()
case ET_Obstacle: case ET_Obstacle:
{ {
if (!collider->owner->dead && TestCollision((ColliderComponent*)collider)) { if (!collider->owner->dead && TestCollision((ColliderComponent*)collider)) {
if (last_collision_door != collider->owner) {
Obstacle* obstacle = (Obstacle*)collider->owner; Obstacle* obstacle = (Obstacle*)collider->owner;
if (!obstacle->dead && if (!obstacle->dead &&
obstacle->meta->i->attack_type() == 1 && obstacle->meta->i->attack_type() == 1 &&
@ -198,10 +197,6 @@ bool Human::IsCollisionInMapService()
) { ) {
} }
obstacle->BroadcastFullState(); obstacle->BroadcastFullState();
} else {
Global::last_collider = collider;
return true;
}
} }
} }
break; break;