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 20:39:16 +08:00
parent b0baa38b6f
commit 33f7272337
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

@ -339,7 +339,7 @@ void Car::OnExplosionHit(Explosion* e)
} }
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)
{ {
real_dmg_out = 0.0f; real_dmg_out = 0.0f;

2
server/gameserver/car.h
View File

@ -37,7 +37,7 @@ class Car : public Creature
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;
virtual void SetAttackDir(const glm::vec3& attack_dir) override; virtual void SetAttackDir(const glm::vec3& attack_dir) override;

2
server/gameserver/creature.h
View File

@ -221,7 +221,7 @@ class Creature : public MoveableEntity
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);
void SetHP(float hp); void SetHP(float hp);

2
server/gameserver/hero.cc
View File

@ -168,7 +168,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)
{ {
real_dmg_out = 0.0f; real_dmg_out = 0.0f;

2
server/gameserver/hero.h
View File

@ -26,7 +26,7 @@ public:
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;
virtual void DropItems(Obstacle* obstacle) override; virtual void DropItems(Obstacle* obstacle) override;

2
server/gameserver/human.cc
View File

@ -644,7 +644,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)
{ {
real_dmg_out = 0.0f; real_dmg_out = 0.0f;

2
server/gameserver/human.h
View File

@ -303,7 +303,7 @@ class Human : public Creature
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;
virtual void AddToPartObjects(Entity* entity) override; virtual void AddToPartObjects(Entity* entity) override;