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

remove entity create_frameno deleted字段

Browse Source
This commit is contained in:
aozhiwei 2020-05-20 15:27:17 +08:00
parent 41546fc2ea
commit 67610ac3cf
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/bullet.cc
View File

@ -246,7 +246,6 @@ void Bullet::MapServiceUpdate()
if (IsBomb()) { if (IsBomb()) {
ProcBomb(); ProcBomb();
} else { } else {
deleted = true;
if (!objects.empty()) { if (!objects.empty()) {
OnHit(objects); OnHit(objects);
} }

4
server/gameserver/entity.h
View File

@ -20,9 +20,7 @@ class Entity
int entity_uniid = 0; int entity_uniid = 0;
EntityType_e entity_type = ET_None; EntityType_e entity_type = ET_None;
EntitySubType_e entity_subtype = EST_None; EntitySubType_e entity_subtype = EST_None;
long long create_frameno = 0;
int updated_times = 0; int updated_times = 0;
bool deleted = false;
bool is_permanent = false; bool is_permanent = false;
MapService* permanent_map_service = nullptr; MapService* permanent_map_service = nullptr;
@ -40,7 +38,7 @@ class Entity
virtual float GetSpeed() { return 1.0f;}; virtual float GetSpeed() { return 1.0f;};
virtual void GetAabbBox(AabbCollider& aabb_box); virtual void GetAabbBox(AabbCollider& aabb_box);
virtual void GetCircleBox(CircleCollider& circle_box); virtual void GetCircleBox(CircleCollider& circle_box);
virtual bool IsDead(Room* room) {}; virtual bool IsDead(Room* room) { return false;};
virtual long long GetDeadFrameNo(Room* room) { return 0;}; virtual long long GetDeadFrameNo(Room* room) { return 0;};
virtual void OnPreCollision(Room* room) {}; virtual void OnPreCollision(Room* room) {};
bool TestCollision(Room* room, Entity* b); bool TestCollision(Room* room, Entity* b);