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

Remove some dead code. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11007 4a71c877-e1ca-e34f-864e-861f7616d084
master
Christian Ohm 2010-06-20 23:51:24 +00:00 committed by Git SVN Gateway
parent 6e88ea7a6e
commit 5a15ae67cc
3 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend.c
View File

@ -448,21 +448,13 @@ BOOL runSinglePlayerMenu(void)
case FRONTEND_LOADCAM2: case FRONTEND_LOADCAM2:
sstrcpy(aLevelName, "CAM_2A"); sstrcpy(aLevelName, "CAM_2A");
changeTitleMode(STARTGAME); changeTitleMode(STARTGAME);
#ifdef LOADINGBACKDROPS
AddLoadingBackdrop(true);
#else
initLoadingScreen(true); initLoadingScreen(true);
#endif
break; break;
case FRONTEND_LOADCAM3: case FRONTEND_LOADCAM3:
sstrcpy(aLevelName, "CAM_3A"); sstrcpy(aLevelName, "CAM_3A");
changeTitleMode(STARTGAME); changeTitleMode(STARTGAME);
#ifdef LOADINGBACKDROPS
AddLoadingBackdrop(true);
#else
initLoadingScreen(true); initLoadingScreen(true);
#endif
break; break;
case FRONTEND_LOADGAME: case FRONTEND_LOADGAME:
addLoadSave(LOAD_FRONTEND,SaveGamePath,"gam",_("Load Saved Game")); // change mode when loadsave returns addLoadSave(LOAD_FRONTEND,SaveGamePath,"gam",_("Load Saved Game")); // change mode when loadsave returns

22
src/multiint.c
View File

@ -197,7 +197,6 @@ static void hidePasswordForm(void);
static void showPasswordForm(void); static void showPasswordForm(void);
// Connection option functions // Connection option functions
static void addConnections (UDWORD);
void runConnectionScreen (void); void runConnectionScreen (void);
BOOL startConnectionScreen (void); BOOL startConnectionScreen (void);
@ -527,17 +526,12 @@ BOOL startConnectionScreen(void)
addMultiBut(psWScreen,FRONTEND_BOTFORM,CON_CANCEL,10,10,MULTIOP_OKW,MULTIOP_OKH, addMultiBut(psWScreen,FRONTEND_BOTFORM,CON_CANCEL,10,10,MULTIOP_OKW,MULTIOP_OKH,
_("Return To Previous Screen"), IMAGE_RETURN, IMAGE_RETURN_HI, IMAGE_RETURN_HI); // goback buttpn levels _("Return To Previous Screen"), IMAGE_RETURN, IMAGE_RETURN_HI, IMAGE_RETURN_HI); // goback buttpn levels
addConnections(0); addTextButton(CON_TYPESID_START+0,FRONTEND_POS2X,FRONTEND_POS2Y, _("Lobby"), WBUT_TXTCENTRE);
addTextButton(CON_TYPESID_START+1,FRONTEND_POS3X,FRONTEND_POS3Y, _("IP"), WBUT_TXTCENTRE);
return true; return true;
} }
// add connections
static void addConnections(UDWORD begin)
{
addTextButton(CON_TYPESID_START+begin+0,FRONTEND_POS2X,FRONTEND_POS2Y, _("Lobby"), WBUT_TXTCENTRE);
addTextButton(CON_TYPESID_START+begin+1,FRONTEND_POS3X,FRONTEND_POS3Y, _("IP"), WBUT_TXTCENTRE);
}
void runConnectionScreen(void ) void runConnectionScreen(void )
{ {
@ -560,18 +554,6 @@ void runConnectionScreen(void )
bMultiPlayer = false; bMultiPlayer = false;
bMultiMessages = false; bMultiMessages = false;
break; break;
case CON_TYPESID_MORE:
widgDelete(psWScreen,FRONTEND_BOTFORM);
SettingsUp = false;
InitialProto +=5;
addBottomForm();
addMultiBut(psWScreen,FRONTEND_BOTFORM,CON_CANCEL,10,10,MULTIOP_OKW,MULTIOP_OKH,
_("Return To Previous Screen"), IMAGE_RETURN, IMAGE_RETURN_HI, IMAGE_RETURN_HI); // goback buttpn levels
addConnections(InitialProto);
break;
case CON_TYPESID_START+0: // Lobby button case CON_TYPESID_START+0: // Lobby button
NETsetupTCPIP(""); //inet NETsetupTCPIP(""); //inet
if ((LobbyError != ERROR_KICKED) && (LobbyError != ERROR_CHEAT)) if ((LobbyError != ERROR_KICKED) && (LobbyError != ERROR_CHEAT))

1
src/multiint.h
View File

@ -63,7 +63,6 @@ void loadMapPreview(bool hideInterface);
#define CON_CONTYPES_FORM 10104 #define CON_CONTYPES_FORM 10104
#define CON_TYPESID_START 10105 #define CON_TYPESID_START 10105
#define CON_TYPESID_END 10128 #define CON_TYPESID_END 10128
#define CON_TYPESID_MORE 10129
#define CON_SETTINGS 10130 #define CON_SETTINGS 10130
#define CON_SETTINGS_LABEL 10131 #define CON_SETTINGS_LABEL 10131