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 @@
-
- Returns string B inserted into string A at position X.
-
-
-
- Output: Hello cruel world
-
-
-
- Output: -1
-
-
-
-
-
-
-
-
- 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.
-
-
-
-
-
-
-
-
-
-
Returns the position of a substring into another
@@ -4844,6 +4815,11 @@ Output:
+
+
+ enables or disables the showing of game mode descriptions on the console after map starts.
+
+
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)
{