From 4f53c4ee284a9efc38b2fadf99da76e606b5f56d Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Fri, 17 Jul 2009 19:25:26 +0400 Subject: [PATCH] [8193] Use constant instead explicit value in title index checks. Signed-off-by: VladimirMangos --- src/game/MiscHandler.cpp | 2 +- src/game/Player.cpp | 2 +- src/game/Player.h | 2 ++ src/shared/revision_nr.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 427f5d65c..b0fc08da2 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1426,7 +1426,7 @@ void WorldSession::HandleSetTitleOpcode( WorldPacket & recv_data ) recv_data >> title; // -1 at none - if(title > 0 && title < 192) + if(title > 0 && title < MAX_TITLE_INDEX) { if(!GetPlayer()->HasTitle(title)) return; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 041d9def2..5ab16b0a8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19504,7 +19504,7 @@ bool Player::isTotalImmune() bool Player::HasTitle(uint32 bitIndex) { - if (bitIndex > 192) + if (bitIndex > MAX_TITLE_INDEX) return false; uint32 fieldIndexOffset = bitIndex / 32; diff --git a/src/game/Player.h b/src/game/Player.h index 364e9ab78..0716cd554 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -473,6 +473,8 @@ enum PlayerFlags #define PLAYER_TITLE_HAND_OF_ADAL UI64LIT(0x0000008000000000) // 39 #define PLAYER_TITLE_VENGEFUL_GLADIATOR UI64LIT(0x0000010000000000) // 40 +#define MAX_TITLE_INDEX (3*64) // 3 uint64 fields + // used in PLAYER_FIELD_BYTES values enum PlayerFieldByteFlags { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 18f784a7b..47b1af20f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8192" + #define REVISION_NR "8193" #endif // __REVISION_NR_H__