From 24c7936d09f1cac5979fb19e076e377d9f613e60 Mon Sep 17 00:00:00 2001
From: Bukz <bukizzle316@gmail.com>
Date: Wed, 13 Mar 2013 10:25:34 +0000
Subject: [PATCH] bot settings menu, nextGameMode VAR

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7349 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/defaults.cfg       | 3 ++-
 config/menus_bot.cfg      | 8 +++++++-
 config/menus_settings.cfg | 1 +
 source/src/clientgame.cpp | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/defaults.cfg b/config/defaults.cfg
index 0451e75f..061eb086 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -33,4 +33,5 @@ nonSurvDefaults = 0
 survDamageEffects = 1
 autosavemap = 0
 timeBetAutoSaves = 300000
-numAutoSaveBackups = 3
\ No newline at end of file
+numAutoSaveBackups = 3
+menuBotGameLength = 15
\ No newline at end of file
diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index 332bf80c..1d7a8a8c 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -52,7 +52,7 @@ const preparebotmatch [
     mode 0 // reset mode for next maps
   ]
   mode $tmp_mode
-  map $tmp_botmap
+  map $tmp_botmap $menuBotGameLength
 ]
 
 const afterdisconnect [
@@ -89,6 +89,7 @@ menuitem [Bot Team Survivor]           [ tmp_mode = 20; showmenu botskill ]
 menuitem [Bot Team One Shot, One Kill] [ tmp_mode = 21; showmenu botskill ]
 menuitem [Bot Survival]                [ showmenu [Survival Mode] ]
 menuitem [] -1
+menuitem [Bot settings...] [ showmenu [Bot settings] ]
 menuitem [Empty Map] emptymap
 
 const showmenu_enemies [ if (isbotteammode $tmp_mode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
@@ -143,6 +144,11 @@ menuitemslider [Spam survival mode messages: ] 0 1 "$spamSurvMsgs" 1 [ no yes ]
 menuitem [] -1
 menuitem [                                   Back] [ closemenu [Survival Mode - Customize] ]
 
+newmenu [Bot settings]
+menuitemslider [Bot match length in minutes: ] 1 60 "$menuBotGameLength" 1 [] [ menuBotGameLength = $arg1 ]
+menuitemcheckbox [Idle bots?] "(idlebots 2)" [ idlebots $arg1 ]
+menuitemcheckbox [Bots attack?] "(botsshoot 2)" [ botsshoot $arg1 ]
+
 newmenu [Creating bot waypoints]
 
 menuitem [Waypoints...]             [ showmenu Waypoints ]
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index 920bccea..ecd9c765 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -443,6 +443,7 @@ menuitem [Change weapon...]                                    [ showmenu Weapon
 menuitem [Change player skin...]                               [ showmenu (at [CLA RVSF] (player1 team)) ]
 menuitem [Weapon settings...]                                  [ showmenu [Weapon Settings] ]
 menuitem [Edit kill messages...]                               [ showmenu [Kill Messages] ]
+menuitem [Bot settings...]                                     [ showmenu [Bot settings] ]
 
 __fontsetting = 0    // Initial setting for status of fonts so AC doesn't give errors.
 __screenshottype = 0 // Initial setting for status of fonts so AC doesn't give errors.
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 04d67ae8..58c3870e 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -5,6 +5,7 @@
 
 int nextmode = 0;   // nextmode becomes gamemode after next map load
 VAR(gamemode, 1, 0, 0);
+VAR(nextGameMode, 1, 0, 0);
 VARP(modeacronyms, 0, 1, 1);
 
 flaginfo flaginfos[2];
@@ -12,6 +13,7 @@ flaginfo flaginfos[2];
 void mode(int *n)
 {
     nextmode = *n;
+    nextGameMode = nextmode;
     if(m_mp(*n) || !multiplayer()) addmsg(SV_GAMEMODE, "ri", *n);
 }
 COMMAND(mode, "i");