From 79ed9b96e83e8740e05a5d2a75d06e95467cb514 Mon Sep 17 00:00:00 2001 From: Per Inge Mathisen Date: Sun, 7 Jun 2009 20:13:24 +0000 Subject: [PATCH] Do not make power option go away in pre-game dialog when turning scavengers on. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7682 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/multiint.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/multiint.c b/src/multiint.c index 0796141fa..b07056336 100644 --- a/src/multiint.c +++ b/src/multiint.c @@ -1128,9 +1128,7 @@ static void addGameOptions(BOOL bRedo) // game type addBlueForm(MULTIOP_OPTIONS,MULTIOP_GAMETYPE,_("Scavengers"),MCOL0,MROW5,MULTIOP_BLUEFORMW,27); addMultiBut(psWScreen, MULTIOP_GAMETYPE, MULTIOP_CAMPAIGN, MCOL1, 2, MULTIOP_BUTW, MULTIOP_BUTH, _("Scavengers"), IMAGE_ARENA, IMAGE_ARENA_HI, true); // "campaign" - addMultiBut(psWScreen, MULTIOP_GAMETYPE, MULTIOP_SKIRMISH, MCOL2, 2, MULTIOP_BUTW, MULTIOP_BUTH, _("No Scavengers"), IMAGE_SKIRMISH, IMAGE_SKIRMISH_HI, true);// "skirmish" - - + addMultiBut(psWScreen, MULTIOP_GAMETYPE, MULTIOP_SKIRMISH, MCOL2, 2, MULTIOP_BUTW, MULTIOP_BUTH, _("No Scavengers"), IMAGE_SKIRMISH, IMAGE_SKIRMISH_HI, true); // "skirmish" widgSetButtonState(psWScreen, MULTIOP_CAMPAIGN, 0); widgSetButtonState(psWScreen, MULTIOP_SKIRMISH, 0); @@ -1196,15 +1194,7 @@ static void addGameOptions(BOOL bRedo) break; } - // pow levels - if (game.type == CAMPAIGN) - { - addBlueForm(MULTIOP_OPTIONS,MULTIOP_POWER,_("Power"),MCOL0,MROW7,MULTIOP_BLUEFORMW,27); - } - else - { - addBlueForm(MULTIOP_OPTIONS,MULTIOP_POWER,_("Power"),MCOL0,MROW8,MULTIOP_BLUEFORMW,27); - } + addBlueForm(MULTIOP_OPTIONS, MULTIOP_POWER, _("Power"), MCOL0, MROW8, MULTIOP_BLUEFORMW, 27); addMultiBut(psWScreen,MULTIOP_POWER,MULTIOP_POWLEV_LOW,MCOL1,2,MULTIOP_BUTW,MULTIOP_BUTH, _("Low Power Levels"),IMAGE_POWLO,IMAGE_POWLO_HI,true); addMultiBut(psWScreen,MULTIOP_POWER,MULTIOP_POWLEV_MED,MCOL2,2,MULTIOP_BUTW,MULTIOP_BUTH, @@ -1227,15 +1217,7 @@ static void addGameOptions(BOOL bRedo) break; } - //type clean/base/defence - if (game.type == CAMPAIGN) - { - addBlueForm(MULTIOP_OPTIONS, MULTIOP_BASETYPE, _("Base"), MCOL0, MROW8, MULTIOP_BLUEFORMW, 27); - } - else - { - addBlueForm(MULTIOP_OPTIONS, MULTIOP_BASETYPE, _("Base"), MCOL0, MROW9, MULTIOP_BLUEFORMW, 27); - } + addBlueForm(MULTIOP_OPTIONS, MULTIOP_BASETYPE, _("Base"), MCOL0, MROW9, MULTIOP_BLUEFORMW, 27); addMultiBut(psWScreen,MULTIOP_BASETYPE,MULTIOP_CLEAN,MCOL1,2,MULTIOP_BUTW,MULTIOP_BUTH, _("Start with No Bases"), IMAGE_NOBASE,IMAGE_NOBASE_HI,true); addMultiBut(psWScreen,MULTIOP_BASETYPE,MULTIOP_BASE,MCOL2,2,MULTIOP_BUTW,MULTIOP_BUTH,