diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 15 | ||||
| -rw-r--r-- | src/game/DBCEnums.h | 3 | ||||
| -rw-r--r-- | src/game/Unit.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index c31906d110f..32a47334a9d 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -389,14 +389,13 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data ) SetCanModifyStats(true); UpdateAllStats(); - FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->faction_A); - if (factionTemplate) // check and error show at loading templates + // checked and error show at loading templates + if (FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->faction_A)) { - FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionTemplate->faction); - if (factionEntry) - if( !(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN) && - (factionEntry->team == ALLIANCE || factionEntry->team == HORDE) ) - SetPvP(true); + if (factionTemplate->factionFlags & FACTION_TEMPLATE_FLAG_PVP) + SetPvP(true); + else + SetPvP(false); } // HACK: trigger creature is always not selectable @@ -2318,7 +2317,7 @@ bool Creature::LoadCreaturesAddon(bool reload) // 3 ShapeshiftForm Must be determined/set by shapeshift spell/aura SetByteValue(UNIT_FIELD_BYTES_2, 0, uint8(cainfo->bytes2 & 0xFF)); - SetByteValue(UNIT_FIELD_BYTES_2, 1, uint8((cainfo->bytes2 >> 8) & 0xFF)); + //SetByteValue(UNIT_FIELD_BYTES_2, 1, uint8((cainfo->bytes2 >> 8) & 0xFF)); //SetByteValue(UNIT_FIELD_BYTES_2, 2, uint8((cainfo->bytes2 >> 16) & 0xFF)); SetByteValue(UNIT_FIELD_BYTES_2, 2, 0); //SetByteValue(UNIT_FIELD_BYTES_2, 3, uint8((cainfo->bytes2 >> 24) & 0xFF)); diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h index 97cc6f4798c..090369d091e 100644 --- a/src/game/DBCEnums.h +++ b/src/game/DBCEnums.h @@ -270,7 +270,8 @@ enum SpawnMask enum FactionTemplateFlags { - FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats + FACTION_TEMPLATE_FLAG_PVP = 0x00000800, // flagged for PvP + FACTION_TEMPLATE_FLAG_CONTESTED_GUARD = 0x00001000, // faction will attack players that were involved in PvP combats }; enum FactionMasks diff --git a/src/game/Unit.h b/src/game/Unit.h index 86db0262a06..f1e0aeecd86 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -226,7 +226,7 @@ enum SheathState #define MAX_SHEATH_STATE 3 // byte (1 from 0..3) of UNIT_FIELD_BYTES_2 -enum UnitBytes2_Flags +enum UnitPVPStateFlags { UNIT_BYTE2_FLAG_PVP = 0x01, UNIT_BYTE2_FLAG_UNK1 = 0x02, |