fixed nopch build and some warnings

This commit is contained in:
Ovahlord committed 2022-06-19 21:19:26 +02:00
1 parent fbd92f5476
commit fc0dc939ba
10 files changed
+16 -8

No files matched your search

@@ -17,6 +17,7 @@
#include "BattlegroundIC.h"
#include "Battleground.h"
#include "DBCStores.h"
#include "GameObject.h"
#include "Log.h"
#include "Map.h"
@@ -17,6 +17,7 @@
#include "DynamicObject.h"
#include "Common.h"
#include "DBCStores.h"
#include "GameTime.h"
#include "Log.h"
#include "Map.h"
@@ -21,6 +21,7 @@
#include "CellImpl.h"
#include "CreatureAISelector.h"
#include "DatabaseEnv.h"
#include "DBCStores.h"
#include "G3DPosition.hpp"
#include "GameObjectAI.h"
#include "GameEventSender.h"
@@ -23,6 +23,7 @@
#include "CinematicMgr.h"
#include "Common.h"
#include "Creature.h"
#include "DBCStores.h"
#include "DynamicTree.h"
#include "G3DPosition.hpp"
#include "GameTime.h"
@@ -25,6 +25,7 @@
#include <boost/dynamic_bitset_fwd.hpp>
struct CreatureData;
struct SummonPropertiesEntry;
class TC_GAME_API Transport : public GameObject, public TransportBase
{
@@ -22,6 +22,7 @@
#include "Opcodes.h"
#include "Log.h"
#include "Corpse.h"
#include "DBCStores.h"
#include "Player.h"
#include "MapManager.h"
#include "MotionMaster.h"
+1
View File
@@ -19,6 +19,7 @@
#include "Battleground.h"
#include "CellImpl.h"
#include "DatabaseEnv.h"
#include "DBCStores.h"
#include "DisableMgr.h"
#include "DynamicTree.h"
#include "GameObjectModel.h"
+1
View File
@@ -18,6 +18,7 @@
#include "MapManager.h"
#include "InstanceSaveMgr.h"
#include "DatabaseEnv.h"
#include "DBCStores.h"
#include "Log.h"
#include "ObjectAccessor.h"
#include "Transport.h"
+7 -7
View File
@@ -256,7 +256,7 @@ void TransportMgr::LoadTransportSpawns()
do
{
Field* fields = result->Fetch();
ObjectGuid::LowType guid = fields[0].GetUInt64();
ObjectGuid::LowType guid = fields[0].GetUInt32();
uint32 entry = fields[1].GetUInt32();
uint8 phaseUseFlags = fields[2].GetUInt8();
uint32 phaseId = fields[3].GetUInt32();
@@ -265,26 +265,26 @@ void TransportMgr::LoadTransportSpawns()
TransportTemplate const* transportTemplate = GetTransportTemplate(entry);
if (!transportTemplate)
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with unknown gameobject `entry` set, skipped.", guid, entry);
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with unknown gameobject `entry` set, skipped.", guid, entry);
continue;
}
if (phaseUseFlags & ~PHASE_USE_FLAGS_ALL)
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with unknown `phaseUseFlags` set, removed unknown value.", guid, entry);
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with unknown `phaseUseFlags` set, removed unknown value.", guid, entry);
phaseUseFlags &= PHASE_USE_FLAGS_ALL;
}
if (phaseUseFlags & PHASE_USE_FLAGS_ALWAYS_VISIBLE && phaseUseFlags & PHASE_USE_FLAGS_INVERSE)
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) has both `phaseUseFlags` PHASE_USE_FLAGS_ALWAYS_VISIBLE and PHASE_USE_FLAGS_INVERSE,"
" removing PHASE_USE_FLAGS_INVERSE.", guid, entry);
phaseUseFlags &= ~PHASE_USE_FLAGS_INVERSE;
}
if (phaseGroupId && phaseId)
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with both `phaseid` and `phasegroup` set, `phasegroup` set to 0", guid, entry);
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with both `phaseid` and `phasegroup` set, `phasegroup` set to 0", guid, entry);
phaseGroupId = 0;
}
@@ -292,7 +292,7 @@ void TransportMgr::LoadTransportSpawns()
{
if (!sPhaseStore.LookupEntry(phaseId))
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with `phaseid` %u does not exist, set to 0", guid, entry, phaseId);
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with `phaseid` %u does not exist, set to 0", guid, entry, phaseId);
phaseId = 0;
}
}
@@ -301,7 +301,7 @@ void TransportMgr::LoadTransportSpawns()
{
if (!sDBCManager.GetPhasesForGroup(phaseGroupId))
{
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: " UI64FMTD " Entry: %u) with `phaseGroup` %u does not exist, set to 0", guid, entry, phaseGroupId);
TC_LOG_ERROR("sql.sql", "Table `transports` have transport (GUID: %u Entry: %u) with `phaseGroup` %u does not exist, set to 0", guid, entry, phaseGroupId);
phaseGroupId = 0;
}
}
+1 -1
View File
@@ -123,7 +123,7 @@ struct TC_GAME_API TransportAnimation
struct TransportSpawn
{
ObjectGuid::LowType SpawnId = UI64LIT(0);
ObjectGuid::LowType SpawnId = 0;
uint32 TransportGameObjectId = 0; // entry in respective _template table
uint8 PhaseUseFlags = 0;
uint32 PhaseId = 0;