From d58b1a758dda0feb239bcd880815427fdafe0431 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 12 Jan 2024 17:24:08 +0800 Subject: [PATCH] 1 --- server/gameserver/creature.h | 1 - server/gameserver/hero_agent.cc | 2 +- server/gameserver/master_agent.cc | 2 +- server/gameserver/target_agent.cc | 2 +- server/gameserver/teammate_agent.cc | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index 36b14aa1..fe930a86 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -99,7 +99,6 @@ class Creature : public MoveableEntity int max_energy_shield = 0; int armor_shield = 0; int max_armor_shield = 0; - int level = 1; int hero_level = 1; int revive_count = 0; CreatureWeakPtr master; diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc index fa0e87d2..6e93c1af 100644 --- a/server/gameserver/hero_agent.cc +++ b/server/gameserver/hero_agent.cc @@ -140,7 +140,7 @@ int HeroAgent::GetHeroId() int HeroAgent::GetLevel() { - return owner_->level; + return owner_->hero_level; } bool HeroAgent::CanShot() diff --git a/server/gameserver/master_agent.cc b/server/gameserver/master_agent.cc index f2b6532a..048cc7f6 100644 --- a/server/gameserver/master_agent.cc +++ b/server/gameserver/master_agent.cc @@ -68,7 +68,7 @@ int MasterAgent::GetLevel() if (!owner_->master.Get()) { abort(); } - return owner_->master.Get()->level; + return owner_->master.Get()->hero_level; } void MasterAgent::SetOwner(Creature* owner) diff --git a/server/gameserver/target_agent.cc b/server/gameserver/target_agent.cc index 7b00cb37..055c919f 100644 --- a/server/gameserver/target_agent.cc +++ b/server/gameserver/target_agent.cc @@ -70,7 +70,7 @@ int TargetAgent::GetLevel() if (!target_.Get()) { abort(); } - return target_.Get()->level; + return target_.Get()->hero_level; } void TargetAgent::Abandon(int min_time, int max_time) diff --git a/server/gameserver/teammate_agent.cc b/server/gameserver/teammate_agent.cc index 7eacc075..97d49757 100644 --- a/server/gameserver/teammate_agent.cc +++ b/server/gameserver/teammate_agent.cc @@ -70,7 +70,7 @@ int TeammateAgent::GetLevel() if (!target_.Get()) { abort(); } - return target_.Get()->level; + return target_.Get()->hero_level; } void TeammateAgent::Abandon(int min_time, int max_time)