mirrors/azerothcore-wotlk
1
Fork 0
mirror of https://github.com/azerothcore/azerothcore-wotlk.git synced 2025-12-06 02:30:26 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some variable/parameters type issues

Browse source
This commit is contained in:
Yehonal 2017-09-18 19:35:32 +02:00
parent 353d90f256
commit 84d6011a3d
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
View file

@ -1080,7 +1080,7 @@ PVOID pAddress)
switch (basicType)
{
case btChar:
pszCurrBuffer += sprintf(pszCurrBuffer, " = \"%s\"", pAddress);
pszCurrBuffer += sprintf(pszCurrBuffer, " = \"%s\"", (char*)pAddress);
break;
case btStdString:
pszCurrBuffer += sprintf(pszCurrBuffer, " = \"%s\"", static_cast<std::string*>(pAddress)->c_str());
@ -1125,9 +1125,9 @@ PVOID pAddress)
else
{
#if _WIN64
pszCurrBuffer += sprintf(pszCurrBuffer, " = %I64X", (DWORD64*)pAddress);
pszCurrBuffer += sprintf(pszCurrBuffer, " = 0x%I64X", (DWORD64*)pAddress);
#else
pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", (PDWORD)pAddress);
pszCurrBuffer += sprintf(pszCurrBuffer, " = 0x%X", (DWORD)pAddress);
#endif
}
break;
@ -1138,7 +1138,7 @@ PVOID pAddress)
#if _WIN64
pszCurrBuffer += sprintf(pszCurrBuffer, " <Unable to read memory> = %I64X", (DWORD64*)pAddress);
#else
pszCurrBuffer += sprintf(pszCurrBuffer, " <Unable to read memory> = %X", (PDWORD)pAddress);
pszCurrBuffer += sprintf(pszCurrBuffer, " <Unable to read memory> = %X", (DWORD)pAddress);
#endif
}

3
src/game/Handlers/MiscHandler.cpp
View file

@ -414,7 +414,8 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
if (uint64 lguid = GetPlayer()->GetLootGUID())
DoLootRelease(lguid);
bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat())) || GetPlayer()->IsInFlight();
bool instantLogout = ((GetSecurity() >= 0 && uint32(GetSecurity()) >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT))
|| (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat())) || GetPlayer()->IsInFlight();
/// TODO: Possibly add RBAC permission to log out in combat
bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);

2
src/scripts/World/areatrigger_scripts.cpp
View file

@ -343,7 +343,7 @@ class AreaTrigger_at_sentry_point : public AreaTriggerScript
if (!player->FindNearestCreature(NPC_TERVOSH, 100.0f))
{
if(Creature* tervosh = player->SummonCreature(NPC_TERVOSH, -3476.51, -4105.94, 17.1, 5.3816f, TEMPSUMMON_TIMED_DESPAWN, 60000))
if(Creature* tervosh = player->SummonCreature(NPC_TERVOSH, -3476.51f, -4105.94f, 17.1f, 5.3816f, TEMPSUMMON_TIMED_DESPAWN, 60000))
tervosh->CastSpell(tervosh, SPELL_TELEPORT_VISUAL, true);
}