diff options
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1df449d50c9..b0c844c82ba 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14813,7 +14813,7 @@ void Player::SendPreparedQuest(ObjectGuid guid) { qe._Delay = 0; //TEXTEMOTE_MESSAGE; //zyg: player emote qe._Emote = 0; //TEXTEMOTE_HELLO; //zyg: NPC emote - title = ""; + title.clear(); } else { @@ -17131,7 +17131,7 @@ float Player::GetFloatValueFromArray(Tokenizer const& data, uint16 index) return result; } -bool Player::isBeingLoaded() const +bool Player::IsLoading() const { return GetSession()->PlayerLoading(); } @@ -26851,11 +26851,6 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy return pet; } -bool Player::IsLoading() const -{ - return GetSession()->PlayerLoading(); -} - void Player::SendSupercededSpell(uint32 oldSpell, uint32 newSpell) { WorldPacket data(SMSG_SUPERCEDED_SPELL, 8); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index bb3fccaf35e..f0f189fc8bd 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1487,7 +1487,7 @@ class Player : public Unit, public GridObject<Player> /*********************************************************/ bool LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder); - bool isBeingLoaded() const override; + bool IsLoading() const override; void Initialize(uint32 guid); static uint32 GetUInt32ValueFromArray(Tokenizer const& data, uint16 index); |