walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use function pointer array for init steps.

This commit is contained in:
Steve 2016-02-29 11:38:31 +00:00
parent 10cc12bd70
commit 1808ec8fbc
1 changed files with 26 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/system/init.c
View File

@ -116,8 +116,26 @@ void initSDL(void)
void initGameSystem(void) void initGameSystem(void)
{ {
int step = 0; int i, numInitFuns;
int STEPS = 16; void (*initFuncs[]) (void) = {
initFonts,
initInput,
initLookups,
initSounds,
initWidgets,
initGame,
loadFighterDefs,
loadCapitalShipDefs,
loadItemDefs,
initBulletDefs,
initStarSystems,
initChallenges,
initStats,
initBattle,
initModalDialog
};
numInitFuns = sizeof(initFuncs) / sizeof(void*);
initColor(&colors.red, 255, 0, 0); initColor(&colors.red, 255, 0, 0);
initColor(&colors.orange, 255, 128, 0); initColor(&colors.orange, 255, 128, 0);
@ -131,67 +149,12 @@ void initGameSystem(void)
initColor(&colors.lightGrey, 192, 192, 192); initColor(&colors.lightGrey, 192, 192, 192);
initColor(&colors.darkGrey, 128, 128, 128); initColor(&colors.darkGrey, 128, 128, 128);
showLoadingStep(step++, STEPS); for (i = 0 ; i < numInitFuns ; i++)
{
initFonts(); showLoadingStep(i, numInitFuns);
showLoadingStep(step++, STEPS); initFuncs[i]();
}
initInput();
showLoadingStep(step++, STEPS);
initLookups();
showLoadingStep(step++, STEPS);
initSounds();
showLoadingStep(step++, STEPS);
initWidgets();
showLoadingStep(step++, STEPS);
initGame();
showLoadingStep(step++, STEPS);
loadFighterDefs();
showLoadingStep(step++, STEPS);
loadCapitalShipDefs();
showLoadingStep(step++, STEPS);
loadItemDefs();
showLoadingStep(step++, STEPS);
initBulletDefs();
showLoadingStep(step++, STEPS);
initStarSystems();
showLoadingStep(step++, STEPS);
initChallenges();
showLoadingStep(step++, STEPS);
initStats();
showLoadingStep(step++, STEPS);
initBattle();
showLoadingStep(step++, STEPS);
initModalDialog();
showLoadingStep(step++, STEPS);
} }
/* /*