diff options
Diffstat (limited to 'TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c')
| -rw-r--r-- | TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c index d59d7ba..44b2cea 100644 --- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c +++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c @@ -3,17 +3,17 @@ #strict 2 static const - SETTING_Deathmatch = 0, SETTING_SuddenDeath = 1, SETTING_Extinguisher = 2, SETTING_RotateInJump = 3, - SETTING_RelaunchesInc = 4, SETTING_RelaunchesDec = 5, - SETTING_DeathmatchScoreInc = 6, SETTING_DeathmatchScoreDec = 7, - SETTING_Ambience = 8; + SETTING_Deathmatch = 0, SETTING_SuddenDeath = 1, SETTING_RotateInJump = 2, + SETTING_RelaunchesInc = 3, SETTING_RelaunchesDec = 4, + SETTING_DeathmatchScoreInc = 5, SETTING_DeathmatchScoreDec = 6, + SETTING_Ambience = 7; local Sections, Modes; local clonk, setupPlayer; // Selected values local section, mode; -local extinguisherEnabled, suddendeathEnabled, rotateInJumpEnabled; +local suddendeathEnabled, rotateInJumpEnabled; local ambienceEnabled; local numRelaunches; local deathmatchEnabled, deathmatchWinScore; @@ -96,10 +96,6 @@ private func ShowSettingsMenu(bool preselect, int selectedSetting) AddOptionMenuItem(GetName(0, SDDT), suddendeathEnabled, "SelectSetting(SETTING_SuddenDeath)", SDDT); CheckPreselect(preselect && selectedSetting == SETTING_SuddenDeath, menuItemIndex++); - // Extinguisher entry - AddOptionMenuItem(GetName(0, _ETG), extinguisherEnabled, "SelectSetting(SETTING_Extinguisher)", _ETG); - CheckPreselect(preselect && selectedSetting == SETTING_Extinguisher, menuItemIndex++); - // "Turn in jump" entry AddOptionMenuItem(GetName(0, RIJP), rotateInJumpEnabled, "SelectSetting(SETTING_RotateInJump)", RIJP); CheckPreselect(preselect && selectedSetting == SETTING_RotateInJump, menuItemIndex++); @@ -138,10 +134,6 @@ private func SelectSetting(int selectedSetting) { suddendeathEnabled = !suddendeathEnabled; } - else if (selectedSetting == SETTING_Extinguisher) - { - extinguisherEnabled = !extinguisherEnabled; - } else if (selectedSetting == SETTING_RotateInJump) { rotateInJumpEnabled = !rotateInJumpEnabled; @@ -152,7 +144,7 @@ private func SelectSetting(int selectedSetting) } else if (selectedSetting == SETTING_RelaunchesInc) { - ++numRelaunches; + numRelaunches = Min(numRelaunches + 1, 15); } else if (selectedSetting == SETTING_RelaunchesDec) { @@ -231,10 +223,9 @@ private func GetMessage() msgWinScore = Format("{{SKIL}} %s: %d $Kills$", GetName(0, DTHM), deathmatchWinScore); } - var msgExtinguisher = Format("{{_ETG}} %s: %s", GetName(0, _ETG), IIf(extinguisherEnabled, "$Enabled$", "$Disabled$")); var msgSuddenDeath = Format("{{SDDT}} %s: %s", GetName(0, SDDT), IIf(suddendeathEnabled, "$Enabled$", "$Disabled$")); var msgRotateInJump = Format("{{RIJP}} %s: %s", GetName(0, RIJP), IIf(rotateInJumpEnabled, "$Enabled$", "$Disabled$")); var msgAmbience = Format("{{SABC}} $Ambience$: %s", IIf(ambienceEnabled, "$Enabled$", "$Disabled$")); - return Format("%s|%s|%s|%s|%s|%s|%s", msgSection, msgMode, msgWinScore, msgExtinguisher, msgSuddenDeath, msgRotateInJump, msgAmbience); -}
\ No newline at end of file + return Format("%s|%s|%s|%s|%s|%s", msgSection, msgMode, msgWinScore, msgSuddenDeath, msgRotateInJump, msgAmbience); +} |