From a943dfb972d0893cb8f4655cbb6194c313252d42 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Tue, 17 Nov 2020 09:30:42 -0500 Subject: [PATCH] Switch case --- Classic/scripts/CTFGame.cs | 32 +++++++++++++++++--------------- Classic/scripts/SCtFGame.cs | 31 +++++++++++++++++-------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index 0a8d2db..2a2e9df 100644 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -1014,20 +1014,23 @@ function CTFGame::gameOver(%game) else if ($teamScore[2] > $teamScore[1]) %winner = %game.getTeamName(2); - if (%winner $= 'Storm') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.stowins.wav" ); - else if (%winner $= 'Inferno') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.infwins.wav" ); - else if (%winner $= 'Starwolf') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.swwin.wav" ); - else if (%winner $= 'Blood Eagle') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.bewin.wav" ); - else if (%winner $= 'Diamond Sword') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.dswin.wav" ); - else if (%winner $= 'Phoenix') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.pxwin.wav" ); - else - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.gameover.wav" ); + switch$(%winner) + { + case 'Storm': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.stowins.wav"); + case 'Inferno': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.infwins.wav"); + case 'Starwolf': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.swwin.wav"); + case 'Blood Eagle': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.bewin.wav"); + case 'Diamond Sword': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.dswin.wav"); + case 'Phoenix': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.pxwin.wav"); + default: + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.gameover.wav"); + } messageAll('MsgClearObjHud', ""); for(%i = 0; %i < ClientGroup.getCount(); %i ++) @@ -1037,7 +1040,6 @@ function CTFGame::gameOver(%game) } for(%j = 1; %j <= %game.numTeams; %j++) $TeamScore[%j] = 0; - } function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs index ff73c69..24ca626 100644 --- a/Classic/scripts/SCtFGame.cs +++ b/Classic/scripts/SCtFGame.cs @@ -575,20 +575,23 @@ function SCtFGame::gameOver(%game) else if ($teamScore[2] > $teamScore[1]) %winner = %game.getTeamName(2); - if (%winner $= 'Storm') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.stowins.wav" ); - else if (%winner $= 'Inferno') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.infwins.wav" ); - else if (%winner $= 'Starwolf') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.swwin.wav" ); - else if (%winner $= 'Blood Eagle') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.bewin.wav" ); - else if (%winner $= 'Diamond Sword') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.dswin.wav" ); - else if (%winner $= 'Phoenix') - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.pxwin.wav" ); - else - messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.gameover.wav" ); + switch$(%winner) + { + case 'Storm': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.stowins.wav"); + case 'Inferno': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.infwins.wav"); + case 'Starwolf': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.swwin.wav"); + case 'Blood Eagle': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.bewin.wav"); + case 'Diamond Sword': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.dswin.wav"); + case 'Phoenix': + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.pxwin.wav"); + default: + messageAll('MsgGameOver', "Match has ended.~wvoice/announcer/ann.gameover.wav"); + } messageAll('MsgClearObjHud', ""); for(%i = 0; %i < ClientGroup.getCount(); %i ++)