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

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-16 21:00:29 +08:00
parent 33f7272337
commit a1636c4ed4
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/car.cc
View File

@ -338,7 +338,7 @@ void Car::OnExplosionHit(Explosion* e)
dmg_out); dmg_out);
} }
void Car::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id, void Car::DecHP(float dec_hp, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) float& real_dmg_out)
{ {

2
server/gameserver/car.h
View File

@ -36,7 +36,7 @@ class Car : public Creature
virtual float GetRadius() override; virtual float GetRadius() override;
virtual float GetSpeed() override; virtual float GetSpeed() override;
virtual void DecHP(float dec_hp, virtual void DecHP(float dec_hp,
int killer_id, const std::string& killer_name, int weapon_id, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) override; float& real_dmg_out) override;
virtual void SendDebugMsg(const std::string& debug_msg) override; virtual void SendDebugMsg(const std::string& debug_msg) override;

2
server/gameserver/creature.h
View File

@ -220,7 +220,7 @@ class Creature : public MoveableEntity
Player* AsPlayer() { return IsPlayer() ? (Player*)this : nullptr; }; Player* AsPlayer() { return IsPlayer() ? (Player*)this : nullptr; };
Car* AsCar() { return IsCar() ? (Car*)this : nullptr; }; Car* AsCar() { return IsCar() ? (Car*)this : nullptr; };
virtual void DecHP(float dec_hp, int killer_id, virtual void DecHP(float dec_hp, int killer_id,
const std::string& killer_name, int weapon_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) {}; float& real_dmg_out) {};
void AddHp(float hp); void AddHp(float hp);

2
server/gameserver/hero.cc
View File

@ -167,7 +167,7 @@ void Hero::DetachFromMaster()
} }
} }
void Hero::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id, void Hero::DecHP(float dec_hp, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) float& real_dmg_out)
{ {

2
server/gameserver/hero.h
View File

@ -25,7 +25,7 @@ public:
virtual void OnBulletHit(IBullet* bullet) override; virtual void OnBulletHit(IBullet* bullet) override;
virtual void Update(int delta_time) override; virtual void Update(int delta_time) override;
virtual void DecHP(float dec_hp, virtual void DecHP(float dec_hp,
int killer_id, const std::string& killer_name, int weapon_id, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) override; float& real_dmg_out) override;
virtual std::string GetName() override; virtual std::string GetName() override;

2
server/gameserver/human.cc
View File

@ -643,7 +643,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id,
} }
} }
void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id, void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) float& real_dmg_out)
{ {

2
server/gameserver/human.h
View File

@ -302,7 +302,7 @@ class Human : public Creature
void BeKill(int killer_id, const std::string& killer_name, int weapon_id, void BeKill(int killer_id, const std::string& killer_name, int weapon_id,
int real_killer_id, const std::string& real_killer_name); int real_killer_id, const std::string& real_killer_name);
virtual void DecHP(float dec_hp, virtual void DecHP(float dec_hp,
int killer_id, const std::string& killer_name, int weapon_id, int killer_id, const std::string killer_name, int weapon_id,
int real_killer_id, const std::string real_killer_name, int real_killer_id, const std::string real_killer_name,
float& real_dmg_out) override; float& real_dmg_out) override;
virtual void AddToNewObjects(Entity* entity) override; virtual void AddToNewObjects(Entity* entity) override;