From 84d6011a3df2d1ab83e7c90da1e50553425ca780 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 18 Sep 2017 19:35:32 +0200 Subject: [PATCH] Fixed some variable/parameters type issues --- .../nucleus/src/Debugging/WheatyExceptionReport.cpp | 8 ++++---- src/game/Handlers/MiscHandler.cpp | 3 ++- src/scripts/World/areatrigger_scripts.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp b/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp index 3b6bd3d2c..d35400737 100644 --- a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp +++ b/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp @@ -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(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, " = %I64X", (DWORD64*)pAddress); #else - pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", (PDWORD)pAddress); + pszCurrBuffer += sprintf(pszCurrBuffer, " = %X", (DWORD)pAddress); #endif } diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp index f05a34320..35654dc9a 100644 --- a/src/game/Handlers/MiscHandler.cpp +++ b/src/game/Handlers/MiscHandler.cpp @@ -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); diff --git a/src/scripts/World/areatrigger_scripts.cpp b/src/scripts/World/areatrigger_scripts.cpp index 1046034e2..19936e827 100644 --- a/src/scripts/World/areatrigger_scripts.cpp +++ b/src/scripts/World/areatrigger_scripts.cpp @@ -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); }