mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11568] Use bit indexes in HITINFO_UNK* naming

Browse source
This commit is contained in:
VladimirMangos 2011-05-30 08:28:40 +04:00
parent b45c37ab9e
commit 5ec1203c4f
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Unit.cpp
View file

@ -1431,7 +1431,7 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
case RANGED_ATTACK: case RANGED_ATTACK:
damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT; damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT;
damageInfo->procVictim = PROC_FLAG_TAKEN_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; break;
default: default:
break; break;
@ -5259,10 +5259,10 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
if(damageInfo->HitInfo & HITINFO_BLOCK) if(damageInfo->HitInfo & HITINFO_BLOCK)
data << uint32(damageInfo->blocked_amount); data << uint32(damageInfo->blocked_amount);
if(damageInfo->HitInfo & HITINFO_UNK3) if(damageInfo->HitInfo & HITINFO_UNK22)
data << uint32(0); // count of some sort? data << uint32(0); // count of some sort?
if(damageInfo->HitInfo & HITINFO_UNK1) if(damageInfo->HitInfo & HITINFO_UNK0)
{ {
data << uint32(0); data << uint32(0);
data << float(0); data << float(0);

6
src/game/Unit.h
View file

@ -220,10 +220,10 @@ enum VictimState
enum HitInfo enum HitInfo
{ {
HITINFO_NORMALSWING = 0x00000000, HITINFO_NORMALSWING = 0x00000000,
HITINFO_UNK1 = 0x00000001, // req correct packet structure HITINFO_UNK0 = 0x00000001, // req correct packet structure
HITINFO_NORMALSWING2 = 0x00000002, HITINFO_NORMALSWING2 = 0x00000002,
HITINFO_LEFTSWING = 0x00000004, HITINFO_LEFTSWING = 0x00000004,
HITINFO_UNK2 = 0x00000008, HITINFO_UNK3 = 0x00000008,
HITINFO_MISS = 0x00000010, HITINFO_MISS = 0x00000010,
HITINFO_ABSORB = 0x00000020, // absorbed damage HITINFO_ABSORB = 0x00000020, // absorbed damage
HITINFO_ABSORB2 = 0x00000040, // absorbed damage HITINFO_ABSORB2 = 0x00000040, // absorbed damage
@ -243,7 +243,7 @@ enum HitInfo
// 0x00100000 // 0x00100000
HITINFO_SWINGNOHITSOUND = 0x00200000, // guessed HITINFO_SWINGNOHITSOUND = 0x00200000, // guessed
// 0x00400000 // 0x00400000
HITINFO_UNK3 = 0x00800000 HITINFO_UNK22 = 0x00800000
}; };
//i would like to remove this: (it is defined in item.h //i would like to remove this: (it is defined in item.h

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11567" #define REVISION_NR "11568"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__