Merge branch 'master' into vscript

Author: rtldg

.github/workflows/ci.yml

@@ -39,6 +39,13 @@ jobs:
           wget https://github.com/FortyTwoFortyTwo/VScript/archive/refs/tags/1.10.0.90.tar.gz
           tar --strip-components=1 -xvzf 1.10.0.90.tar.gz -C addons/sourcemod
           rm -rf *.zip *.tar.gz addons/sourcemod/{.git*,LICENSE,plugins,scripts,scripting/vscript_test.sp,README.md}
+          rm -rf *.zip *.tar.gz addons/sourcemod/.git* addons/sourcemod/LICENSE
+          wget https://github.com/srcwr/eventqueuefixfix/releases/download/v1.0.1/eventqueuefixfix-v1.0.1-def5b0e-windows-x32.zip
+          unzip eventqueuefixfix-v1.0.1-def5b0e-windows-x32.zip "addons/sourcemod/extensions/*"
+          rm "addons/sourcemod/extensions/eventqueuefixfix.pdb"
+          wget https://github.com/srcwr/srcwrfloppy/releases/download/v2.0.3/srcwrfloppy-v2.0.3.zip
+          unzip -qO UTF-8 srcwrfloppy-v2.0.3.zip "addons/sourcemod/extensions/*"
+          rm "addons/sourcemod/extensions/srcwr💾.pdb"
 
       - name: Run compiler
         shell: bash

CHANGELOG.md

@@ -3,8 +3,16 @@ Note: Dates are UTC+0.
 
 
 
-# v3.?.? - ? - 2025-06-?? - rtldg
-- shavit-mapchooser timerified (more) https://github.com/shavitush/bhoptimer/pull/1242 @mourningsickness
+# v3.?.? - ? - 2025-0?-? - rtldg
+what will go here? hmm i wonder... maybe vscript pull request? maybe updating tf2 gamedata because i forgot? who knows...
+
+
+
+# v3.5.1 - small things - 2025-06-24 - rtldg
+- fix olivia's name in the author lists https://github.com/shavitush/bhoptimer/commit/f0ccf6dc0aa45aa72d7c428d5c8866aae28467e4
+- shavit-wr.sp - add back buttons to !delete menus (QoL) https://github.com/shavitush/bhoptimer/commit/877b71aa4d8a7735ee0eec189dd0ef6a72249180 @mourningsickness @rtldg
+- Keep all menus open forever https://github.com/shavitush/bhoptimer/commit/bb09568d9797b61b1a0cd290b56545f8a928b8e8
+	- a few that were missed in a pass a couple years ago
 
 
 

README.md

@@ -25,6 +25,10 @@ Includes a records system, map zones (start/end marks etc), bonuses, HUD with us
 * [eventqueuefix](https://github.com/hermansimensen/eventqueue-fix)
   * Allows for timescaling boosters and is used to fix some exploits. (Use this instead of `boosterfix`)
   * (included in bhoptimer release zips)
+  * Along with using [eventqueuefixfix](https://github.com/srcwr/eventqueuefixfix) at the same time to fix eventqueuefix on Windows after the 2025-02-18 update.
+* [srcwr💾](https://github.com/srcwr/srcwrfloppy)
+  * Saves replays asynchronously (read: doesn't lag the server when saving a replay).
+  * (included in bhoptimer release zips)
 * [SteamWorks](https://forums.alliedmods.net/showthread.php?t=229556)
   * Used to grab `{serverip}` in advertisements.
 * [DynamicChannels](https://github.com/Vauff/DynamicChannels)

addons/sourcemod/gamedata/shavit.games.txt

@@ -162,10 +162,13 @@
 			}
 			// search "sv_maxusrcmdprocessticks_warning at server" to find CPlayerMove::RunCommand
 			// then sig the the `mov REG1,dword ptr [REG2 + OFFSET_TO_BUTTON_DISABLED_HERE]`
+			// looks like these in decompiled form:
+			// (windows) `param_3[0xc] = param_3[0xc] & ~param_2[0x32b];`
+			// (linux)   `*(uint *)(param_3 + 0x30) = uVar12 & ~param_2[0x331];`
 			"CBasePlayer->m_afButtonDisabled"
 			{
-				"windows"   "\x8B\x87\x2A\x2A\x2A\x2A\xF7\xD0\x21\x43"
-				"linux"     "\x8B\x83\x2A\x2A\x2A\x2A\xF7\xD0"
+				"windows"   "\x8B\x86\x2A\x2A\x2A\x2A\xF7\xD0\x21\x47"
+				"linux"     "\x8b\x93\x2A\x2A\x2A\x2A\xF7\xD2\x21\xd0"
 			}
 		}
 	}

addons/sourcemod/scripting/include/shavit/checkpoints.inc

@@ -1,6 +1,6 @@
 /*
  * shavit's Timer - Checkpoints
- * by: shavit, kidfearless, Nairda, GAMMA CASE, rtldg, sh4hrazad, Ciallo-Ani, OliviaMourning
+ * by: shavit, kidfearless, Nairda, GAMMA CASE, rtldg, sh4hrazad, Ciallo-Ani, olivia
  *
  * This file is part of shavit's Timer (https://github.com/shavitush/bhoptimer)
  *
@@ -301,10 +301,11 @@ native bool Shavit_LoadCheckpointCache(int client, any[] cache, int index, int s
  * @param cache                     Output cp_cache_t
  * @param index                     -1 if you want the cp_cache_t to be saved as "persistent data". 0 if not. greater-than-zero if you what you're doing and intentionally want to spoof the cp_cache_t creation as a checkpoint index for some reason... I recommend looking at shavit-checkpoints.sp to see how "index" and "isPersistentData" are used to see what kind of difference there is.
  * @param size                      sizeof(cp_cache_t) to mostly ensure the calling plugin has a matching cp_cache_t.
+ * @param saveReplay                Whether or not replay frames will be saved.
  *
  * @noreturn
  */
-native void Shavit_SaveCheckpointCache(int saver, int target, any[] cache, int index, int size = sizeof(cp_cache_t));
+native void Shavit_SaveCheckpointCache(int saver, int target, any[] cache, int index, int size = sizeof(cp_cache_t), bool saveReplay = false);
 
 public SharedPlugin __pl_shavit_checkpoints =
 {

addons/sourcemod/scripting/include/shavit/core.inc

@@ -24,7 +24,7 @@
 #endif
 #define _shavit_core_included
 
-#define SHAVIT_VERSION "3.5.1a"
+#define SHAVIT_VERSION "3.5.2a"
 #define STYLE_LIMIT 256
 
 // god i fucking hate sourcemod. NULL_VECTOR isn't const so it's not guaranteed to be 0,0,0

addons/sourcemod/scripting/include/shavit/replay-file.inc

@@ -365,6 +365,35 @@ stock void WriteReplayHeader(File fFile, int style, int track, float time, int s
 	fFile.WriteInt32(view_as<int>(fZoneOffset[1]));
 }
 
+stock void cell2buf(char[] buf, int& pos, int cell)
+{
+	buf[pos++] = cell & 0xFF;
+	buf[pos++] = (cell >> 8) & 0xFF;
+	buf[pos++] = (cell >> 16) & 0xFF;
+	buf[pos++] = (cell >> 24) & 0xFF;
+}
+
+stock int WriteReplayHeaderToBuffer(char[] buf, int style, int track, float time, int steamid, int preframes, int postframes, float fZoneOffset[2], int totalframes, float tickrate, const char[] sMap)
+{
+	int pos = FormatEx(buf, 512, "%d:%s\n%s", REPLAY_FORMAT_SUBVERSION, REPLAY_FORMAT_FINAL, sMap);
+	pos += 1; // skip past NUL
+	buf[pos++] = style & 0xFF;
+	buf[pos++] = track & 0xFF;
+	cell2buf(buf, pos, preframes);
+
+	cell2buf(buf, pos, totalframes - preframes - postframes);
+	cell2buf(buf, pos, view_as<int>(time));
+	cell2buf(buf, pos, steamid);
+
+	cell2buf(buf, pos, postframes);
+	cell2buf(buf, pos, view_as<int>(tickrate));
+
+	cell2buf(buf, pos, view_as<int>(fZoneOffset[0]));
+	cell2buf(buf, pos, view_as<int>(fZoneOffset[1]));
+
+	return pos;
+}
+
 // file_a is usually used as the wr replay file.
 // file_b is usually used as the duplicate/backup replay file.
 stock void WriteReplayFrames(ArrayList playerrecording, int iSize, File file_a, File file_b)

addons/sourcemod/scripting/include/shavit/replay-recorder.inc

@@ -48,8 +48,9 @@ forward Action Shavit_ShouldSaveReplayCopy(int client, int style, float time, in
 
 /**
  * Called when either a WR replay or a copy of a replay has been saved.
+ * NOTE: Can be called with a delay after a run is finished due to asynchronous replay saving through extensions.
  *
- * @param client                    Client index.
+ * @param client                    Client index. Can be 0 if the replay was saved asynchronously & the client disconnected super duper quick...
  * @param style                     Style the record was done on.
  * @param time                      Record time.
  * @param jumps                     Jumps amount.

addons/sourcemod/scripting/include/srcwr/floppy.inc

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2025 rtldg <rtldg@protonmail.com>
+
+#if defined _srcwrfloppy_included
+	#endinput
+#endif
+#define _srcwrfloppy_included
+#pragma semicolon 1
+
+
+typeset ReplaySavedCallback {
+	function void(bool saved, any value, char[] sPath);
+}
+
+
+// Don't modify the `playerrecording` ArrayList until the ReplaySavedCallback is called... OR ELSE!!!!
+native void SRCWRFloppy_AsyncSaveReplay(
+	  ReplaySavedCallback callback // what to call when saved
+	, any value // what to pass along to the callback
+	, char[] wrpath
+	, char[] copypath
+	, char[] header
+	, int headersize
+	, ArrayList playerrecording
+	, int totalframes
+);
+
+
+public Extension __ext_srcwrfloppy =
+{
+	name = "srcwr💾",
+	file = "srcwr💾.ext",
+#if defined AUTOLOAD_EXTENSIONS
+	autoload = 1,
+#else
+	autoload = 0,
+#endif
+#if defined REQUIRE_EXTENSIONS
+	required = 1,
+#else
+	required = 0,
+#endif
+};
+
+#if !defined REQUIRE_EXTENSIONS
+public void __ext_srcwrfloppy_SetNTVOptional()
+{
+	MarkNativeAsOptional("SRCWRFloppy_AsyncSaveReplay");
+}
+#endif

addons/sourcemod/scripting/shavit-checkpoints.sp

@@ -1,6 +1,6 @@
 /*
  * shavit's Timer - Checkpoints
- * by: shavit, kidfearless, Nairda, GAMMA CASE, rumour, rtldg, sh4hrazad, Ciallo-Ani, OliviaMourning, Nuko, yupi2
+ * by: shavit, kidfearless, Nairda, GAMMA CASE, rumour, rtldg, sh4hrazad, Ciallo-Ani, olivia, Nuko, yupi2
  *
  * This file is part of shavit's Timer (https://github.com/shavitush/bhoptimer)
  *
@@ -132,7 +132,7 @@ StringMap gH_VScript_Checkpoint_CustomData[MAXPLAYERS+1];
 public Plugin myinfo =
 {
 	name = "[shavit] Checkpoints",
-	author = "shavit, KiD Fearless, Nairda, GAMMA CASE, rumour, rtldg, sh4hrazad, Ciallo-Ani, OliviaMourning, Nuko, yupi2",
+	author = "shavit, KiD Fearless, Nairda, GAMMA CASE, rumour, rtldg, sh4hrazad, Ciallo-Ani, olivia, Nuko, yupi2",
 	description = "Checkpoints for shavit's bhop timer.",
 	version = SHAVIT_VERSION,
 	url = "https://github.com/shavitush/bhoptimer"
@@ -1602,7 +1602,7 @@ bool SaveCheckpoint(int client, bool duplicate = false)
 	return true;
 }
 
-void SaveCheckpointCache(int saver, int target, cp_cache_t cpcache, int index, Handle plugin)
+void SaveCheckpointCache(int saver, int target, cp_cache_t cpcache, int index, Handle plugin, bool saveReplay = false)
 {
 	GetClientAbsOrigin(target, cpcache.fPosition);
 	GetClientEyeAngles(target, cpcache.fAngles);
@@ -1716,7 +1716,7 @@ void SaveCheckpointCache(int saver, int target, cp_cache_t cpcache, int index, H
 	cpcache.aSnapshot = snapshot;
 	cpcache.bSegmented = CanSegment(target);
 
-	if (cpcache.bSegmented && gB_ReplayRecorder && index != -1 && cpcache.aFrames == null)
+	if (saveReplay || (cpcache.bSegmented && gB_ReplayRecorder && index != -1 && cpcache.aFrames == null))
 	{
 		ArrayList frames = Shavit_GetReplayData(target, false);
 
@@ -2286,7 +2286,8 @@ public any Native_SaveCheckpointCache(Handle plugin, int numParams)
 	int target = GetNativeCell(2);
 	cp_cache_t cache;
 	int index = GetNativeCell(4);
-	SaveCheckpointCache(saver, target, cache, index, plugin);
+	bool saveReplay = (numParams >= 6 && GetNativeCell(5));
+	SaveCheckpointCache(saver, target, cache, index, plugin, saveReplay);
 	return SetNativeArray(3, cache, sizeof(cp_cache_t));
 }