From ad12e10ea5a2f99d96714ef437ba57bc4ed4f36e Mon Sep 17 00:00:00 2001 From: Bukz Date: Sat, 4 Jun 2011 14:29:21 +0000 Subject: [PATCH] updates/fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6495 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/scripts.cfg | 5 ++--- source/src/bot/botmanager.cpp | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/scripts.cfg b/config/scripts.cfg index 3606fe4e..94941c81 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -97,11 +97,10 @@ gamemodedesc 17 [Team Last Swiss Standing: TODO] gamemodedesc 18 [Bot Pistol Frenzy: TODO] gamemodedesc 19 [Bot Last Swiss Standing: TODO] - resetbinds = [ run resetbinds; echo (c 3)All binds have been reset to default values! ] changeteam = [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT" (curteam)) ] ] -spectate = [ suicide; sleep 500 [ team SPECTATOR ] ] +spectate = [ if $connected [ suicide; sleep 500 [ team SPECTATOR ] ] ] // Mode/map-setting aliases. votemap = [ mode $arg1; map $arg2 ] @@ -329,7 +328,7 @@ getscrext = [ ] // getmodeacr - Returns the proper current mode's acronym. -gamemodes_list = "TDM COOP DM SURV TSURV CTF PF BTDM BDM LSS OSOK TOSOK BOSOK HTF TKTF KTF" +gamemodes_list = "TDM COOP DM SURV TSURV CTF PF BTDM BDM LSS OSOK TOSOK BOSOK HTF TKTF KTF TPF TLSS BPF BLSS" getmodeacr = [ result (at $gamemodes_list $gamemode) ] // storesets - Generates an alias (list) of the current values for the given CVARs. diff --git a/source/src/bot/botmanager.cpp b/source/src/bot/botmanager.cpp index f1e85b4a..5e7be26b 100644 --- a/source/src/bot/botmanager.cpp +++ b/source/src/bot/botmanager.cpp @@ -1128,6 +1128,11 @@ COMMAND(togglegrap, ARG_NONE); void togglebotview(char *bot) { if(!botmode()) return; + /** + Disable in arena modes, this command causes the game to go in an "infinite loop" + due to player1 automatically suiciding thus causing a new round to begin. + */ + if(m_arena) { conoutf("togglebotview is not allowed in %s", modestr(gamemode, modeacronyms > 0)); return; } if (BotManager.m_pBotToView) BotManager.DisableBotView(); else if (bot && *bot)