diff --git a/modules/client/client.lua b/modules/client/client.lua index 52de7e1a..de112f8b 100644 --- a/modules/client/client.lua +++ b/modules/client/client.lua @@ -31,10 +31,6 @@ end function Client.init() setupWindow() - - if not g_sprites.isLoaded() or not g_thingsType.isLoaded() then - fatal("spr and dat files are not loaded, are them missing?") - end end function Client.terminate() diff --git a/modules/client_tibiafiles b/modules/client_tibiafiles index 81e6ef44..981d77dd 160000 --- a/modules/client_tibiafiles +++ b/modules/client_tibiafiles @@ -1 +1 @@ -Subproject commit 81e6ef44c73edc5037512cdee3b2f75a23331521 +Subproject commit 981d77dd293a29deeb3f411602c0816ff295edcf diff --git a/src/framework/luascript/luavaluecasts.cpp b/src/framework/luascript/luavaluecasts.cpp index c969b310..caefde52 100644 --- a/src/framework/luascript/luavaluecasts.cpp +++ b/src/framework/luascript/luavaluecasts.cpp @@ -50,6 +50,21 @@ bool luavalue_cast(int index, int& i) return true; } +// uint +void push_luavalue(uint v) +{ + push_luavalue((double)v); +} + +bool luavalue_cast(int index, uint& v) +{ + double d; + bool ret = luavalue_cast(index, d); + v = (uint32)d; + return ret; +} + + // double void push_luavalue(double d) { diff --git a/src/framework/luascript/luavaluecasts.h b/src/framework/luascript/luavaluecasts.h index 3d850931..320b3f1b 100644 --- a/src/framework/luascript/luavaluecasts.h +++ b/src/framework/luascript/luavaluecasts.h @@ -36,6 +36,10 @@ bool luavalue_cast(int index, bool& b); void push_luavalue(int i); bool luavalue_cast(int index, int& i); +// uint +void push_luavalue(uint v); +bool luavalue_cast(int index, uint& v); + // double void push_luavalue(double d); bool luavalue_cast(int index, double& d); diff --git a/src/otclient/luafunctions.cpp b/src/otclient/luafunctions.cpp index fae18c97..96ba5b4b 100644 --- a/src/otclient/luafunctions.cpp +++ b/src/otclient/luafunctions.cpp @@ -47,10 +47,12 @@ void OTClient::registerLuaFunctions() g_lua.registerStaticClass("g_thingsType"); g_lua.bindClassStaticFunction("g_thingsType", "load", std::bind(&ThingsType::load, &g_thingsType, _1)); g_lua.bindClassStaticFunction("g_thingsType", "isLoaded", std::bind(&ThingsType::isLoaded, &g_thingsType)); + g_lua.bindClassStaticFunction("g_thingsType", "getSignature", std::bind(&ThingsType::getSignature, &g_thingsType)); g_lua.registerStaticClass("g_sprites"); g_lua.bindClassStaticFunction("g_sprites", "load", std::bind(&SpriteManager::load, &g_sprites, _1)); g_lua.bindClassStaticFunction("g_sprites", "isLoaded", std::bind(&SpriteManager::isLoaded, &g_sprites)); + g_lua.bindClassStaticFunction("g_sprites", "getSignature", std::bind(&SpriteManager::getSignature, &g_sprites)); g_lua.bindGlobalFunction("exit", std::bind(&Application::exit, g_app)); g_lua.bindGlobalFunction("getOufitColor", Outfit::getColor);