From abe3cdd2aafe4c42b25f08cf6017076ebdb1c3aa Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 18 Apr 2018 21:09:41 +0200 Subject: [PATCH] Core/Player: upper camel cases --- src/server/game/Entities/Player/Player.cpp | 14 +++++++------- src/server/game/Entities/Player/Player.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a66a780f8f5..7b0f3accb52 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16107,7 +16107,7 @@ bool Player::SatisfyFirstLFGReward(uint32 dungeonId, uint8 maxRewCount) const { LFGRewardStatusMap::const_iterator lfgdungeon = m_lfgrewardstatus.find(dungeonId); if (lfgdungeon != m_lfgrewardstatus.end()) - return lfgdungeon->second.completionsThisPeriod && lfgdungeon->second.completionsThisPeriod < maxRewCount; + return lfgdungeon->second.CompletionsThisPeriod && lfgdungeon->second.CompletionsThisPeriod < maxRewCount; return true; } @@ -16116,7 +16116,7 @@ uint8 Player::GetFirstRewardCountForDungeonId(uint32 dungeonId) { LFGRewardStatusMap::const_iterator lfgdungeon = m_lfgrewardstatus.find(dungeonId); if (lfgdungeon != m_lfgrewardstatus.end()) - return lfgdungeon->second.completionsThisPeriod; + return lfgdungeon->second.CompletionsThisPeriod; return 0; } @@ -20555,8 +20555,8 @@ void Player::_SaveLFGRewardStatus(SQLTransaction& trans) for (LFGRewardStatusMap::const_iterator itr = m_lfgrewardstatus.begin(); itr != m_lfgrewardstatus.end(); ++itr) { uint32 dungeonId = itr->first; - uint8 rewardCount = itr->second.completionsThisPeriod; - uint8 dailyReset = itr->second.isDaily; + uint8 rewardCount = itr->second.CompletionsThisPeriod; + uint8 dailyReset = itr->second.IsDaily; stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_REWARDSTATUS_LFG); stmt->setUInt32(0, GetGUID().GetCounter()); @@ -24163,7 +24163,7 @@ void Player::SetLFGRewardStatus(uint32 dungeon_id, bool daily_reset) LFGRewardStatusMap::iterator lfgdungeon = m_lfgrewardstatus.find(dungeon_id); if (lfgdungeon != m_lfgrewardstatus.end()) - lfgdungeon->second.completionsThisPeriod++; + lfgdungeon->second.CompletionsThisPeriod++; else m_lfgrewardstatus[dungeon_id] = LFGRewardInfo(1, daily_reset); @@ -24215,7 +24215,7 @@ void Player::ResetWeeklyLFGRewardStatus() { for (auto itr = m_lfgrewardstatus.begin(); itr != m_lfgrewardstatus.end();) { - if (!itr->second.isDaily) + if (!itr->second.IsDaily) { itr = m_lfgrewardstatus.erase(itr); continue; @@ -24231,7 +24231,7 @@ void Player::ResetDailyLFGRewardStatus() { for (auto itr = m_lfgrewardstatus.begin(); itr != m_lfgrewardstatus.end();) { - if (itr->second.isDaily) + if (itr->second.IsDaily) { itr = m_lfgrewardstatus.erase(itr); continue; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 413dc72d97a..19b7fc4167d 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2407,10 +2407,10 @@ class TC_GAME_API Player : public Unit, public GridObject struct LFGRewardInfo { LFGRewardInfo(uint8 _completionsThisPeriod = 0, bool _isDaily = false) : - completionsThisPeriod(_completionsThisPeriod), isDaily(_isDaily) { } + CompletionsThisPeriod(_completionsThisPeriod), IsDaily(_isDaily) { } - uint8 completionsThisPeriod; - bool isDaily; + uint8 CompletionsThisPeriod; + bool IsDaily; }; typedef std::unordered_map LFGRewardStatusMap;