diff --git a/Save/save b/Save/save index a8b9eeb..002604b 100644 --- a/Save/save +++ b/Save/save @@ -1,7 +1,7 @@ Allanis - 220 - 144 + 100 + 168 map diff --git a/Unuk-QT/Unuk-QT b/Unuk-QT/Unuk-QT new file mode 100755 index 0000000..60b52dd Binary files /dev/null and b/Unuk-QT/Unuk-QT differ diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp index 5f69e15..44f4e69 100644 --- a/src/Unuk/Game.cpp +++ b/src/Unuk/Game.cpp @@ -8,6 +8,7 @@ Game::Game(void) { } Game::~Game(void) { + Debug::logger->message("----- Cleaning Up ------"); // cleaning _player up caused a nice seg fault. I'll look later. //delete _player; delete _npc; @@ -148,6 +149,7 @@ void Game::HandleInput(void) { break; case ingameMenuSaveGame: SaveSavegame(); + _ingameMenu.SetStatus(false); Debug::logger->message("Game Saved!"); break; case ingameMenuLoadGame: diff --git a/src/Unuk/main.cpp b/src/Unuk/main.cpp index eedf668..b1613c7 100644 --- a/src/Unuk/main.cpp +++ b/src/Unuk/main.cpp @@ -31,19 +31,27 @@ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int) { #endif Debug::openLog(true); + Debug::logger->message("\n----- Engine Loading -----"); if(SDL_Init(SDL_INIT_VIDEO == -1)) { system("zenity --error --text=\"Could not load SDL\""); Debug::logger->message("Error: Could not load SDL"); return 1; - } + } else + Debug::logger->message("SDL loaded.."); + if(TTF_Init() == -1) { system("zenity --error --text=\"Could not load SDL_TTF\""); Debug::logger->message("Error: Could not load SDL_TTF"); return 1; - } + } else + Debug::logger->message("SDL_TTF loaded.."); + + screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_HWSURFACE); + Debug::logger->message("Video mode set.."); + SDL_WM_SetCaption("fps - 00", NULL); srand((unsigned int)time(NULL)); @@ -58,13 +66,19 @@ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int) { Text::LoadFonts(); Game* game = NULL; + + Debug::logger->message("Creating mainmenu.."); MainMenu* menu = new MainMenu; + Debug::logger->message("\n----- Engine Initialization Complete -----"); + Debug::logger->message("\n----- Logic -----"); + bool menuRunning = true; while(menuRunning) { switch(menu->Run()) { case mainMenuNewGame: delete menu; + Debug::logger->message("Entering game state.."); game = new Game; switch(game->Run("save")) { @@ -75,7 +89,6 @@ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int) { menuRunning = false; break; } - delete game; break; case mainMenuLoadGame: