From c072a0d5a04fdc7b9e8e2b4862b7ad663b992dca Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 19 Mar 2021 20:02:12 +0800 Subject: [PATCH] 1 --- server/gameserver/hero.h | 3 ++- server/gameserver/room.cc | 2 +- server/gameserver/room.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/gameserver/hero.h b/server/gameserver/hero.h index 76967e4..5cf661a 100644 --- a/server/gameserver/hero.h +++ b/server/gameserver/hero.h @@ -12,10 +12,11 @@ namespace MetaData class Human; class Room; class HeroAI; +class Creature; class Hero : public Creature { public: - Entity* master = nullptr; + Creature* master = nullptr; MetaData::Player* meta = nullptr; bool shot_hold = false; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 81979b3..40e4235 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -570,7 +570,7 @@ Car* Room::CreateCar(Human* driver, return car; } -Hero* Room::CreateHero(Entity* master, +Hero* Room::CreateHero(Creature* master, MetaData::Player* meta, const a8::Vec2& pos, const a8::Vec2& dir) diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 6ca4442..cb43f46 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -114,7 +114,7 @@ public: int car_uniid, MetaData::Equip* meta, const a8::Vec2& pos); - Hero* CreateHero(Entity* master, + Hero* CreateHero(Creature* master, MetaData::Player* meta, const a8::Vec2& pos, const a8::Vec2& dir);