From 6d4ebdff10f8d2fa8f0843971a92d6a64b262e95 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 6 Sep 2021 09:09:12 +0000 Subject: [PATCH] fix GetName --- server/gameserver/car.cc | 5 +++++ server/gameserver/car.h | 1 + server/gameserver/hero.cc | 5 +++++ server/gameserver/hero.h | 1 + 4 files changed, 12 insertions(+) diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc index 90d3ffa..79e984c 100644 --- a/server/gameserver/car.cc +++ b/server/gameserver/car.cc @@ -428,6 +428,11 @@ void Car::GetHitAabbBox(AabbCollider& aabb_box) aabb_box.MoveCenter(hero_meta_->i->hit_offset_x(), hero_meta_->i->hit_offset_y()); } +std::string Car::GetName() +{ + return hero_meta_->i->name(); +} + void Car::SendDebugMsg(const std::string& debug_msg) { #if 1 diff --git a/server/gameserver/car.h b/server/gameserver/car.h index 6b806f6..25855fe 100644 --- a/server/gameserver/car.h +++ b/server/gameserver/car.h @@ -29,6 +29,7 @@ class Car : public Creature virtual void OnExplosionHit(Explosion* e) override; virtual void GetAabbBox(AabbCollider& aabb_box) override; virtual void GetHitAabbBox(AabbCollider& aabb_box) override; + virtual std::string GetName() override; bool IsDriver(Human* hum) { return driver_ == hum && driver_; } Human* GetPassengerBySeat(int seat); diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc index 03390bb..b7af85f 100644 --- a/server/gameserver/hero.cc +++ b/server/gameserver/hero.cc @@ -375,3 +375,8 @@ void Hero::Destory() }, &xtimer_attacher.timer_list_); } + +std::string Hero::GetName() +{ + return meta->i->name(); +} diff --git a/server/gameserver/hero.h b/server/gameserver/hero.h index 190c991..ff8c609 100644 --- a/server/gameserver/hero.h +++ b/server/gameserver/hero.h @@ -30,6 +30,7 @@ public: virtual void OnBulletHit(Bullet* bullet) override; virtual void Update(int delta_time) override; virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) override; + virtual std::string GetName() override; virtual float GetSpeed() override; virtual float GetRadius() override;