diff options
| -rw-r--r-- | src/game/AchievementMgr.cpp | 2 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 2 | ||||
| -rw-r--r-- | src/game/MiscHandler.cpp | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 | ||||
| -rw-r--r-- | src/game/UpdateFields.h | 2 | ||||
| -rw-r--r-- | src/tools/genrevision/genrevision.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 6d1a245d670..a05cac867fc 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -1319,7 +1319,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui break; } case ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL: - SetCriteriaProgress(achievementCriteria, GetPlayer()->GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS)); + SetCriteriaProgress(achievementCriteria, GetPlayer()->GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS)); break; case ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS: if (!miscvalue1 || miscvalue1 != achievementCriteria->hk_class.classID) diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index ca14e02383e..fdff7de644c 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -5167,7 +5167,7 @@ bool ChatHandler::HandleResetHonorCommand (const char * args) return false; target->SetUInt32Value(PLAYER_FIELD_KILLS, 0); - target->SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 0); + target->SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0); target->SetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY, 0); target->SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0); target->SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0); diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 1d5fb4951d5..56070f27e19 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1216,7 +1216,7 @@ void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recv_data) data << uint32(player->GetUInt32Value(PLAYER_FIELD_KILLS)); data << uint32(player->GetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION)); data << uint32(player->GetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION)); - data << uint32(player->GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS)); + data << uint32(player->GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS)); SendPacket(&data); } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 253ea7548f7..b2dfdfbc58f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -607,7 +607,7 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 SetUInt64Value( PLAYER__FIELD_KNOWN_TITLES2, 0 ); // 0=disabled SetUInt32Value( PLAYER_CHOSEN_TITLE, 0 ); SetUInt32Value( PLAYER_FIELD_KILLS, 0 ); - SetUInt32Value( PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 0 ); + SetUInt32Value( PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0 ); SetUInt32Value( PLAYER_FIELD_TODAY_CONTRIBUTION, 0 ); SetUInt32Value( PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0 ); @@ -6359,7 +6359,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt // count the number of playerkills in one day ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true); // and those in a lifetime - ApplyModUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 1, true); + ApplyModUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 1, true); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS, pVictim->getClass()); UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HK_RACE, pVictim->getRace()); diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h index 50063ca7df1..8fa05a4cb86 100644 --- a/src/game/UpdateFields.h +++ b/src/game/UpdateFields.h @@ -374,7 +374,7 @@ enum EUnitFields PLAYER_FIELD_KILLS = UNIT_END + 0x0419, // Size: 1, Type: TWO_SHORT, Flags: PRIVATE PLAYER_FIELD_TODAY_CONTRIBUTION = UNIT_END + 0x041A, // Size: 1, Type: INT, Flags: PRIVATE PLAYER_FIELD_YESTERDAY_CONTRIBUTION = UNIT_END + 0x041B, // Size: 1, Type: INT, Flags: PRIVATE - PLAYER_FIELD_LIFETIME_HONORBALE_KILLS = UNIT_END + 0x041C, // Size: 1, Type: INT, Flags: PRIVATE + PLAYER_FIELD_LIFETIME_HONORABLE_KILLS = UNIT_END + 0x041C, // Size: 1, Type: INT, Flags: PRIVATE PLAYER_FIELD_BYTES2 = UNIT_END + 0x041D, // Size: 1, Type: BYTES, Flags: PRIVATE PLAYER_FIELD_WATCHED_FACTION_INDEX = UNIT_END + 0x041E, // Size: 1, Type: INT, Flags: PRIVATE PLAYER_FIELD_COMBAT_RATING_1 = UNIT_END + 0x041F, // Size: 25, Type: INT, Flags: PRIVATE diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index 7c5a2416ae5..85b11a6461c 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -312,8 +312,8 @@ std::string generateHeader(char const* rev_str, char const* date_str, char const newData << " #define FILEVER 0,0," << rev_str << ",0"<< std::endl; newData << " #define PRODUCTVER 0,0," << rev_str << ",0"<< std::endl; } - newData << " #define STRFILEVER \"0, 0, " << rev_str << " ," << hash_str << "\""<< std::endl; - newData << " #define STRPRODUCTVER \"0, 0, " << rev_str << " ," << hash_str << "\""<< std::endl; + newData << " #define STRFILEVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl; + newData << " #define STRPRODUCTVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl; newData << "#endif // __REVISION_H__" << std::endl; return newData.str(); |