From 5ec1203c4fe1448daad3b3967c15ece055af1ad4 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 30 May 2011 08:28:40 +0400 Subject: [PATCH] [11568] Use bit indexes in HITINFO_UNK* naming --- src/game/Unit.cpp | 6 +++--- src/game/Unit.h | 6 +++--- src/shared/revision_nr.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 28c2f2d87..e8f3381ed 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1431,7 +1431,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da case RANGED_ATTACK: damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT; damageInfo->procVictim = PROC_FLAG_TAKEN_RANGED_HIT; - damageInfo->HitInfo = HITINFO_UNK2; // test (dev note: test what? HitInfo flag possibly not confirmed.) + damageInfo->HitInfo = HITINFO_UNK3; // test (dev note: test what? HitInfo flag possibly not confirmed.) break; default: break; @@ -5259,10 +5259,10 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo) if(damageInfo->HitInfo & HITINFO_BLOCK) data << uint32(damageInfo->blocked_amount); - if(damageInfo->HitInfo & HITINFO_UNK3) + if(damageInfo->HitInfo & HITINFO_UNK22) data << uint32(0); // count of some sort? - if(damageInfo->HitInfo & HITINFO_UNK1) + if(damageInfo->HitInfo & HITINFO_UNK0) { data << uint32(0); data << float(0); diff --git a/src/game/Unit.h b/src/game/Unit.h index aa92cf717..f0f056ff0 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -220,10 +220,10 @@ enum VictimState enum HitInfo { HITINFO_NORMALSWING = 0x00000000, - HITINFO_UNK1 = 0x00000001, // req correct packet structure + HITINFO_UNK0 = 0x00000001, // req correct packet structure HITINFO_NORMALSWING2 = 0x00000002, HITINFO_LEFTSWING = 0x00000004, - HITINFO_UNK2 = 0x00000008, + HITINFO_UNK3 = 0x00000008, HITINFO_MISS = 0x00000010, HITINFO_ABSORB = 0x00000020, // absorbed damage HITINFO_ABSORB2 = 0x00000040, // absorbed damage @@ -243,7 +243,7 @@ enum HitInfo // 0x00100000 HITINFO_SWINGNOHITSOUND = 0x00200000, // guessed // 0x00400000 - HITINFO_UNK3 = 0x00800000 + HITINFO_UNK22 = 0x00800000 }; //i would like to remove this: (it is defined in item.h diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 7f830edda..969600c33 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 "11567" + #define REVISION_NR "11568" #endif // __REVISION_NR_H__