Advertisement
svenhoefer

Untitled

Mar 3rd, 2017
182
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.76 KB | None | 0 0
  1. commit 0f14f09573bafeb8dbc0879876bef8fc1f4e8b56
  2. Author: svenhoefer <svenhoefer@svenhoefer.com>
  3. Date:   Fri Mar 3 08:46:05 2017 +0100
  4.  
  5.     - luainstance: add missing RADIUS_NONE; fix typo in dynfont handling
  6.  
  7. diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
  8. index 8df8c00..2b8a2ac 100644
  9. --- a/src/gui/lua/luainstance.cpp
  10. +++ b/src/gui/lua/luainstance.cpp
  11. @@ -270,6 +270,7 @@ static void set_lua_variables(lua_State *L)
  12.         { "RADIUS_MID",     RADIUS_MID },
  13.         { "RADIUS_SMALL",   RADIUS_SMALL },
  14.         { "RADIUS_MIN",     RADIUS_MIN },
  15. +       { "RADIUS_NONE",    RADIUS_NONE },
  16.         { NULL, 0 }
  17.     };
  18.  
  19. @@ -343,7 +344,7 @@ static void set_lua_variables(lua_State *L)
  20.         { "STYLE_ITALIC",   (lua_Integer)CNeutrinoFonts::FONT_STYLE_ITALIC },
  21.         { "MAX",        (lua_Integer)CNeutrinoFonts::DYNFONTEXT_MAX },
  22.         { "MAXIMUM_FONTS",  (lua_Integer)CLuaInstance::DYNFONT_MAXIMUM_FONTS },
  23. -       { "TO_WIDE",        (lua_Integer)CLuaInstance::DYNFONT_TO_WIDE },
  24. +       { "TOO_WIDE",       (lua_Integer)CLuaInstance::DYNFONT_TOO_WIDE },
  25.         { "TOO_HIGH",       (lua_Integer)CLuaInstance::DYNFONT_TOO_HIGH },
  26.         { NULL, 0 }
  27.     };
  28. @@ -1050,7 +1051,7 @@ int CLuaInstance::getDynFont(lua_State *L)
  29.     dx = luaL_checkint(L, 2);
  30.     if (dx > (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true)) {
  31.         lua_pushnil(L);
  32. -       lua_pushinteger(L, DYNFONT_TO_WIDE);
  33. +       lua_pushinteger(L, DYNFONT_TOO_WIDE);
  34.         return 2;
  35.     }
  36.     dy = luaL_checkint(L, 3);
  37. diff --git a/src/gui/lua/luainstance.h b/src/gui/lua/luainstance.h
  38. index 21ebb62..fe0ad3b 100644
  39. --- a/src/gui/lua/luainstance.h
  40. +++ b/src/gui/lua/luainstance.h
  41. @@ -46,7 +46,7 @@ public:
  42.     enum {
  43.         DYNFONT_NO_ERROR      = 0,
  44.         DYNFONT_MAXIMUM_FONTS = 1,
  45. -       DYNFONT_TO_WIDE       = 2,
  46. +       DYNFONT_TOO_WIDE      = 2,
  47.         DYNFONT_TOO_HIGH      = 3
  48.     };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement