miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source 
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@140 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
albertzeyer
2009-07-24 12:35:26 +00:00
parent 642dd887d3
commit b2e74c326e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@@ -125,12 +125,10 @@ int main(int argc, char *argv[])
banner(); // Intro on the text-console. banner(); // Intro on the text-console.
CGame* Game = new CGame(); CGame Game;
Game.preallocateCKP(&CKP);
Game->preallocateCKP(&CKP);
CSettings Settings; CSettings Settings;
if(Settings.loadDrvCfg() != 0) // Always return 0 if no ERROR if(Settings.loadDrvCfg() != 0) // Always return 0 if no ERROR
{ {
g_pLogFile->textOut(RED,"First time message: CKP didn't find the driver config file. However, it is going to generate one basing on default configurations.<br>"); g_pLogFile->textOut(RED,"First time message: CKP didn't find the driver config file. However, it is going to generate one basing on default configurations.<br>");
@@ -156,7 +154,7 @@ int main(int argc, char *argv[])
Settings.saveGameCfg(CKP.Option); Settings.saveGameCfg(CKP.Option);
} }
if(loadResourcesforStartMenu(&CKP, Game) != 0) if(loadResourcesforStartMenu(&CKP, &Game) != 0)
{ {
g_pLogFile->textOut(RED,"Error! Resources for start menu cannot be loaded! Maybe you need to copy the data files!<br>"); g_pLogFile->textOut(RED,"Error! Resources for start menu cannot be loaded! Maybe you need to copy the data files!<br>");
return 1; return 1;
@@ -178,7 +176,7 @@ int main(int argc, char *argv[])
CKP.Control.levelcontrol.episode = CKP.GameData[CKP.Resources.GameSelected-1].Episode; // Assign the correct Episode CKP.Control.levelcontrol.episode = CKP.GameData[CKP.Resources.GameSelected-1].Episode; // Assign the correct Episode
options = CKP.Option; options = CKP.Option;
if(Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory)) if(Game.loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory))
CKP.shutdown = SHUTDOWN_BOOTUP; // Prepare game for starting CKP.shutdown = SHUTDOWN_BOOTUP; // Prepare game for starting
else else
CKP.shutdown = SHUTDOWN_NEW_GAME; CKP.shutdown = SHUTDOWN_NEW_GAME;
@@ -187,7 +185,7 @@ int main(int argc, char *argv[])
{ {
if(CKP.shutdown != SHUTDOWN_NEW_GAME) { if(CKP.shutdown != SHUTDOWN_NEW_GAME) {
CKP.shutdown = SHUTDOWN_NONE; // Game is runnning CKP.shutdown = SHUTDOWN_NONE; // Game is runnning
Game->runCycle(&CKP); Game.runCycle(&CKP);
} }
if(CKP.shutdown == SHUTDOWN_NEW_GAME) if(CKP.shutdown == SHUTDOWN_NEW_GAME)
@@ -200,7 +198,7 @@ int main(int argc, char *argv[])
} }
//loadResourcesforGame(pCKP); //loadResourcesforGame(pCKP);
if(Game->loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory)) if(Game.loadResources(CKP.Control.levelcontrol.episode, CKP.GameData[CKP.Resources.GameSelected-1].DataDirectory))
CKP.shutdown = SHUTDOWN_RESTART; CKP.shutdown = SHUTDOWN_RESTART;
else else
CKP.shutdown = SHUTDOWN_NEW_GAME; CKP.shutdown = SHUTDOWN_NEW_GAME;
@@ -208,8 +206,6 @@ int main(int argc, char *argv[])
} }
} }
if(Game){ delete Game; Game = NULL; }
cleanupResources(&CKP); cleanupResources(&CKP);
printf("Thank you very much for playing this wonderful game!"); printf("Thank you very much for playing this wonderful game!");