Version 2.11

- Added option to disable Steam workshop loading. - Upgraded Sourcemod to 1.10 - 6528
lenosisnickerboa · Dec 20, 2021 · cfef219 · cfef219
1 parent 1b9b369
commit cfef219
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/mods/linux/Makefile b/mods/linux/Makefile
@@ -5,8 +5,8 @@ METAMOD_HOME_URL="http://www.metamodsource.net/"
 METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-linux.tar.gz"
 METAMOD_VERSION="1.11.0-git1145"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6514-linux.tar.gz"
-SOURCEMOD_VERSION="1.10.0-git6514"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-linux.tar.gz"
+SOURCEMOD_VERSION="1.10.0-git6528"
 export
 
 all: mods

diff --git a/mods/windows/Makefile b/mods/windows/Makefile
@@ -5,8 +5,8 @@ METAMOD_HOME_URL="http://www.metamodsource.net/"
 METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-windows.zip"
 METAMOD_VERSION="1.11.0-git1145"
 SOURCEMOD_HOME_URL="http://www.sourcemod.net/"
-SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6513-windows.zip"
-SOURCEMOD_VERSION="1.10.0-git6513"
+SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-windows.zip"
+SOURCEMOD_VERSION="1.10.0-git6528"
 export
 
 all: mods

diff --git a/src/contribs.tcl b/src/contribs.tcl
@@ -20,9 +20,9 @@ set windows_wget_url "https://eternallybored.org/misc/wget/releases/wget-1.20.3-
 set linux_metamod_version "1.11.0-git1145"
 set linux_metamod_home_url "http://www.metamodsource.net/"
 set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-linux.tar.gz"
-set linux_sourcemod_version "1.10.0-git6514"
+set linux_sourcemod_version "1.10.0-git6528"
 set linux_sourcemod_home_url "http://www.sourcemod.net/"
-set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6514-linux.tar.gz"
+set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-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"
@@ -62,9 +62,9 @@ set linux_splewis_pugsetup_url "https://github.com/splewis/csgo-pug-setup/releas
 set windows_metamod_version "1.11.0-git1145"
 set windows_metamod_home_url "http://www.metamodsource.net/"
 set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-windows.zip"
-set windows_sourcemod_version "1.10.0-git6513"
+set windows_sourcemod_version "1.10.0-git6528"
 set windows_sourcemod_home_url "http://www.sourcemod.net/"
-set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6513-windows.zip"
+set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-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"

diff --git a/src/maps_support.tcl b/src/maps_support.tcl
@@ -162,6 +162,12 @@ proc GetMapImageUrl {htmlfile protocol matcherBegin matcherEnd} {
 #<link rel="image_src" href="http://images.akamai.steamusercontent.com/ugc/884098384874424133/13068CB677948EC551F775C8603445E2CDD14BCC/?interpolation=lanczos-none&output-format=jpeg&output-quality=95&fit=inside|512:*">
 #<link rel="image_src" href="https://steamuserimages-a.akamaihd.net/ugc/3281180873728311819/394154653C6BD4B8410C781B94898BDFC01002D2/?interpolation=lanczos-none&output-format=jpeg&output-quality=95&fit=inside%7C512%3A*">
 proc LoadMapImageFromWorkshop {url workshopDir id map} {
+    global applicationConfig
+    set loadMapFromWorkshop [GetConfigValue $applicationConfig loadmapfromworkshop]
+    if {$loadMapFromWorkshop == 0} {
+        Trace "Skipping loading map $map from Steam workshop"
+        return 0
+    }
     set mapDir "$workshopDir/$id"
     set htmlFile "$mapDir/temp.html"
     Wget $url $htmlFile

diff --git a/src/page_application.tcl b/src/page_application.tcl
@@ -21,6 +21,7 @@ variable applicationConfig [CreateConfig \
         "bool"      [list showdonation "1" "Disable to stop showing donation button. Please consider donating first though :)"]\
         "bool"      [list generategamemodeservers "1" "Disable automatic regeneration of gamemode_servers.txt."]\
         "string"    [list mainwingeometry "1200x800+100+100" "last saved windows size and location."]\
+        "bool"      [list loadmapfromworkshop "1" "Controls if maps are loaded from Steam workshop or not."]\
     ] \
 ]
 
@@ -48,6 +49,7 @@ variable applicationLayout [CreateLayout \
         parm    [list trace] \
         parm    [list showdonation] \
         parm    [list generategamemodeservers] \
+        parm    [list loadmapfromworkshop] \
         space   [list] \
         func    [list LayoutFuncSetDefaultsAll] \
         space   [list] \

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.10"
+set version "2.11"