1
This commit is contained in:
parent
b0baa38b6f
commit
33f7272337
@ -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,
|
||||
int real_killer_id, const std::string& real_killer_name,
|
||||
int real_killer_id, const std::string real_killer_name,
|
||||
float& real_dmg_out)
|
||||
{
|
||||
real_dmg_out = 0.0f;
|
||||
|
@ -37,7 +37,7 @@ class Car : public Creature
|
||||
virtual float GetSpeed() override;
|
||||
virtual void 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) override;
|
||||
virtual void SendDebugMsg(const std::string& debug_msg) override;
|
||||
virtual void SetAttackDir(const glm::vec3& attack_dir) override;
|
||||
|
@ -221,7 +221,7 @@ class Creature : public MoveableEntity
|
||||
Car* AsCar() { return IsCar() ? (Car*)this : nullptr; };
|
||||
virtual void 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) {};
|
||||
void AddHp(float hp);
|
||||
void SetHP(float hp);
|
||||
|
@ -168,7 +168,7 @@ void Hero::DetachFromMaster()
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
real_dmg_out = 0.0f;
|
||||
|
@ -26,7 +26,7 @@ public:
|
||||
virtual void Update(int delta_time) override;
|
||||
virtual void 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) override;
|
||||
virtual std::string GetName() override;
|
||||
virtual void DropItems(Obstacle* obstacle) override;
|
||||
|
@ -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,
|
||||
int real_killer_id, const std::string& real_killer_name,
|
||||
int real_killer_id, const std::string real_killer_name,
|
||||
float& real_dmg_out)
|
||||
{
|
||||
real_dmg_out = 0.0f;
|
||||
|
@ -303,7 +303,7 @@ class Human : public Creature
|
||||
int real_killer_id, const std::string& real_killer_name);
|
||||
virtual void 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) override;
|
||||
virtual void AddToNewObjects(Entity* entity) override;
|
||||
virtual void AddToPartObjects(Entity* entity) override;
|
||||
|
Loading…
x
Reference in New Issue
Block a user