Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 0f14f09573bafeb8dbc0879876bef8fc1f4e8b56
- Author: svenhoefer <svenhoefer@svenhoefer.com>
- Date: Fri Mar 3 08:46:05 2017 +0100
- - luainstance: add missing RADIUS_NONE; fix typo in dynfont handling
- diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
- index 8df8c00..2b8a2ac 100644
- --- a/src/gui/lua/luainstance.cpp
- +++ b/src/gui/lua/luainstance.cpp
- @@ -270,6 +270,7 @@ static void set_lua_variables(lua_State *L)
- { "RADIUS_MID", RADIUS_MID },
- { "RADIUS_SMALL", RADIUS_SMALL },
- { "RADIUS_MIN", RADIUS_MIN },
- + { "RADIUS_NONE", RADIUS_NONE },
- { NULL, 0 }
- };
- @@ -343,7 +344,7 @@ static void set_lua_variables(lua_State *L)
- { "STYLE_ITALIC", (lua_Integer)CNeutrinoFonts::FONT_STYLE_ITALIC },
- { "MAX", (lua_Integer)CNeutrinoFonts::DYNFONTEXT_MAX },
- { "MAXIMUM_FONTS", (lua_Integer)CLuaInstance::DYNFONT_MAXIMUM_FONTS },
- - { "TO_WIDE", (lua_Integer)CLuaInstance::DYNFONT_TO_WIDE },
- + { "TOO_WIDE", (lua_Integer)CLuaInstance::DYNFONT_TOO_WIDE },
- { "TOO_HIGH", (lua_Integer)CLuaInstance::DYNFONT_TOO_HIGH },
- { NULL, 0 }
- };
- @@ -1050,7 +1051,7 @@ int CLuaInstance::getDynFont(lua_State *L)
- dx = luaL_checkint(L, 2);
- if (dx > (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true)) {
- lua_pushnil(L);
- - lua_pushinteger(L, DYNFONT_TO_WIDE);
- + lua_pushinteger(L, DYNFONT_TOO_WIDE);
- return 2;
- }
- dy = luaL_checkint(L, 3);
- diff --git a/src/gui/lua/luainstance.h b/src/gui/lua/luainstance.h
- index 21ebb62..fe0ad3b 100644
- --- a/src/gui/lua/luainstance.h
- +++ b/src/gui/lua/luainstance.h
- @@ -46,7 +46,7 @@ public:
- enum {
- DYNFONT_NO_ERROR = 0,
- DYNFONT_MAXIMUM_FONTS = 1,
- - DYNFONT_TO_WIDE = 2,
- + DYNFONT_TOO_WIDE = 2,
- DYNFONT_TOO_HIGH = 3
- };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement