Fix VS2015 Compile
This commit is contained in:
@@ -93,7 +93,7 @@ WorldObject::~WorldObject()
|
|||||||
{
|
{
|
||||||
if (GetTypeId() == TYPEID_CORPSE)
|
if (GetTypeId() == TYPEID_CORPSE)
|
||||||
{
|
{
|
||||||
sLog->outCrash("Object::~Object Corpse guid="UI64FMTD", type=%d, entry=%u deleted but still in map!!", GetGUID(), ((Corpse*)this)->GetType(), GetEntry());
|
sLog->outCrash("Object::~Object Corpse guid=" UI64FMTD ", type=%d, entry=%u deleted but still in map!!", GetGUID(), ((Corpse*)this)->GetType(), GetEntry());
|
||||||
ASSERT(false);
|
ASSERT(false);
|
||||||
}
|
}
|
||||||
ResetMap();
|
ResetMap();
|
||||||
@@ -104,7 +104,7 @@ Object::~Object()
|
|||||||
{
|
{
|
||||||
if (IsInWorld())
|
if (IsInWorld())
|
||||||
{
|
{
|
||||||
sLog->outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in world!!", GetGUID(), GetTypeId(), GetEntry());
|
sLog->outCrash("Object::~Object - guid=" UI64FMTD ", typeid=%d, entry=%u deleted but still in world!!", GetGUID(), GetTypeId(), GetEntry());
|
||||||
if (isType(TYPEMASK_ITEM))
|
if (isType(TYPEMASK_ITEM))
|
||||||
sLog->outCrash("Item slot %u", ((Item*)this)->GetSlot());
|
sLog->outCrash("Item slot %u", ((Item*)this)->GetSlot());
|
||||||
ASSERT(false);
|
ASSERT(false);
|
||||||
@@ -113,7 +113,7 @@ Object::~Object()
|
|||||||
|
|
||||||
if (m_objectUpdated)
|
if (m_objectUpdated)
|
||||||
{
|
{
|
||||||
sLog->outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
|
sLog->outCrash("Object::~Object - guid=" UI64FMTD ", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
|
||||||
ASSERT(false);
|
ASSERT(false);
|
||||||
sObjectAccessor->RemoveUpdateObject(this);
|
sObjectAccessor->RemoveUpdateObject(this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20514,7 +20514,7 @@ void Player::PossessSpellInitialize()
|
|||||||
|
|
||||||
if (!charmInfo)
|
if (!charmInfo)
|
||||||
{
|
{
|
||||||
sLog->outError("Player::PossessSpellInitialize(): charm ("UI64FMTD") has no charminfo!", charm->GetGUID());
|
sLog->outError("Player::PossessSpellInitialize(): charm (" UI64FMTD ") has no charminfo!", charm->GetGUID());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20604,7 +20604,7 @@ void Player::CharmSpellInitialize()
|
|||||||
CharmInfo* charmInfo = charm->GetCharmInfo();
|
CharmInfo* charmInfo = charm->GetCharmInfo();
|
||||||
if (!charmInfo)
|
if (!charmInfo)
|
||||||
{
|
{
|
||||||
sLog->outError("Player::CharmSpellInitialize(): the player's charm ("UI64FMTD") has no charminfo!", charm->GetGUID());
|
sLog->outError("Player::CharmSpellInitialize(): the player's charm (" UI64FMTD ") has no charminfo!", charm->GetGUID());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25555,7 +25555,7 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset)
|
|||||||
|
|
||||||
if (!found) // something wrong...
|
if (!found) // something wrong...
|
||||||
{
|
{
|
||||||
sLog->outError("Player %s tried to save equipment set "UI64FMTD" (index %u), but that equipment set not found!", GetName().c_str(), eqset.Guid, index);
|
sLog->outError("Player %s tried to save equipment set " UI64FMTD " (index %u), but that equipment set not found!", GetName().c_str(), eqset.Guid, index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17066,7 +17066,7 @@ void Unit::RemoveCharmedBy(Unit* charmer)
|
|||||||
if (GetCharmInfo())
|
if (GetCharmInfo())
|
||||||
GetCharmInfo()->SetPetNumber(0, true);
|
GetCharmInfo()->SetPetNumber(0, true);
|
||||||
else
|
else
|
||||||
sLog->outError("Aura::HandleModCharm: target="UI64FMTD" with typeid=%d has a charm aura but no charm info!", GetGUID(), GetTypeId());
|
sLog->outError("Aura::HandleModCharm: target=" UI64FMTD " with typeid=%d has a charm aura but no charm info!", GetGUID(), GetTypeId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -18476,8 +18476,8 @@ void Unit::StopAttackFaction(uint32 faction_id)
|
|||||||
void Unit::OutDebugInfo() const
|
void Unit::OutDebugInfo() const
|
||||||
{
|
{
|
||||||
sLog->outError("Unit::OutDebugInfo");
|
sLog->outError("Unit::OutDebugInfo");
|
||||||
sLog->outString("GUID "UI64FMTD", entry %u, type %u, name %s", GetGUID(), GetEntry(), (uint32)GetTypeId(), GetName().c_str());
|
sLog->outString("GUID " UI64FMTD ", entry %u, type %u, name %s", GetGUID(), GetEntry(), (uint32)GetTypeId(), GetName().c_str());
|
||||||
sLog->outString("OwnerGUID "UI64FMTD", MinionGUID "UI64FMTD", CharmerGUID "UI64FMTD", CharmedGUID "UI64FMTD, GetOwnerGUID(), GetMinionGUID(), GetCharmerGUID(), GetCharmGUID());
|
sLog->outString("OwnerGUID " UI64FMTD ", MinionGUID " UI64FMTD ", CharmerGUID " UI64FMTD ", CharmedGUID "UI64FMTD, GetOwnerGUID(), GetMinionGUID(), GetCharmerGUID(), GetCharmGUID());
|
||||||
sLog->outString("In world %u, unit type mask %u", (uint32)(IsInWorld() ? 1 : 0), m_unitTypeMask);
|
sLog->outString("In world %u, unit type mask %u", (uint32)(IsInWorld() ? 1 : 0), m_unitTypeMask);
|
||||||
if (IsInWorld())
|
if (IsInWorld())
|
||||||
sLog->outString("Mapid %u", GetMapId());
|
sLog->outString("Mapid %u", GetMapId());
|
||||||
|
|||||||
@@ -1731,7 +1731,7 @@ void Guild::HandleMemberDepositMoney(WorldSession* session, uint32 amount)
|
|||||||
_BroadcastEvent(GE_BANK_MONEY_SET, 0, aux.c_str());
|
_BroadcastEvent(GE_BANK_MONEY_SET, 0, aux.c_str());
|
||||||
|
|
||||||
if (amount > 10*GOLD)
|
if (amount > 10*GOLD)
|
||||||
CharacterDatabase.PExecute("INSERT INTO log_money VALUES(%u, %u, \"%s\", \"%s\", %u, \"%s\", %u, \"<GB DEPOSIT> %s (guild id: %u, members: %u, new amount: "UI64FMTD", leader guid low: %u, char level: %u)\", NOW())", session->GetAccountId(), player->GetGUIDLow(), player->GetName().c_str(), session->GetRemoteAddress().c_str(), 0, "", amount, GetName().c_str(), GetId(), GetMemberCount(), GetTotalBankMoney(), (uint32)(GetLeaderGUID()&0xFFFFFFFF), player->getLevel());
|
CharacterDatabase.PExecute("INSERT INTO log_money VALUES(%u, %u, \"%s\", \"%s\", %u, \"%s\", %u, \"<GB DEPOSIT> %s (guild id: %u, members: %u, new amount: " UI64FMTD ", leader guid low: %u, char level: %u)\", NOW())", session->GetAccountId(), player->GetGUIDLow(), player->GetName().c_str(), session->GetRemoteAddress().c_str(), 0, "", amount, GetName().c_str(), GetId(), GetMemberCount(), GetTotalBankMoney(), (uint32)(GetLeaderGUID()&0xFFFFFFFF), player->getLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool repair)
|
bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool repair)
|
||||||
@@ -1774,7 +1774,7 @@ bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool
|
|||||||
CharacterDatabase.CommitTransaction(trans);
|
CharacterDatabase.CommitTransaction(trans);
|
||||||
|
|
||||||
if (amount > 10*GOLD)
|
if (amount > 10*GOLD)
|
||||||
CharacterDatabase.PExecute("INSERT INTO log_money VALUES(%u, %u, \"%s\", \"%s\", %u, \"%s\", %u, \"<GB WITHDRAW> %s (guild id: %u, members: %u, new amount: "UI64FMTD", leader guid low: %u, char level: %u)\", NOW())", session->GetAccountId(), player->GetGUIDLow(), player->GetName().c_str(), session->GetRemoteAddress().c_str(), 0, "", amount, GetName().c_str(), GetId(), GetMemberCount(), GetTotalBankMoney(), (uint32)(GetLeaderGUID()&0xFFFFFFFF), player->getLevel());
|
CharacterDatabase.PExecute("INSERT INTO log_money VALUES(%u, %u, \"%s\", \"%s\", %u, \"%s\", %u, \"<GB WITHDRAW> %s (guild id: %u, members: %u, new amount: " UI64FMTD ", leader guid low: %u, char level: %u)\", NOW())", session->GetAccountId(), player->GetGUIDLow(), player->GetName().c_str(), session->GetRemoteAddress().c_str(), 0, "", amount, GetName().c_str(), GetId(), GetMemberCount(), GetTotalBankMoney(), (uint32)(GetLeaderGUID()&0xFFFFFFFF), player->getLevel());
|
||||||
|
|
||||||
std::string aux = ByteArrayToHexStr(reinterpret_cast<uint8*>(&m_bankMoney), 8, true);
|
std::string aux = ByteArrayToHexStr(reinterpret_cast<uint8*>(&m_bankMoney), 8, true);
|
||||||
_BroadcastEvent(GE_BANK_MONEY_SET, 0, aux.c_str());
|
_BroadcastEvent(GE_BANK_MONEY_SET, 0, aux.c_str());
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data)
|
|||||||
sLog->outError("Player %u attempted to eject creature GUID %u from non-ejectable seat.", GetPlayer()->GetGUIDLow(), GUID_LOPART(guid));
|
sLog->outError("Player %u attempted to eject creature GUID %u from non-ejectable seat.", GetPlayer()->GetGUIDLow(), GUID_LOPART(guid));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sLog->outError("HandleEjectPassenger: Player %u tried to eject invalid GUID "UI64FMTD, GetPlayer()->GetGUIDLow(), guid);
|
sLog->outError("HandleEjectPassenger: Player %u tried to eject invalid GUID " UI64FMTD , GetPlayer()->GetGUIDLow(), guid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/)
|
void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/)
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* creature)
|
|||||||
|
|
||||||
if (i_path->at(i_currentNode)->event_id && urand(0, 99) < i_path->at(i_currentNode)->event_chance)
|
if (i_path->at(i_currentNode)->event_id && urand(0, 99) < i_path->at(i_currentNode)->event_chance)
|
||||||
{
|
{
|
||||||
;//sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Creature movement start script %u at point %u for "UI64FMTD".", i_path->at(i_currentNode)->event_id, i_currentNode, creature->GetGUID());
|
;//sLog->outDebug(LOG_FILTER_MAPSCRIPTS, "Creature movement start script %u at point %u for " UI64FMTD ".", i_path->at(i_currentNode)->event_id, i_currentNode, creature->GetGUID());
|
||||||
creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
|
creature->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
|
||||||
creature->GetMap()->ScriptsStart(sWaypointScripts, i_path->at(i_currentNode)->event_id, creature, NULL);
|
creature->GetMap()->ScriptsStart(sWaypointScripts, i_path->at(i_currentNode)->event_id, creature, NULL);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ public:
|
|||||||
{
|
{
|
||||||
std::string name = param1;
|
std::string name = param1;
|
||||||
WorldDatabase.EscapeString(name);
|
WorldDatabase.EscapeString(name);
|
||||||
whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << '\'';
|
whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name " _LIKE_ " '" << name << '\'';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
whereClause << "WHERE guid = '" << guid << '\'';
|
whereClause << "WHERE guid = '" << guid << '\'';
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ public:
|
|||||||
WorldDatabase.EscapeString(name);
|
WorldDatabase.EscapeString(name);
|
||||||
result = WorldDatabase.PQuery(
|
result = WorldDatabase.PQuery(
|
||||||
"SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
|
"SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
|
||||||
"FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1",
|
"FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'") " ORDER BY order_ ASC LIMIT 1",
|
||||||
player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), name.c_str());
|
player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), name.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class MySQL
|
|||||||
static void Thread_Init()
|
static void Thread_Init()
|
||||||
{
|
{
|
||||||
mysql_thread_init();
|
mysql_thread_init();
|
||||||
sLog->outSQLDriver("Core thread with ID ["UI64FMTD"] initializing MySQL thread.",
|
sLog->outSQLDriver("Core thread with ID [" UI64FMTD "] initializing MySQL thread.",
|
||||||
(uint64)ACE_Based::Thread::currentId());
|
(uint64)ACE_Based::Thread::currentId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ class MySQL
|
|||||||
static void Thread_End()
|
static void Thread_End()
|
||||||
{
|
{
|
||||||
mysql_thread_end();
|
mysql_thread_end();
|
||||||
sLog->outSQLDriver("Core thread with ID ["UI64FMTD"] shutting down MySQL thread.",
|
sLog->outSQLDriver("Core thread with ID [" UI64FMTD "] shutting down MySQL thread.",
|
||||||
(uint64)ACE_Based::Thread::currentId());
|
(uint64)ACE_Based::Thread::currentId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -376,7 +376,7 @@ class ByteBuffer
|
|||||||
lt.tm_mon = (packedDate >> 20) & 0xF;
|
lt.tm_mon = (packedDate >> 20) & 0xF;
|
||||||
lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
|
lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
|
||||||
|
|
||||||
return uint32(mktime(<) + timezone);
|
return uint32(mktime(<) + _timezone);
|
||||||
}
|
}
|
||||||
|
|
||||||
ByteBuffer& ReadPackedTime(uint32& time)
|
ByteBuffer& ReadPackedTime(uint32& time)
|
||||||
|
|||||||
Reference in New Issue
Block a user