Added new element, added server-specific code for networking

Added a new element for client gui: iguicombobox
Added a part of the engine specifically for the server
so server is no longer just a stripped down client

1 files changed, 6 insertions, 0 deletions

diff --git a/src/client/lua_api/load_gui.cpp b/src/client/lua_api/load_gui.cpp
index 729633a..845661a 100644
--- a/src/client/lua_api/load_gui.cpp
+++ b/src/client/lua_api/load_gui.cpp
@@ -24,6 +24,7 @@ extern "C" {
 #include "gui/iguifiledialog.hpp"
 #include "gui/iguispinbox.hpp"
 #include "gui/iguitreeview.hpp"
+#include "gui/iguicombobox.hpp"
 #include "../callbackhandeler.hpp"
 #include "guiparts.hpp"
 
@@ -57,6 +58,7 @@ void load_guifuncs(lua_State* L){
 	tL = L;
 	guidevice = device;
 
+	IGUIFont *font = device->getGUIEnvironment()->getFont("../data/res/font.xml");
 	//Set the transparency of new igui windows
 	IGUISkin *skin = device->getGUIEnvironment()->getSkin();
 	for(int i = 0; i < EGDC_COUNT; i++){
@@ -64,6 +66,9 @@ void load_guifuncs(lua_State* L){
 		col.setAlpha(255);
 		skin->setColor((EGUI_DEFAULT_COLOR)i, col);
 	}
+	for(int i = 0; i < EGDF_COUNT; i++){
+		skin->setFont(font,(EGUI_DEFAULT_FONT)i);
+	}
 	//Various enums
 
 	lua_newtable(L);
@@ -78,6 +83,7 @@ void load_guifuncs(lua_State* L){
 	iguispinbox_register(L);
 	iguitreeview_register(L);
 	iguieditbox_register(L);
+	iguicombobox_register(L);
 
 	lua_pushcfunction(L,screenwidth);
 	lua_setglobal(L,"scrw");