From 6c200bd76429a897886e578effc9e12751d34a01 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 26 Oct 2011 20:19:41 -0200 Subject: [PATCH] fix compile issues --- src/framework/platform/platform.h | 2 +- src/framework/platform/x11platform.cpp | 3 +-- src/otclient/net/protocolgameparse.cpp | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/framework/platform/platform.h b/src/framework/platform/platform.h index a4a0f849..e5cde12f 100644 --- a/src/framework/platform/platform.h +++ b/src/framework/platform/platform.h @@ -81,7 +81,7 @@ public: /// Get the app user directory, the place to save files configurations files std::string getAppUserDir(); - std::string generateBacktrace(int maxLevel); + std::string generateBacktrace(int maxLevel = 100); private: PlatformListener* m_listener; diff --git a/src/framework/platform/x11platform.cpp b/src/framework/platform/x11platform.cpp index 6d552245..895146ed 100644 --- a/src/framework/platform/x11platform.cpp +++ b/src/framework/platform/x11platform.cpp @@ -868,8 +868,7 @@ std::string Platform::getAppUserDir() return sdir.str(); } - -std::string Platform::generateBacktrace(int maxLevel = 100) +std::string Platform::generateBacktrace(int maxLevel) { std::stringstream ss; std::vector buffer(maxLevel); diff --git a/src/otclient/net/protocolgameparse.cpp b/src/otclient/net/protocolgameparse.cpp index 56f7bd08..1e67188b 100644 --- a/src/otclient/net/protocolgameparse.cpp +++ b/src/otclient/net/protocolgameparse.cpp @@ -801,7 +801,7 @@ void ProtocolGame::parseOutfitWindow(InputMessage& msg) void ProtocolGame::parseVipState(InputMessage& msg) { - uint32 id = msg.getU32(); + int id = msg.getU32(); std::string name = msg.getString(); bool online = msg.getU8() != 0; @@ -812,7 +812,7 @@ void ProtocolGame::parseVipState(InputMessage& msg) void ProtocolGame::parseVipLogin(InputMessage& msg) { - uint32 id = msg.getU32(); + int id = msg.getU32(); g_dispatcher.addEvent([=] { g_lua.callGlobalField("Game", "onVipStateChange", id, true); @@ -821,7 +821,7 @@ void ProtocolGame::parseVipLogin(InputMessage& msg) void ProtocolGame::parseVipLogout(InputMessage& msg) { - uint32 id = msg.getU32(); + int id = msg.getU32(); g_dispatcher.addEvent([=] { g_lua.callGlobalField("Game", "onVipStateChange", id, false);