Added weapon_restrict mod, upgraded source mod to 1.10-6501, metamod …

…to 1.11-1143
lenosisnickerboa · Dec 6, 2020 · b6eafd1 · b6eafd1
1 parent 53f5395
commit b6eafd1
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 37 deletions.
diff --git a/mods/linux/Makefile b/mods/linux/Makefile
@@ -2,11 +2,11 @@
 TARGET=linux
 include ../common.mk
 METAMOD_HOME_URL="http://www.metamodsource.net/"
-METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-linux.tar.gz"
-METAMOD_VERSION="1.10.7-git971"
+METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1143-linux.tar.gz"
+METAMOD_VERSION="1.11.0-git1143"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6499-linux.tar.gz"
-SOURCEMOD_VERSION="1.10.0-git6499"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6501-linux.tar.gz"
+SOURCEMOD_VERSION="1.10.0-git6501"
 export
 
 all: mods
@@ -16,6 +16,7 @@ contribs:
 	@echo "$(TARGET) sourcemod $(SOURCEMOD_VERSION) $(SOURCEMOD_HOME_URL) $(SOURCEMOD_URL)"
 	$(MAKE) -C ../mods/franug-knifes contrib
 	$(MAKE) -C ../mods/franug-weapon-paint contrib
+	$(MAKE) -C ../mods/weapon_restrict contrib
 	$(MAKE) -C ../mods/warmod contrib
 	$(MAKE) -C ../mods/multi1v1 contrib
 	$(MAKE) -C ../mods/gunmenu contrib
@@ -37,6 +38,7 @@ mods: dl-metamod dl-sourcemod
 	mkdir -p $(MODS_ROOT)
 	(cd $(MODS_ROOT) ; tar xzvpf ../metamod.tar.gz)
 	(cd $(MODS_ROOT) ; tar xzvpf ../sourcemod.tar.gz)
+	$(MAKE) -C ../mods/weapon_restrict
 	$(MAKE) -C ../mods/warmod
 	$(MAKE) -C ../mods/multi1v1
 	$(MAKE) -C ../mods/gunmenu
@@ -58,6 +60,7 @@ mods: dl-metamod dl-sourcemod
 clean:
 	$(MAKE) -C ../mods/franug-knifes clean
 	$(MAKE) -C ../mods/franug-weapon-paint clean
+	$(MAKE) -C ../mods/weapon_restrict clean
 	$(MAKE) -C ../mods/warmod clean
 	$(MAKE) -C ../mods/multi1v1 clean
 	$(MAKE) -C ../mods/gunmenu clean

diff --git a/mods/mods/weapon_restrict/Makefile b/mods/mods/weapon_restrict/Makefile
@@ -0,0 +1,21 @@
+WEAPON_RESTRICT_HOME_URL="https://forums.alliedmods.net/showthread.php?p=950174"
+WEAPON_RESTRICT_URL="https://forums.alliedmods.net/attachment.php?attachmentid=162251&d=1492626443"
+WEAPON_RESTRICT_VERSION="3.1.7"
+
+all: build
+
+contrib:
+	@echo "$(TARGET) weapon_restrict $(WEAPON_RESTRICT_VERSION) $(WEAPON_RESTRICT_HOME_URL) $(WEAPON_RESTRICT_URL)"
+
+dl:
+	wget $(WEAPON_RESTRICT_URL) -O weapon_restrict.zip
+
+build: dl
+	\rm -rf zipped >/dev/null 2>&1
+	mkdir zipped
+	(cd zipped ; unzip -o ../weapon_restrict.zip)
+	cp -af zipped/* $(MODS_ROOT)/
+	\rm -rf zipped
+
+clean:
+	\rm -rf zipped weapon_restrict.zip
diff --git a/mods/windows/Makefile b/mods/windows/Makefile
@@ -2,11 +2,11 @@
 TARGET=windows
 include ../common.mk
 METAMOD_HOME_URL="http://www.metamodsource.net/"
-METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-windows.zip"
-METAMOD_VERSION="1.10.7-git971"
+METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1143-windows.zip"
+METAMOD_VERSION="1.11.0-git1143"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6499-windows.zip"
-SOURCEMOD_VERSION="1.10.0-git6499"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6501-windows.zip"
+SOURCEMOD_VERSION="1.10.0-git6501"
 export
 
 all: mods
@@ -16,6 +16,7 @@ contribs:
 	@echo "$(TARGET) sourcemod $(SOURCEMOD_VERSION) $(SOURCEMOD_HOME_URL) $(SOURCEMOD_URL)"
 	$(MAKE) -C ../mods/franug-knifes contrib
 	$(MAKE) -C ../mods/franug-weapon-paint contrib
+	$(MAKE) -C ../mods/weapon_restrict contrib
 	$(MAKE) -C ../mods/warmod contrib
 	$(MAKE) -C ../mods/multi1v1 contrib
 	$(MAKE) -C ../mods/gunmenu contrib
@@ -37,6 +38,7 @@ mods: dl-metamod dl-sourcemod
 	mkdir -p $(MODS_ROOT)
 	(cd $(MODS_ROOT) ; unzip -o ../metamod.zip)
 	(cd $(MODS_ROOT) ; unzip -o ../sourcemod.zip)
+	$(MAKE) -C ../mods/weapon_restrict
 	$(MAKE) -C ../mods/warmod
 	$(MAKE) -C ../mods/multi1v1
 	$(MAKE) -C ../mods/gunmenu
@@ -58,6 +60,7 @@ mods: dl-metamod dl-sourcemod
 clean:
 	$(MAKE) -C ../mods/franug-knifes clean
 	$(MAKE) -C ../mods/franug-weapon-paint clean
+	$(MAKE) -C ../mods/weapon_restrict clean
 	$(MAKE) -C ../mods/warmod clean
 	$(MAKE) -C ../mods/multi1v1 clean
 	$(MAKE) -C ../mods/gunmenu clean

diff --git a/src/contribs.tcl b/src/contribs.tcl
@@ -17,18 +17,21 @@ set windows_img_url "http://www.tcl.tk/starkits/img.kit"
 set windows_wget_version "1.20.3-win32"
 set windows_wget_home_url "https://www.gnu.org/software/wget"
 set windows_wget_url "https://eternallybored.org/misc/wget/releases/wget-1.20.3-win32.zip"
-set linux_metamod_version "1.10.7-git971"
+set linux_metamod_version "1.11.0-git1143"
 set linux_metamod_home_url "http://www.metamodsource.net/"
-set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-linux.tar.gz"
-set linux_sourcemod_version "1.10.0-git6499"
+set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1143-linux.tar.gz"
+set linux_sourcemod_version "1.10.0-git6501"
 set linux_sourcemod_home_url "http://www.sourcemod.net/"
-set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6499-linux.tar.gz"
+set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6501-linux.tar.gz"
 set linux_franug_knifes_version "sha-ff449c6-2016-05-05"
 set linux_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes"
 set linux_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip"
 set linux_franug_weapon_paints_version "sha-fc7178d-2016-05-05"
 set linux_franug_weapon_paints_home_url "https://github.com/Franc1sco/Franug-Weapon_Paints"
 set linux_franug_weapon_paints_url "https://github.com/Franc1sco/Franug-Weapon_Paints/archive/fc7178d.zip"
+set linux_weapon_restrict_version "3.1.7"
+set linux_weapon_restrict_home_url "https://forums.alliedmods.net/showthread.php?p=950174"
+set linux_weapon_restrict_url "https://forums.alliedmods.net/attachment.php?attachmentid=162251"
 set linux_warmod_version "17.08.12.1053"
 set linux_warmod_home_url "https://forums.alliedmods.net/showthread.php?t=225474"
 set linux_warmod_url "https://warmod.bitbucket.io/plugins/warmod.smx"
@@ -56,18 +59,21 @@ set linux_shanapu_myweaponallocator_url "https://github.com/shanapu/MyWeaponAllo
 set linux_splewis_pugsetup_version "2.0.5"
 set linux_splewis_pugsetup_home_url "https://forums.alliedmods.net/showthread.php?t=244114"
 set linux_splewis_pugsetup_url "https://github.com/splewis/csgo-pug-setup/releases/download/2.0.5/pugsetup_2.0.5.zip"
-set windows_metamod_version "1.10.7-git971"
+set windows_metamod_version "1.11.0-git1143"
 set windows_metamod_home_url "http://www.metamodsource.net/"
-set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.10/mmsource-1.10.7-git971-windows.zip"
-set windows_sourcemod_version "1.10.0-git6499"
+set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1143-windows.zip"
+set windows_sourcemod_version "1.10.0-git6501"
 set windows_sourcemod_home_url "http://www.sourcemod.net/"
-set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6499-windows.zip"
+set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6501-windows.zip"
 set windows_franug_knifes_version "sha-ff449c6-2016-05-05"
 set windows_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes"
 set windows_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip"
 set windows_franug_weapon_paints_version "sha-fc7178d-2016-05-05"
 set windows_franug_weapon_paints_home_url "https://github.com/Franc1sco/Franug-Weapon_Paints"
 set windows_franug_weapon_paints_url "https://github.com/Franc1sco/Franug-Weapon_Paints/archive/fc7178d.zip"
+set windows_weapon_restrict_version "3.1.7"
+set windows_weapon_restrict_home_url "https://forums.alliedmods.net/showthread.php?p=950174"
+set windows_weapon_restrict_url "https://forums.alliedmods.net/attachment.php?attachmentid=162251"
 set windows_warmod_version "17.08.12.1053"
 set windows_warmod_home_url "https://forums.alliedmods.net/showthread.php?t=225474"
 set windows_warmod_url "https://warmod.bitbucket.io/plugins/warmod.smx"

diff --git a/src/page_sourcemod.tcl b/src/page_sourcemod.tcl
@@ -10,6 +10,7 @@ variable sourcemodPlugins [list \
     rockthevote [list false sm_rockthevote_enable sm_rockthevote_lanonly rockthevote.smx] \
     nextmap [list false sm_nextmap_enable sm_nextmap_lanonly nextmap.smx] \
     randomcycle [list false sm_randomcycle_enable sm_randomcycle_lanonly randomcycle.smx] \
+    weapon_restrict [list false sm_weapon_restrict_enable sm_weapon_restrict_lanonly weapon_restrict.smx] \
     warmod [list false sm_warmod_enable sm_warmod_lanonly warmod.smx] \
     multi1v1 [list false sm_multi1v1_enable sm_multi1v1_lanonly multi1v1.smx] \
     multi1v1_flashbangs [list false sm_multi1v1_flashbangs_enable sm_multi1v1_flashbangs_lanonly multi1v1_flashbangs.smx] \
@@ -45,7 +46,7 @@ variable sourcemodConfig [CreateConfig \
         "string"    [list admins "" "List all users (separated by space) you want to give admin permissions on your server\nA user is identified by their steam id (e.g STEAM_1:1:12345678) or ip address (e.g. 192.168.1.123).\nSee help page for more information about how to obtain your steam id or find users ip address."]\
         "bool"      [list sm_mapchooser_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodMapChooserState"]\
         "bool"      [list sm_mapchooser_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
-        "bool"      [list sm_mapchooser_mapvote_endvote "1" "Specifies if MapChooser should run an end of map vote."]\
+        "bool"      [list sm_mapchooser_mapvote_endvote "0" "Specifies if MapChooser should run on end of map vote."]\
         "bool"      [list sm_nominations_enable "0" "Controls if this sourcemod plugin is enabled.\nRequires mapchooser enabled." onchange "SetSourcemodNominationsState"]\
         "bool"      [list sm_nominations_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_rockthevote_enable "0" "Controls if this sourcemod plugin is enabled.\nRequires mapchooser enabled." onchange "SetSourcemodRockTheVoteState"]\
@@ -54,6 +55,8 @@ variable sourcemodConfig [CreateConfig \
         "bool"      [list sm_nextmap_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_randomcycle_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodRandomCycleState"]\
         "bool"      [list sm_randomcycle_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
+        "bool"      [list sm_weapon_restrict_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodWeaponRestrictState"]\
+        "bool"      [list sm_weapon_restrict_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_warmod_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodWarmodState"]\
         "bool"      [list sm_warmod_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_multi1v1_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodMulti1v1State"]\
@@ -70,11 +73,11 @@ variable sourcemodConfig [CreateConfig \
         "bool"      [list sm_cksurf_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_retakes_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodRetakesState"]\
         "bool"      [list sm_retakes_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
-        "bool"      [list sm_retakes_sitepicker_enable "0" "Controls if this sourcemod plugin is enabled."]\
+        "bool"      [list sm_retakes_sitepicker_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodRetakesSitePickerState"]\
         "bool"      [list sm_retakes_sitepicker_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
-        "bool"      [list sm_retakes_standardallocator_enable "0" "Controls if this sourcemod plugin is enabled.\nExcludes sm_retakes_pistolallocator" onchange "SetSourcemodRetakesPistolAllocatorValue"]\
+        "bool"      [list sm_retakes_standardallocator_enable "0" "Controls if this sourcemod plugin is enabled.\nExcludes sm_retakes_pistolallocator" onchange "SetSourcemodRetakesStandardAllocatorStateAndValue"]\
         "bool"      [list sm_retakes_standardallocator_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
-        "bool"      [list sm_retakes_pistolallocator_enable "0" "Controls if this sourcemod plugin is enabled.\nExcludes sm_retakes_standardallocator" onchange "SetSourcemodRetakesStandardAllocatorValue"]\
+        "bool"      [list sm_retakes_pistolallocator_enable "0" "Controls if this sourcemod plugin is enabled.\nExcludes sm_retakes_standardallocator" onchange "SetSourcemodRetakesPistolAllocatorStateAndValue"]\
         "bool"      [list sm_retakes_pistolallocator_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
         "bool"      [list sm_influx_enable "0" "Controls if this sourcemod plugin is enabled." onchange "SetSourcemodInfluxState"]\
         "bool"      [list sm_influx_lanonly "1" "Only enable this sourcemod plugin in lanonly mode"]\
@@ -134,6 +137,10 @@ variable sourcemodLayout [CreateLayout \
         parm    [list sm_randomcycle_enable] \
         parm    [list sm_randomcycle_lanonly] \
         space   [list] \
+        h2      [list "Plugin: weapon_restrict"] \
+        parm    [list sm_weapon_restrict_enable] \
+        parm    [list sm_weapon_restrict_lanonly] \
+        space   [list] \
         h2      [list "Plugin: warmod"] \
         parm    [list sm_warmod_enable] \
         parm    [list sm_warmod_lanonly] \
@@ -229,6 +236,7 @@ proc SetSourcemodState { value } {
     foreach parm [list lanonly banprotection allowbannedinpublicservers admins sm_mapchooser_enable sm_mapchooser_lanonly sm_mapchooser_mapvote_endvote\
                   sm_nominations_enable sm_nominations_lanonly sm_rockthevote_enable sm_rockthevote_lanonly\
                   sm_nextmap_enable sm_nextmap_lanonly sm_randomcycle_enable sm_randomcycle_lanonly\
+                  sm_weapon_restrict_enable sm_weapon_restrict_lanonly\
                   sm_warmod_enable sm_warmod_lanonly sm_multi1v1_enable sm_multi1v1_lanonly sm_multi1v1_flashbangs_enable\
                   sm_multi1v1_flashbangs_lanonly sm_multi1v1_kniferounds_enable sm_multi1v1_kniferounds_lanonly\
                   sm_multi1v1_online_stats_viewer_enable sm_multi1v1_online_stats_viewer_enable sm_multi1v1_online_stats_viewer_lanonly\
@@ -250,6 +258,7 @@ proc SetSourcemodState { value } {
     SetSourcemodRockTheVoteState [expr $enabled && [GetConfigItem $sourcemodConfig sm_rockthevote_enable]]
     SetSourcemodNextMapState [expr $enabled && [GetConfigItem $sourcemodConfig sm_nextmap_enable]]
     SetSourcemodRandomCycleState [expr $enabled && [GetConfigItem $sourcemodConfig sm_randomcycle_enable]]
+    SetSourcemodWeaponRestrictState [expr $enabled && [GetConfigItem $sourcemodConfig sm_weapon_restrict_enable]]
     SetSourcemodWarmodState [expr $enabled && [GetConfigItem $sourcemodConfig sm_warmod_enable]]
     SetSourcemodMulti1v1State [expr $enabled && [GetConfigItem $sourcemodConfig sm_multi1v1_enable]]
     SetSourcemodGunMenuState [expr $enabled && [GetConfigItem $sourcemodConfig sm_gunmenu_enable]]
@@ -313,6 +322,15 @@ proc SetSourcemodRandomCycleState { value } {
     }
     return $value
 }
+proc SetSourcemodWeaponRestrictState { value } {
+    global sourcemodLayout
+    set cp [GetCp]
+    set enabled $value
+    foreach parm [list sm_weapon_restrict_lanonly] {
+        SetConfigItemState $cp.sourcemod $sourcemodLayout $parm $enabled
+    }
+    return $value
+}
 proc SetSourcemodWarmodState { value } {
     global sourcemodLayout
     set cp [GetCp]
@@ -355,35 +373,79 @@ proc SetSourcemodRetakesState { value } {
     global sourcemodLayout
     set cp [GetCp]
     set enabled $value
-    foreach parm [list sm_retakes_lanonly sm_retakes_sitepicker_enable\
-                  sm_retakes_sitepicker_lanonly sm_retakes_standardallocator_enable sm_retakes_standardallocator_lanonly\
-                  sm_retakes_pistolallocator_enable sm_retakes_pistolallocator_lan_only] {
+    foreach parm [list sm_retakes_lanonly sm_retakes_sitepicker_enable sm_retakes_standardallocator_enable sm_retakes_pistolallocator_enable] {
         SetConfigItemState $cp.sourcemod $sourcemodLayout $parm $enabled
     }
+    if { "$value" == "0" } {
+        global sourcemodConfig
+        SetConfigItem $sourcemodConfig sm_retakes_sitepicker_enable "0"
+        SetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable "0"
+        SetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable "0"
+    } else {
+        global sourcemodConfig
+        SetSourcemodRetakesSitePickerState [GetConfigItem $sourcemodConfig sm_retakes_sitepicker_enable]
+        SetSourcemodRetakesStandardAllocatorState [GetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable]
+        SetSourcemodRetakesPistolAllocatorState [GetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable]
+    }
     return $value
 }
-proc SetSourcemodRetakesPistolAllocatorValue { value } {
-    global sourcemodConfig
-    if { $value == "0" } {
-        return $value
+proc SetSourcemodRetakesSitePickerState { value } {
+    global sourcemodLayout
+    set cp [GetCp]
+    set enabled $value
+    foreach parm [list sm_retakes_sitepicker_lanonly] {
+        SetConfigItemState $cp.sourcemod $sourcemodLayout $parm $enabled
     }
-    set otherValue [GetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable]
-    if { $otherValue == "1"} {
-        SetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable "0"
+    return $value
+}
+proc SetSourcemodRetakesStandardAllocatorState { value } {
+    global sourcemodLayout
+    set cp [GetCp]
+    set enabled $value
+    foreach parm [list sm_retakes_standardallocator_lanonly] {
+        SetConfigItemState $cp.sourcemod $sourcemodLayout $parm $enabled
     }
     return $value
 }
 proc SetSourcemodRetakesStandardAllocatorValue { value } {
-    global sourcemodConfig
-    if { $value == "0" } {
-        return $value
+    if { $value != "0" } {
+        global sourcemodConfig
+        set otherValue [GetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable]
+        if { $otherValue == "1"} {
+            SetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable "0"
+            SetSourcemodRetakesStandardAllocatorState "0"
+        }
     }
-    set otherValue [GetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable]
-    if { $otherValue == "1"} {
-        SetConfigItem $sourcemodConfig sm_retakes_standardallocator_enable "0"
+    return $value
+}
+proc SetSourcemodRetakesStandardAllocatorStateAndValue { value } {
+    SetSourcemodRetakesStandardAllocatorState "$value"
+    SetSourcemodRetakesPistolAllocatorValue "$value"
+}
+proc SetSourcemodRetakesPistolAllocatorState { value } {
+    global sourcemodLayout
+    set cp [GetCp]
+    set enabled $value
+    foreach parm [list sm_retakes_pistolallocator_lanonly] {
+        SetConfigItemState $cp.sourcemod $sourcemodLayout $parm $enabled
     }
     return $value
 }
+proc SetSourcemodRetakesPistolAllocatorValue { value } {
+    if { $value != "0" } {
+        global sourcemodConfig
+        set otherValue [GetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable]
+        if { $otherValue == "1"} {
+            SetConfigItem $sourcemodConfig sm_retakes_pistolallocator_enable "0"
+            SetSourcemodRetakesPistolAllocatorState "0"
+        }
+    }
+    return $value
+}
+proc SetSourcemodRetakesPistolAllocatorStateAndValue { value } {
+    SetSourcemodRetakesPistolAllocatorState "$value"
+    SetSourcemodRetakesStandardAllocatorValue "$value"
+}
 proc SetSourcemodInfluxState { value } {
     global sourcemodLayout
     set cp [GetCp]

diff --git a/src/version.tcl b/src/version.tcl
@@ -3,4 +3,4 @@
 # The next line is executed by /bin/sh, but not tcl \
 exec wish "$0" ${1+"$@"}
 
-set version "2.9.3"
+set version "2.9.4"