diff options
| author | Alexander <alex@cogarr.net> | 2019-10-27 17:25:16 -0400 |
|---|---|---|
| committer | Alexander <alex@cogarr.net> | 2019-10-27 17:25:16 -0400 |
| commit | 0d2de2ba9c616862d7881f089382db772d034f89 (patch) | |
| tree | 5fc58b63c593e2ac17f3353b50318c299f643390 /src/client/initdevice.cpp | |
| parent | c9db55cdc2f69c3dc7aefabe0cc828a64e377024 (diff) | |
| download | brokengine-0d2de2ba9c616862d7881f089382db772d034f89.tar.gz brokengine-0d2de2ba9c616862d7881f089382db772d034f89.tar.bz2 brokengine-0d2de2ba9c616862d7881f089382db772d034f89.zip | |
Various updates
Diffstat (limited to 'src/client/initdevice.cpp')
| -rw-r--r-- | src/client/initdevice.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/client/initdevice.cpp b/src/client/initdevice.cpp index 3720d49..40a1e30 100644 --- a/src/client/initdevice.cpp +++ b/src/client/initdevice.cpp @@ -144,7 +144,7 @@ void parseSetting(const char* settingname, lua_State* L, settings* set){ } void settingsFromTable(lua_State *L, SIrrlichtCreationParameters* p){ - lua_pushnil(L); + lua_pushnil(L);//nil settings* set = (settings*)malloc(sizeof(settings)); printf("Loading settings..."); while(lua_next(L,-2) != 0){ @@ -172,20 +172,21 @@ void settingsFromTable(lua_State *L, SIrrlichtCreationParameters* p){ } IrrlichtDevice* spawnIrrDevice(lua_State* L, char *path){ - //printf("Attempting to load settings...\n"); - char initname[] = "deviceinit.lua"; - size_t pathlen = strlen(initname) + strlen(path); - char filename[pathlen + 1]; - sprintf(filename,"%s/%s",path,initname); - int iErr = luaL_dofile(L,filename); - SIrrlichtCreationParameters p = SIrrlichtCreationParameters(); - if(iErr != 0){ - printf("Failed to open lua file:%s\n", filename); - } - settingsFromTable(L,&p); - IrrlichtDevice* dev = createDeviceEx(p); - if(!dev) - exit(1); - dev->setWindowCaption(L"Borkengin"); - return dev; + //printf("Attempting to load settings...\n"); + char initname[] = "deviceinit.lua"; + size_t pathlen = strlen(initname) + strlen(path); + char filename[pathlen + 1]; + sprintf(filename,"%s/%s",path,initname); + int iErr = luaL_dofile(L,filename);//ret + SIrrlichtCreationParameters p = SIrrlichtCreationParameters(); + if(iErr != 0){ + printf("Failed to open lua file:%s\n", filename); + } + settingsFromTable(L,&p); + IrrlichtDevice* dev = createDeviceEx(p); + if(!dev) + exit(1); + dev->setWindowCaption(L"Brokengine"); + lua_pop(L,1); + return dev; } |
