From 2a866392ee61db8f255029a3ba3f9f39eff87f2c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 18 May 2021 18:51:09 +0800 Subject: [PATCH] 1 --- server/gameserver/car.cc | 9 +++++++++ server/gameserver/car.h | 1 + server/gameserver/room.cc | 2 ++ 3 files changed, 12 insertions(+) diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc index 1d232ae..fcdaaaa 100644 --- a/server/gameserver/car.cc +++ b/server/gameserver/car.cc @@ -258,6 +258,8 @@ void Car::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int cur_buff_id_ = std::get<1>(meta->car_buff_list[cur_buff_idx_]); if (cur_buff_id_ != 0) { MustBeAddBuff(this, cur_buff_id_); + #ifdef DEBUG + #endif } } } @@ -336,3 +338,10 @@ void Car::Explosion(int team_id) } } } + +void Car::SendDebugMsg(const std::string& debug_msg) +{ + for (auto& passenger : passengers_) { + passenger->SendDebugMsg("载具debugmsg: " + debug_msg); + } +} diff --git a/server/gameserver/car.h b/server/gameserver/car.h index fee99a7..c366a3f 100644 --- a/server/gameserver/car.h +++ b/server/gameserver/car.h @@ -34,6 +34,7 @@ class Car : public Creature virtual float GetRadius() override; virtual float GetSpeed() override; virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) override; + virtual void SendDebugMsg(const std::string& debug_msg) override; private: int AllocSeat(); diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index a692afe..f3e0575 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -654,9 +654,11 @@ void Room::RemoveObjectLater(RoomEntity* entity) break; case ET_Car: { + #if 0 entity->RemoveFromAroundPlayers(entity->room); entity->BroadcastDeleteState(entity->room); entity->room->grid_service->RemoveCreature((Car*)entity); + #endif entity->room->RemoveFromMoveableHash((Car*)entity); } break;