Switch back to complicated device init

1 files changed, 6 insertions, 5 deletions

diff --git a/src/client/initdevice.cpp b/src/client/initdevice.cpp
index 3707873..e892c21 100644
--- a/src/client/initdevice.cpp
+++ b/src/client/initdevice.cpp
@@ -165,7 +165,8 @@ void settingsFromTable(lua_State *L, SIrrlichtCreationParameters* p){
   p->Fullscreen = set->fullscreen;
   p->Stencilbuffer = set->stencilbuffer;
   p->Vsync = set->vsync;
-  p->WindowSize = set->windowsize;
+  p->WindowSize.Width = set->windowsize.Width;
+  p->WindowSize.Height = set->windowsize.Height;
   p->ZBufferBits = set->zbuffer;
   free(set);
   printf("[OK]\n");
@@ -178,16 +179,15 @@ IrrlichtDevice* spawnIrrDevice(lua_State* L, char *path){
 	char filename[pathlen + 1];
 	sprintf(filename,"%s/%s",path,initname);
 	int iErr = luaL_dofile(L,filename);//ret
-	//SIrrlichtCreationParameters p = SIrrlichtCreationParameters();
+	SIrrlichtCreationParameters p = SIrrlichtCreationParameters();
 	if(iErr != 0){
 		printf("Failed to open lua file:%s\n", filename);
 	}
-	/*settingsFromTable(L,&p);
-	printf("Loaded settings into p:\n");
+	settingsFromTable(L,&p);
 	printf("Creating device...\n");
 	IrrlichtDevice* dev = createDeviceEx(p);
 	printf("[OK]\n");
-	*/
+	/*
 	printf("Creating static device:\n");
 	IrrlichtDevice* dev = createDevice(
 		video::EDT_OPENGL,
@@ -198,6 +198,7 @@ IrrlichtDevice* spawnIrrDevice(lua_State* L, char *path){
 		false,
 		0
 	);
+	*/
 	if(!dev){
 		printf("Failed to create device\n");
 		exit(1);