josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Defines: Updated some enums to build 6.0.2.18988

Browse Source 
* Fixed build
This commit is contained in:
Kinzcool
2014-10-06 18:37:38 -04:00
parent 9d798428f0
commit bc97908822
12 changed files with 1910 additions and 1760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* who)
return false; return false;
//experimental (unknown) flag not present //experimental (unknown) flag not present
if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_AID_PLAYERS)) if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST))
return false; return false;
//not a player //not a player
src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* who)
return false; return false;
//experimental (unknown) flag not present //experimental (unknown) flag not present
if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_AID_PLAYERS)) if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST))
return false; return false;
//not a player //not a player
src/server/game/AI/SmartScripts/SmartAI.cpp
+1 -1
View File
@@ -498,7 +498,7 @@ bool SmartAI::AssistPlayerInCombat(Unit* who)
return false; return false;
//experimental (unknown) flag not present //experimental (unknown) flag not present
if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_AID_PLAYERS)) if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST))
return false; return false;
//not a player //not a player
src/server/game/DataStores/DBCStores.h
+1 -1
View File
@@ -53,7 +53,7 @@ enum ContentLevels
CONTENT_71_80 = 2, CONTENT_71_80 = 2,
CONTENT_81_85 = 3, CONTENT_81_85 = 3,
CONTENT_86_90 = 4, CONTENT_86_90 = 4,
CONTENT_91_100 = 5 CONTENT_91_100 = 5,
MAX_CONTENT MAX_CONTENT
}; };
src/server/game/Entities/GameObject/GameObject.cpp
+4 -4
View File
@@ -954,7 +954,7 @@ bool GameObject::IsTransport() const
if (!gInfo) if (!gInfo)
return false; return false;
return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT; return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT;
} }
// is Dynamic transport = non-stop Transport // is Dynamic transport = non-stop Transport
@@ -965,7 +965,7 @@ bool GameObject::IsDynTransport() const
if (!gInfo) if (!gInfo)
return false; return false;
return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && m_goValue.Transport.StopFrames->empty()); return gInfo->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && m_goValue.Transport.StopFrames->empty());
} }
bool GameObject::IsDestructibleBuilding() const bool GameObject::IsDestructibleBuilding() const
@@ -1497,7 +1497,7 @@ void GameObject::Use(Unit* user)
return; return;
} }
case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18 case GAMEOBJECT_TYPE_RITUAL: //18
{ {
if (user->GetTypeId() != TYPEID_PLAYER) if (user->GetTypeId() != TYPEID_PLAYER)
return; return;
@@ -2289,7 +2289,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t
pathProgress = int16(timer / float(GetTransportPeriod()) * 65535.0f); pathProgress = int16(timer / float(GetTransportPeriod()) * 65535.0f);
break; break;
} }
case GAMEOBJECT_TYPE_MO_TRANSPORT: case GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT:
{ {
float timer = float(m_goValue.Transport.PathProgress % GetUInt32Value(GAMEOBJECT_LEVEL)); float timer = float(m_goValue.Transport.PathProgress % GetUInt32Value(GAMEOBJECT_LEVEL));
pathProgress = int16(timer / float(GetUInt32Value(GAMEOBJECT_LEVEL)) * 65535.0f); pathProgress = int16(timer / float(GetUInt32Value(GAMEOBJECT_LEVEL)) * 65535.0f);
src/server/game/Entities/GameObject/GameObject.h
+9 -9
View File
@@ -226,7 +226,7 @@ struct GameObjectTemplate
uint32 openTextID; //3 can be used to replace castBarCaption? uint32 openTextID; //3 can be used to replace castBarCaption?
} camera; } camera;
//14 GAMEOBJECT_TYPE_MAPOBJECT - empty //14 GAMEOBJECT_TYPE_MAPOBJECT - empty
//15 GAMEOBJECT_TYPE_MO_TRANSPORT //15 GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT
struct struct
{ {
uint32 taxiPathId; //0 uint32 taxiPathId; //0
@@ -241,7 +241,7 @@ struct GameObjectTemplate
} moTransport; } moTransport;
//16 GAMEOBJECT_TYPE_DUELFLAG - empty //16 GAMEOBJECT_TYPE_DUELFLAG - empty
//17 GAMEOBJECT_TYPE_FISHINGNODE - empty //17 GAMEOBJECT_TYPE_FISHINGNODE - empty
//18 GAMEOBJECT_TYPE_SUMMONING_RITUAL //18 GAMEOBJECT_TYPE_RITUAL
struct struct
{ {
uint32 reqParticipants; //0 uint32 reqParticipants; //0
@@ -840,13 +840,13 @@ class GameObject : public WorldObject, public GridObject<GameObject>, public Map
GameObjectModel* m_model; GameObjectModel* m_model;
void GetRespawnPosition(float &x, float &y, float &z, float* ori = NULL) const; void GetRespawnPosition(float &x, float &y, float &z, float* ori = NULL) const;
Transport* ToTransport() { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MO_TRANSPORT) return reinterpret_cast<Transport*>(this); else return NULL; } Transport* ToTransport() { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return reinterpret_cast<Transport*>(this); else return NULL; }
Transport const* ToTransport() const { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MO_TRANSPORT) return reinterpret_cast<Transport const*>(this); else return NULL; } Transport const* ToTransport() const { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return reinterpret_cast<Transport const*>(this); else return NULL; }
float GetStationaryX() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionX(); return GetPositionX(); } float GetStationaryX() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return m_stationaryPosition.GetPositionX(); return GetPositionX(); }
float GetStationaryY() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionY(); return GetPositionY(); } float GetStationaryY() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return m_stationaryPosition.GetPositionY(); return GetPositionY(); }
float GetStationaryZ() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionZ(); return GetPositionZ(); } float GetStationaryZ() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return m_stationaryPosition.GetPositionZ(); return GetPositionZ(); }
float GetStationaryO() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetOrientation(); return GetOrientation(); } float GetStationaryO() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT) return m_stationaryPosition.GetOrientation(); return GetOrientation(); }
float GetInteractionDistance() const; float GetInteractionDistance() const;
@@ -865,7 +865,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>, public Map
// For traps this: spell casting cooldown, for doors/buttons: reset time. // For traps this: spell casting cooldown, for doors/buttons: reset time.
std::list<uint32> m_SkillupList; std::list<uint32> m_SkillupList;
ObjectGuid m_ritualOwnerGUID; // used for GAMEOBJECT_TYPE_SUMMONING_RITUAL where GO is not summoned (no owner) ObjectGuid m_ritualOwnerGUID; // used for GAMEOBJECT_TYPE_RITUAL where GO is not summoned (no owner)
GuidSet m_unique_users; GuidSet m_unique_users;
uint32 m_usetimes; uint32 m_usetimes;
src/server/game/Entities/Object/ObjectGuid.h
+1 -1
View File
@@ -67,7 +67,7 @@ enum HighGuid
HIGHGUID_CORPSE = 0xF101, // blizz F100 HIGHGUID_CORPSE = 0xF101, // blizz F100
HIGHGUID_AREATRIGGER = 0xF102, HIGHGUID_AREATRIGGER = 0xF102,
HIGHGUID_BATTLEGROUND = 0x1F1, HIGHGUID_BATTLEGROUND = 0x1F1,
HIGHGUID_MO_TRANSPORT = 0x1FC, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT) HIGHGUID_MO_TRANSPORT = 0x1FC, // blizz 1FC0 (for GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT)
HIGHGUID_INSTANCE = 0x1F4, // blizz 1F40 HIGHGUID_INSTANCE = 0x1F4, // blizz 1F40
HIGHGUID_GROUP = 0x1F5, HIGHGUID_GROUP = 0x1F5,
HIGHGUID_GUILD = 0x1FF HIGHGUID_GUILD = 0x1FF
src/server/game/Entities/Transport/Transport.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ bool Transport::Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, floa
SetEntry(goinfo->entry); SetEntry(goinfo->entry);
SetDisplayId(goinfo->displayId); SetDisplayId(goinfo->displayId);
SetGoState(!goinfo->moTransport.canBeStopped ? GO_STATE_READY : GO_STATE_ACTIVE); SetGoState(!goinfo->moTransport.canBeStopped ? GO_STATE_READY : GO_STATE_ACTIVE);
SetGoType(GAMEOBJECT_TYPE_MO_TRANSPORT); SetGoType(GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT);
SetGoAnimProgress(animprogress); SetGoAnimProgress(animprogress);
SetName(goinfo->name); SetName(goinfo->name);
UpdateRotationFields(0.0f, 1.0f); UpdateRotationFields(0.0f, 1.0f);
src/server/game/Entities/Unit/Unit.cpp
+7 -7
View File
@@ -10306,7 +10306,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
} }
Creature const* creatureAttacker = ToCreature(); Creature const* creatureAttacker = ToCreature();
if (creatureAttacker && creatureAttacker->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER) if (creatureAttacker && creatureAttacker->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT)
return false; return false;
Player const* playerAffectingAttacker = HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE) ? GetAffectingPlayer() : NULL; Player const* playerAffectingAttacker = HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE) ? GetAffectingPlayer() : NULL;
@@ -10393,7 +10393,7 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co
// can't assist non-friendly targets // can't assist non-friendly targets
if (GetReactionTo(target) < REP_NEUTRAL if (GetReactionTo(target) < REP_NEUTRAL
&& target->GetReactionTo(this) < REP_NEUTRAL && target->GetReactionTo(this) < REP_NEUTRAL
&& (!ToCreature() || !(ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER))) && (!ToCreature() || !(ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT)))
return false; return false;
// PvP case // PvP case
@@ -10427,7 +10427,7 @@ bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) co
&& !((target->GetByteValue(UNIT_FIELD_BYTES_2, 1) & UNIT_BYTE2_FLAG_PVP))) && !((target->GetByteValue(UNIT_FIELD_BYTES_2, 1) & UNIT_BYTE2_FLAG_PVP)))
{ {
if (Creature const* creatureTarget = target->ToCreature()) if (Creature const* creatureTarget = target->ToCreature())
return creatureTarget->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER || creatureTarget->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_AID_PLAYERS; return creatureTarget->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT || creatureTarget->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST;
} }
return true; return true;
} }
@@ -14498,8 +14498,8 @@ bool Unit::IsInPartyWith(Unit const* unit) const
if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER) if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
return u1->ToPlayer()->IsInSameGroupWith(u2->ToPlayer()); return u1->ToPlayer()->IsInSameGroupWith(u2->ToPlayer());
else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER) || else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT) ||
(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER)) (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT))
return true; return true;
else else
return false; return false;
@@ -14517,8 +14517,8 @@ bool Unit::IsInRaidWith(Unit const* unit) const
if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER) if (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
return u1->ToPlayer()->IsInSameRaidWith(u2->ToPlayer()); return u1->ToPlayer()->IsInSameRaidWith(u2->ToPlayer());
else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER) || else if ((u2->GetTypeId() == TYPEID_PLAYER && u1->GetTypeId() == TYPEID_UNIT && u1->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT) ||
(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_PARTY_MEMBER)) (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_TREAT_AS_RAID_UNIT))
return true; return true;
else else
return false; return false;
src/server/game/Globals/ObjectMgr.cpp
+2 -2
View File
@@ -6725,7 +6725,7 @@ void ObjectMgr::LoadGameObjectTemplate()
CheckGOLockId(&got, got.camera.lockId, 0); CheckGOLockId(&got, got.camera.lockId, 0);
break; break;
} }
case GAMEOBJECT_TYPE_MO_TRANSPORT: //15 case GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT: //15
{ {
if (got.moTransport.taxiPathId) if (got.moTransport.taxiPathId)
{ {
@@ -6737,7 +6737,7 @@ void ObjectMgr::LoadGameObjectTemplate()
_transportMaps.insert(transportMap); _transportMaps.insert(transportMap);
break; break;
} }
case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18 case GAMEOBJECT_TYPE_RITUAL: //18
break; break;
case GAMEOBJECT_TYPE_SPELLCASTER: //22 case GAMEOBJECT_TYPE_SPELLCASTER: //22
{ {
src/server/game/Miscellaneous/SharedDefines.h
+1880 -1730
View File
File diff suppressed because it is too large Load Diff
src/server/game/Spells/SpellEffects.cpp
+2 -2
View File
@@ -4851,7 +4851,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex)
Map* cMap = m_caster->GetMap(); Map* cMap = m_caster->GetMap();
// if gameobject is summoning object, it should be spawned right on caster's position // if gameobject is summoning object, it should be spawned right on caster's position
if (goinfo->type == GAMEOBJECT_TYPE_SUMMONING_RITUAL) if (goinfo->type == GAMEOBJECT_TYPE_RITUAL)
m_caster->GetPosition(fx, fy, fz); m_caster->GetPosition(fx, fy, fz);
GameObject* pGameObj = new GameObject; GameObject* pGameObj = new GameObject;
@@ -4889,7 +4889,7 @@ void Spell::EffectTransmitted(SpellEffIndex effIndex)
duration = duration - lastSec*IN_MILLISECONDS + FISHING_BOBBER_READY_TIME*IN_MILLISECONDS; duration = duration - lastSec*IN_MILLISECONDS + FISHING_BOBBER_READY_TIME*IN_MILLISECONDS;
break; break;
} }
case GAMEOBJECT_TYPE_SUMMONING_RITUAL: case GAMEOBJECT_TYPE_RITUAL:
{ {
if (m_caster->GetTypeId() == TYPEID_PLAYER) if (m_caster->GetTypeId() == TYPEID_PLAYER)
{ {