diff --git a/src/frontend.c b/src/frontend.c index 802f3888b..847a767e3 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -448,21 +448,13 @@ BOOL runSinglePlayerMenu(void) case FRONTEND_LOADCAM2: sstrcpy(aLevelName, "CAM_2A"); changeTitleMode(STARTGAME); - #ifdef LOADINGBACKDROPS - AddLoadingBackdrop(true); - #else initLoadingScreen(true); - #endif break; case FRONTEND_LOADCAM3: sstrcpy(aLevelName, "CAM_3A"); changeTitleMode(STARTGAME); - #ifdef LOADINGBACKDROPS - AddLoadingBackdrop(true); - #else initLoadingScreen(true); - #endif break; case FRONTEND_LOADGAME: addLoadSave(LOAD_FRONTEND,SaveGamePath,"gam",_("Load Saved Game")); // change mode when loadsave returns diff --git a/src/multiint.c b/src/multiint.c index f7aa5d212..23ae6c147 100644 --- a/src/multiint.c +++ b/src/multiint.c @@ -191,7 +191,6 @@ static void hidePasswordForm(void); static void showPasswordForm(void); // Connection option functions -static void addConnections (UDWORD); void runConnectionScreen (void); BOOL startConnectionScreen (void); @@ -521,17 +520,12 @@ BOOL startConnectionScreen(void) 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(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; } -// 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 ) { @@ -554,18 +548,6 @@ void runConnectionScreen(void ) bMultiPlayer = false; bMultiMessages = false; 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 NETsetupTCPIP(""); //inet if ((LobbyError != ERROR_KICKED) && (LobbyError != ERROR_CHEAT)) diff --git a/src/multiint.h b/src/multiint.h index 94b50a0c8..d4708ad33 100644 --- a/src/multiint.h +++ b/src/multiint.h @@ -63,7 +63,6 @@ void loadMapPreview(bool hideInterface); #define CON_CONTYPES_FORM 10104 #define CON_TYPESID_START 10105 #define CON_TYPESID_END 10128 -#define CON_TYPESID_MORE 10129 #define CON_SETTINGS 10130 #define CON_SETTINGS_LABEL 10131