diff --git a/server/gameserver/entity.cc b/server/gameserver/entity.cc index 41917c7..b9de93c 100644 --- a/server/gameserver/entity.cc +++ b/server/gameserver/entity.cc @@ -42,8 +42,8 @@ bool Entity::TestCollision(Room* room, Entity* b) } OnPreCollision(room); b->OnPreCollision(room); - for (auto& a_collider : colliders) { - for (auto& b_collider : b->colliders) { + for (auto& a_collider : colliders_) { + for (auto& b_collider : b->colliders_) { if (a_collider->Intersect(b_collider)) { return true; } @@ -59,7 +59,7 @@ bool Entity::TestCollision(Room* room,ColliderComponent* b) } OnPreCollision(room); b->owner->OnPreCollision(room); - for (auto& a_collider : colliders) { + for (auto& a_collider : colliders_) { if (a_collider->Intersect(b)) { return true; } @@ -73,7 +73,7 @@ bool Entity::TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider& if (aabb_box.owner) { aabb_box.owner->OnPreCollision(room); } - for (auto& a_collider : colliders) { + for (auto& a_collider : colliders_) { if (a_collider->IntersectEx(aabb_pos, &aabb_box)) { return true; } @@ -83,11 +83,11 @@ bool Entity::TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider& void Entity::ClearColliders() { - for (auto& itr : colliders) { + for (auto& itr : colliders_) { ColliderComponent* collider = itr; DestoryCollider(collider); } - colliders.clear(); + colliders_.clear(); } void Entity::BroadcastFullState(Room* room) @@ -120,7 +120,7 @@ void Entity::BroadcastDeleteState(Room* room) void Entity::AddEntityCollider(ColliderComponent* collider) { - colliders.push_back(collider); + colliders_.push_back(collider); } bool Entity::IsPermanent() diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h index 3e65bd2..9f5df07 100644 --- a/server/gameserver/entity.h +++ b/server/gameserver/entity.h @@ -75,7 +75,7 @@ class Entity } protected: - std::list colliders; + std::list colliders_; private: a8::Vec2 pos_; diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index d33d927..c47df8b 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -18,7 +18,7 @@ RoomObstacle::RoomObstacle():Obstacle() RoomObstacle::~RoomObstacle() { - for (auto& itr : colliders) { + for (auto& itr : colliders_) { ColliderComponent* collider = itr; #ifdef DEBUG a8::UdpLog::Instance()->Debug("OnRemoveCollider %d %d %d",