Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Remove] Removed instantiation of Game* game as KonoM seemd to have moved it.

Browse Source
This commit is contained in:
Rtch90 2012-02-03 00:16:09 +00:00
parent 9a23bd1547
commit 816ea51c86
1 changed files with 84 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
src/Unuk/main.cpp
View File

@ -25,20 +25,20 @@
#endif #endif
static gameNavVal_t RunGame(bool load) { static gameNavVal_t RunGame(bool load) {
Debug::logger->message("Entering game state.."); Debug::logger->message("Entering game state..");
Game* game = new Game; Game* game = new Game;
if(load) {
game->Load("save");
} else {
game->New("save");
}
gameNavVal_t ret = game->Run(); if(load) {
game->Load("save");
delete game; } else {
game->New("save");
return ret; }
gameNavVal_t ret = game->Run();
delete game;
return ret;
} }
#if !defined(_WIN32) || defined(_DEBUG) #if !defined(_WIN32) || defined(_DEBUG)
@ -47,95 +47,93 @@ int main() {
int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int) { int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int) {
#endif #endif
Debug::openLog(true); Debug::openLog(true);
Debug::logger->message("\n----- Engine Loading -----"); Debug::logger->message("\n----- Engine Loading -----");
if(SDL_Init(SDL_INIT_VIDEO == -1)) { if(SDL_Init(SDL_INIT_VIDEO == -1)) {
system("zenity --error --text=\"Could not load SDL\""); system("zenity --error --text=\"Could not load SDL\"");
Debug::logger->message("Error: Could not load SDL"); Debug::logger->message("Error: Could not load SDL");
return 1; return 1;
} else } else
Debug::logger->message("SDL loaded.."); Debug::logger->message("SDL loaded..");
if(TTF_Init() == -1) { if(TTF_Init() == -1) {
system("zenity --error --text=\"Could not load SDL_TTF\""); system("zenity --error --text=\"Could not load SDL_TTF\"");
Debug::logger->message("Error: Could not load SDL_TTF"); Debug::logger->message("Error: Could not load SDL_TTF");
return 1; return 1;
} else } else
Debug::logger->message("SDL_TTF loaded.."); Debug::logger->message("SDL_TTF loaded..");
screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_HWSURFACE); screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_HWSURFACE);
Debug::logger->message("Video mode set.."); Debug::logger->message("Video mode set..");
SDL_WM_SetCaption("fps - 00", NULL); SDL_WM_SetCaption("fps - 00", NULL);
srand((unsigned int)time(NULL)); srand((unsigned int)time(NULL));
camera.x = 0; camera.x = 0;
camera.y = 0; camera.y = 0;
camera.w = SCREEN_WIDTH; camera.w = SCREEN_WIDTH;
camera.h = SCREEN_HEIGHT; camera.h = SCREEN_HEIGHT;
errorTexture = LoadImage("../Data/Media/error.png"); errorTexture = LoadImage("../Data/Media/error.png");
Text::LoadFonts(); Text::LoadFonts();
Game* game = NULL; Debug::logger->message("Creating mainmenu..");
MainMenu* menu = new MainMenu;
Debug::logger->message("Creating mainmenu.."); Debug::logger->message("\n----- Engine Initialization Complete -----");
MainMenu* menu = new MainMenu; Debug::logger->message("\n----- Logic -----");
Debug::logger->message("\n----- Engine Initialization Complete -----"); bool menuRunning = true;
Debug::logger->message("\n----- Logic -----"); while(menuRunning) {
switch(menu->Run()) {
case mainMenuNewGame:
delete menu;
switch(RunGame(false)) {
case gameMainMenu:
menu = new MainMenu;
break;
case gameQuitGame:
menuRunning = false;
break;
}
break;
case mainMenuLoadGame:
delete menu;
switch(RunGame(true)) {
case gameMainMenu:
menu = new MainMenu;
break;
case gameQuitGame:
menuRunning = false;
break;
}
break;
case mainMenuOptions:
break;
case mainMenuExitGame:
menuRunning = false;
delete menu;
break;
}
}
//stringstream caption;
//caption << "Unuk - FPS: " << fps;
bool menuRunning = true; //SDL_WM_SetCaption(caption.str().c_str(), NULL);
while(menuRunning) {
switch(menu->Run()) {
case mainMenuNewGame:
delete menu;
switch(RunGame(false)) {
case gameMainMenu:
menu = new MainMenu;
break;
case gameQuitGame:
menuRunning = false;
break;
}
break;
case mainMenuLoadGame:
delete menu;
switch(RunGame(true)) {
case gameMainMenu:
menu = new MainMenu;
break;
case gameQuitGame:
menuRunning = false;
break;
}
break;
case mainMenuOptions:
break;
case mainMenuExitGame:
menuRunning = false;
delete menu;
break;
}
}
//stringstream caption;
//caption << "Unuk - FPS: " << fps;
//SDL_WM_SetCaption(caption.str().c_str(), NULL); // Clean up after ourselves.
Text::FreeFonts();
// Clean up after ourselves. SDL_FreeSurface(screen);
Text::FreeFonts(); SDL_FreeSurface(errorTexture);
SDL_FreeSurface(screen); SDL_Quit();
SDL_FreeSurface(errorTexture); TTF_Quit();
SDL_Quit(); return 0;
TTF_Quit();
return 0;
} }