From d1790770d5470344878145c416859229207f3d7f Mon Sep 17 00:00:00 2001
From: Bukz <bukizzle316@gmail.com>
Date: Tue, 13 Dec 2011 15:02:25 +0000
Subject: [PATCH] cleanup + showmodedescriptions

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6734 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/scripts.cfg        | 15 +--------------
 docs/reference.xml        | 34 +++++-----------------------------
 source/src/clientgame.cpp |  4 +++-
 3 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/config/scripts.cfg b/config/scripts.cfg
index 233c41cf..e94e2f32 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -62,7 +62,7 @@ const gibsgore [
 // This command allows swapping of fullscreen mode to be bound to a key.
 const fullscreenscript [ if $fullscreen [ fullscreen 0 ] [ fullscreen 1 ] ]
 
-const editmapmsg [ saycommand ( concatword [/mapmsg ] ["] (getmapmsg) ["] ) ]
+const editmapmsg [ saycommand (concat "/mapmsg" (addpunct (getmapmsg))) ]
 
 const run [ exec (concatword config/ $arg1 .cfg) ]
 
@@ -340,19 +340,6 @@ switch = [
   ]
 ]
 
-// strins - Inserts a string into another string, at position x.
-const strins [
-  if (> $numargs 2) [
-    if (&& (> $arg3 -1) (< $arg3 (strlen $arg1))) [
-      tmp_output = ""
-      loop sil (strlen $arg1) [
-        if (= $sil $arg3) [ tmp_output = (concatword $tmp_output $arg2 (substr $arg1 $sil 1)) ] [ tmp_output = (concatword $tmp_output (substr $arg1 $sil 1)) ]
-      ]
-      result $tmp_output
-    ] [ result -1 ]
-  ]
-]
-
 // cleanshot - Take a "clean" screenshot with no HUD items.
 const cs_sets "clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun spechudgun showstats showtargetname showgrid"
 const cs_newsets "0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0"
diff --git a/docs/reference.xml b/docs/reference.xml
index 9fcbe4e7..29ad731e 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -482,35 +482,6 @@
           </references>
 				</command>
 
-        <command name="strins">
-          <description>Returns string B inserted into string A at position X.</description>
-          <examples>
-            <example>
-              <code><![CDATA[echo (strins "Hello world" " cruel" 5)]]></code>
-              <explanation>Output: Hello cruel world</explanation>
-            </example>
-            <example>
-              <code><![CDATA[tmp = "Hello world"; echo (strins $tmp " cruel" (strlen $tmp))]]></code>
-              <explanation>Output: -1</explanation>
-            </example>
-          </examples>
-          <arguments>
-            <argument token="A" description="the original string"/>
-            <argument token="B" description="the string to insert into the original"/>
-            <argument token="P" description="the position at which to insert string B into string A"/>
-          </arguments>
-          <remarks>
-            <remark>The third argument must be at least greater than -1, and 1 less than the length "(in characters)" of string A, otherwise use concat or concatword.</remark>
-          </remarks>
-          <references>
-            <identifierReference identifier="concat"/>
-            <identifierReference identifier="concatword"/>
-            <identifierReference identifier="strlen"/>
-            <identifierReference identifier="substr"/>
-            <identifierReference identifier="strreplace"/>
-          </references>
-        </command>
-
               <command name="strpos">
                 <description>Returns the position of a substring into another</description>
                 <arguments>
@@ -4844,6 +4815,11 @@ Output:
             <identifierReference identifier="disablehud"/>
           </references>
         </command>
+        
+        <variable name="showmodedescriptions">
+          <description>enables or disables the showing of game mode descriptions on the console after map starts.</description>
+          <value token="B" description="0 off, 1 on" minValue="0" maxValue="1" defaultValue="1">
+        </variable>
 
 			</identifiers>
 		</section>
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 07469aee..e0552a03 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1172,6 +1172,8 @@ void showmapstats()
 }
 COMMAND(showmapstats, ARG_NONE);
 
+VARP(showmodedescriptions, 0, 1, 1);
+
 void startmap(const char *name, bool reset)   // called just after a map load
 {
     copystring(clientmap, name);
@@ -1204,7 +1206,7 @@ void startmap(const char *name, bool reset)   // called just after a map load
     bool noflags = (m_ctf || m_ktf) && (!numflagspawn[0] || !numflagspawn[1]);
     if(*clientmap) conoutf(_("game mode is \"%s\"%s"), modestr(gamemode, modeacronyms > 0), noflags ? " - \f2but there are no flag bases on this map" : "");
 
-    if(multiplayer(false) || m_botmode)
+    if(showmodedescriptions && (multiplayer(false) || m_botmode))
     {
         loopv(gmdescs) if(gmdescs[i].mode == gamemode)
         {