diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/initdevice.cpp | 12 | ||||
| -rw-r--r-- | src/client/lua_api/load_video.cpp | 1 | ||||
| -rw-r--r-- | src/client/main.cpp | 20 |
3 files changed, 10 insertions, 23 deletions
diff --git a/src/client/initdevice.cpp b/src/client/initdevice.cpp index 34a07af..15b551f 100644 --- a/src/client/initdevice.cpp +++ b/src/client/initdevice.cpp @@ -179,7 +179,6 @@ IrrlichtDevice* spawnIrrDevice(lua_State* L, char *path){ char filename[pathlen + 1]; sprintf(filename,"%s/%s",path,initname); int iErr = luaL_dofile(L,filename);//ret - /* TODO: This is currently broken SIrrlichtCreationParameters p; if(iErr != 0){ printf("Failed to open lua file:%s\n", filename); @@ -191,17 +190,6 @@ IrrlichtDevice* spawnIrrDevice(lua_State* L, char *path){ printf("Creating device...\n"); IrrlichtDevice* dev = createDeviceEx(p); printf("[OK]\n"); - */ - printf("Creating static device:\n"); - IrrlichtDevice* dev = createDevice( - video::EDT_OPENGL, - core::dimension2d<u32>(640,480), - 16, - false, - false, - false, - 0 - ); if(!dev){ printf("Failed to create device\n"); exit(1); diff --git a/src/client/lua_api/load_video.cpp b/src/client/lua_api/load_video.cpp index 73be550..63f2af3 100644 --- a/src/client/lua_api/load_video.cpp +++ b/src/client/lua_api/load_video.cpp @@ -113,5 +113,4 @@ void load_videofuncs(lua_State* L){ itexture_register(L); iimage_register(L); draw_register(L); - } diff --git a/src/client/main.cpp b/src/client/main.cpp index 7198fb1..784929a 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -238,21 +238,21 @@ int main(int argc, char *argv[]){ printf("About to check if device run\n"); printf("Device is %p\n",device); while(device->run()){ - printf("Start gameloop net\n"); + //printf("Start gameloop net\n"); assert(lua_gettop(L) == 0); gameloop_net(L); assert(lua_gettop(L) == 0); - printf("End gameloop net\n"); - printf("Start gameloop phys\n"); + //printf("End gameloop net\n"); + //printf("Start gameloop phys\n"); assert(lua_gettop(L) == 0); gameloop_phys(UpdateElement); assert(lua_gettop(L) == 0); - printf("End gameloop phys\n"); + //printf("End gameloop phys\n"); if(device->isWindowActive()){ assert(lua_gettop(L) == 0); driver->beginScene(true, true, background); assert(lua_gettop(L) == 0); - printf("Device active, began scene\n"); + //printf("Device active, began scene\n"); assert(lua_gettop(L) == 0); pusherrorfunc(state); lua_getglobal(state,"GAME");//err(),{GAME} @@ -264,10 +264,10 @@ int main(int argc, char *argv[]){ lua_pop(state,3); } assert(lua_gettop(L) == 0); - printf("Finished calling GAME.draw()\n"); + //printf("Finished calling GAME.draw()\n"); smgr->drawAll(); - printf("Scene manager drew all\n"); + //printf("Scene manager drew all\n"); assert(lua_gettop(L) == 0); lua_getglobal(state,"GAME"); lua_getfield(state,-1,"drawPostScene"); @@ -278,9 +278,9 @@ int main(int argc, char *argv[]){ lua_pop(state,2); } assert(lua_gettop(L) == 0); - printf("Post draw scene completed\n"); + //printf("Post draw scene completed\n"); guienv->drawAll(); - printf("Gui draw all completed\n"); + //printf("Gui draw all completed\n"); assert(lua_gettop(L) == 0); lua_getglobal(state,"GAME"); lua_getfield(state,-1,"drawPostGui"); @@ -291,7 +291,7 @@ int main(int argc, char *argv[]){ lua_pop(state,2); } assert(lua_gettop(L) == 0); - printf("GAME.drawPostGui completed\n"); + //printf("GAME.drawPostGui completed\n"); driver->endScene(); }else{ assert(lua_gettop(L) == 0); |