From 455000c02d611204f0fcdbecf8b1106ebdb46e6a Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Jan 2014 22:48:50 +0100 Subject: [PATCH] Fix save_png definition / New UISprite function --- src/client/luafunctions.cpp | 1 + src/client/uisprite.h | 2 ++ src/framework/graphics/apngloader.h | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp index 155edc23..a5e88acb 100644 --- a/src/client/luafunctions.cpp +++ b/src/client/luafunctions.cpp @@ -621,6 +621,7 @@ void Client::registerLuaFunctions() g_lua.bindClassMemberFunction("clearSprite", &UISprite::clearSprite); g_lua.bindClassMemberFunction("getSpriteId", &UISprite::getSpriteId); g_lua.bindClassMemberFunction("setSpriteColor", &UISprite::setSpriteColor); + g_lua.bindClassMemberFunction("hasSprite", &UISprite::hasSprite); g_lua.registerClass(); g_lua.bindClassStaticFunction("create", []{ return UICreaturePtr(new UICreature); } ); diff --git a/src/client/uisprite.h b/src/client/uisprite.h index 1ed37023..e572e5bb 100644 --- a/src/client/uisprite.h +++ b/src/client/uisprite.h @@ -41,6 +41,8 @@ public: bool isSpriteVisible() { return m_spriteVisible; } void setSpriteVisible(bool visible) { m_spriteVisible = visible; } + bool hasSprite() { return m_sprite != nullptr; } + protected: void onStyleApply(const std::string& styleName, const OTMLNodePtr& styleNode); diff --git a/src/framework/graphics/apngloader.h b/src/framework/graphics/apngloader.h index e061d8f3..5e95bb5b 100644 --- a/src/framework/graphics/apngloader.h +++ b/src/framework/graphics/apngloader.h @@ -40,7 +40,7 @@ struct apng_data { // returns -1 on error, 0 on success int load_apng(std::stringstream& file, struct apng_data *apng); -void save_png(std::stringstream& file, int width, int height, int channels, unsigned char *pixels); +void save_png(std::stringstream& file, unsigned int width, unsigned int height, int channels, unsigned char *pixels); void free_apng(struct apng_data *apng); #endif