aboutsummaryrefslogtreecommitdiff
path: root/src/client/lua_api/load_gui.cpp
diff options
context:
space:
mode:
authorAlexander Pickering <alex@cogarr.net>2018-06-23 06:52:55 -0600
committerAlexander Pickering <alex@cogarr.net>2018-06-23 06:52:55 -0600
commite6faff1394864a1fe0d517584d1c104997dff39f (patch)
treed7956fc8aabef903f354578d69d4d7fdf64ec928 /src/client/lua_api/load_gui.cpp
parent1aaa348ac080c97c0aeb0a02146ae26b74add5a1 (diff)
parent9fa5dcc9310a8c6ff8c77a47a86303f7b950dcf3 (diff)
downloadbrokengine-e6faff1394864a1fe0d517584d1c104997dff39f.tar.gz
brokengine-e6faff1394864a1fe0d517584d1c104997dff39f.tar.bz2
brokengine-e6faff1394864a1fe0d517584d1c104997dff39f.zip
Merge branch 'master' of ssh://cogarr.net:43/home/git/brokengine
Diffstat (limited to 'src/client/lua_api/load_gui.cpp')
-rw-r--r--src/client/lua_api/load_gui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/lua_api/load_gui.cpp b/src/client/lua_api/load_gui.cpp
index b2e941b..c90c8f5 100644
--- a/src/client/lua_api/load_gui.cpp
+++ b/src/client/lua_api/load_gui.cpp
@@ -40,7 +40,6 @@ void load_guifuncs(lua_State* L){
gui_elenum = 0;
guielements[0] = NULL;
- iguibutton_register(L,device);
iguilabel_register(L,device);
lua_pop(L, 1);
@@ -52,6 +51,7 @@ void load_guifuncs(lua_State* L){
iguicheckbox_register(L);
iguiwindow_register(L,device);
iguiimage_register(L);
+ iguibutton_register(L);
lua_pushcfunction(L,screenwidth);
lua_setglobal(L,"scrw");
@@ -65,13 +65,13 @@ void load_guifuncs(lua_State* L){
int screenheight(lua_State* L){
core::rect<s32> dim = guidevice->getGUIEnvironment()->getRootGUIElement()->getAbsoluteClippingRect();
lua_pushnumber(L,dim.getHeight());
- printf("Got screen height:%d\n",dim.getWidth());
+ //printf("Got screen height:%d\n",dim.getWidth());
return 1;
}
int screenwidth(lua_State* L){
core::rect<s32> dim = guidevice->getGUIEnvironment()->getRootGUIElement()->getAbsoluteClippingRect();
lua_pushnumber(L,dim.getWidth());
- printf("Got screen width:%d\n",dim.getWidth());
+ //printf("Got screen width:%d\n",dim.getWidth());
return 1;
}