Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup, no change in behaviour. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1615 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-05-12 14:13:40 +00:00
parent dd03ace476
commit 165ed5ccda
7 changed files with 121 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend.c
View File

@ -295,7 +295,9 @@ BOOL startTitleMenu(void)
if(!bDisableLobby)
{
addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X,FRONTEND_POS3Y, _("Multi Player Game"), FALSE, FALSE);
}else{
}
else
{
addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X, FRONTEND_POS3Y, _("Multi Player Game"),FALSE,TRUE);
}
addTextButton(FRONTEND_TUTORIAL, FRONTEND_POS4X, FRONTEND_POS4Y, _("Tutorial") ,FALSE,FALSE);

2
src/frontend.h
View File

@ -46,7 +46,7 @@ typedef enum _title_mode {
KEYMAP, // 16 keymap editor
GAME2, // 17 second options menu.
GAME3, // 18 third options menu.
// GRAPHICS, // 5
// GRAPHICS,
// VIDEO,
// DEMOMODE, // demo mode. remove for release?
} tMode;

7
src/gateway.c
View File

@ -83,8 +83,7 @@ BOOL gwInitialise(void)
int i;
#endif
ASSERT( psGateways == NULL,
"gwInitialise: gatway list has not been reset" );
ASSERT( psGateways == NULL, "gwInitialise: gateway list has not been reset" );
psGateways = NULL;
@ -486,7 +485,6 @@ void gwFreeGateway(GATEWAY *psDel)
if (psMapTiles) // this lines fixes the bug where we were closing the gateways after freeing the map
{
// clear the map flags
if (psDel->x1 == psDel->x2)
{
@ -507,7 +505,8 @@ void gwFreeGateway(GATEWAY *psDel)
}
if(psDel->psLinks != NULL) {
if (psDel->psLinks != NULL)
{
free(psDel->psLinks);
}
free(psDel);

3
src/levels.c
View File

@ -869,8 +869,7 @@ BOOL levLoadData(char *pName, char *pSaveName, SDWORD saveType)
if (psNewLevel->game == i)
{
// do some more initialising if necessary
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= MULTI_TYPE_START ||
(psBaseData != NULL && !bCamChangeSaveGame))
if (psNewLevel->type == LDS_COMPLETE || psNewLevel->type >= MULTI_TYPE_START || (psBaseData != NULL && !bCamChangeSaveGame))
{
iV_Reset(); //unload font, to avoid crash on 8th load... ajl 15/sep/99
if (!stageTwoInitialise())

2
src/loop.c
View File

@ -612,7 +612,6 @@ GAMECODE gameLoop(void)
#ifdef DISP2D
disp2DModeChange();
#endif
dispModeChange();
}
}
@ -664,7 +663,6 @@ GAMECODE gameLoop(void)
#ifdef DISP2D
disp2DModeChange();
#endif
dispModeChange();
}
return GAMECODE_QUITGAME;
}

22
src/wrappers.c
View File

@ -93,7 +93,6 @@ STAR stars[30]; // quick hack for loading stuff
extern int WFont;
extern BOOL bLoadSaveUp;
static BOOL firstcall;
static UDWORD loadScreenCallNo=0;
static BOOL bPlayerHasLost = FALSE;
static BOOL bPlayerHasWon = FALSE;
@ -121,11 +120,8 @@ UDWORD i;
//
BOOL frontendInitVars(void)
{
firstcall = TRUE;
initStars();
return TRUE;
}
@ -133,17 +129,19 @@ BOOL frontendInitVars(void)
// Main Front end game loop.
TITLECODE titleLoop(void)
{
static BOOL firstcall = TRUE;
TITLECODE RetCode = TITLECODE_CONTINUE;
pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_ON);
pie_SetFogStatus(FALSE);
screen_RestartBackDrop();
if (firstcall) {
startTitleMenu();
titleMode = TITLE;
if (firstcall)
{
firstcall = FALSE;
changeTitleMode(TITLE);
frameSetCursorFromRes(IDC_DEFAULT); // reset cursor (sw)
if(NetPlay.bLobbyLaunched) // lobbies skip title screens & go into the game
@ -156,7 +154,6 @@ TITLECODE titleLoop(void)
{
ingame.bHostSetup = FALSE;
}
changeTitleMode(QUIT);
}
}
@ -229,16 +226,13 @@ TITLECODE titleLoop(void)
runGameOptions3Menu();
break;
case QUIT:
RetCode = TITLECODE_QUITGAME;
break;
case STARTGAME:
case LOADSAVEGAME:
initLoadingScreen(TRUE);//render active
if (titleMode == LOADSAVEGAME)
{
RetCode = TITLECODE_SAVEGAMELOAD;
@ -247,12 +241,9 @@ TITLECODE titleLoop(void)
{
RetCode = TITLECODE_STARTGAME;
}
return RetCode; // don't flip!
break;
case SHOWINTRO:
pie_SetFogStatus(FALSE);
pie_ScreenFlip(CLEAR_BLACK);//flip to clear screen but not here//reshow intro video.
pie_ScreenFlip(CLEAR_BLACK);//flip to clear screen but not here
@ -383,8 +374,7 @@ void runCreditsScreen( void )
if( keyReleased(KEY_ESC)
|| keyReleased(KEY_SPACE)
|| mouseReleased(MOUSE_LMB)
|| (gameTime-lastChange > 4000)
)
|| gameTime-lastChange > 4000 )
{
lastChange = gameTime;
changeTitleMode(QUIT);