Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-06 10:03:44 +02:00
commit 820f002135
9 files changed
+85 -58

No files matched your search

+4 -8
View File
@@ -75,9 +75,7 @@ struct MechanicImmune
char const* text;
};
#define MECHANIC_MAX 33
MechanicImmune const mechanicImmunes[MECHANIC_MAX] =
MechanicImmune const mechanicImmunes[MAX_MECHANIC] =
{
{ MECHANIC_NONE , "MECHANIC_NONE" },
{ MECHANIC_CHARM , "MECHANIC_CHARM" },
@@ -121,9 +119,7 @@ struct UnitFlag
char const* text;
};
#define UNIT_FLAGS_MAX 33
UnitFlag const unitFlags[UNIT_FLAGS_MAX] =
UnitFlag const unitFlags[MAX_UNIT_FLAGS] =
{
{ UNIT_FLAG_SERVER_CONTROLLED , "UNIT_FLAG_SERVER_CONTROLLED" },
{ UNIT_FLAG_NON_ATTACKABLE , "UNIT_FLAG_NON_ATTACKABLE" },
@@ -745,7 +741,7 @@ public:
handler->PSendSysMessage(LANG_NPCINFO_HEALTH, target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
handler->PSendSysMessage(LANG_NPCINFO_UNIT_FIELD_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS));
for (uint8 i = 0; i < UNIT_FLAGS_MAX; ++i)
for (uint8 i = 0; i < MAX_UNIT_FLAGS; ++i)
if (target->GetUInt32Value(UNIT_FIELD_FLAGS) & unitFlags[i].flag)
handler->PSendSysMessage(unitFlags[i].text, unitFlags[i].flag);
@@ -763,7 +759,7 @@ public:
handler->PSendSysMessage(npcFlagTexts[i].text, npcFlagTexts[i].flag);
handler->PSendSysMessage(LANG_NPCINFO_MECHANIC_IMMUNE, mechanicImmuneMask);
for (uint8 i = 0; i < MECHANIC_MAX; ++i)
for (uint8 i = 0; i < MAX_MECHANIC; ++i)
if ((mechanicImmuneMask << 1) & mechanicImmunes[i].flag)
handler->PSendSysMessage(mechanicImmunes[i].text, mechanicImmunes[i].flag);