Release v7.1: simplify cl_maxfps freeze sync, loading network UI

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: d3nd3

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v7.1
+
+### cl_maxfps singleplayer — simplify freeze sync
+
+- **Removed SV/CL throttle pairing** (`Qcommon_Frame` Pre + `SV_Frame` override) and **ExitLevel** / **GameDllLoaded** lifecycle hooks — freeze-flag sync alone fixes the post-cinematic black screen.
+- **Kept:** `CL_Frame` NOP patch, sofplus `sp_Sys_Mil` detour, **CinematicFreeze** mirror to exe, **M_PushMenu** Pre clear when game freeze is already off.
+- **README:** Documents root cause — throttled `CL_Frame` lets `intermission` run at `Qcommon_Frame` top `Cbuf_Execute` while exe `cinematicfreeze` is still set.
+
+### Internal menus — loading screen & HTTP maps
+
+- **Vanilla `loading.rmf`** for all local loads; custom Buddy loading UI only during **MP connect** or **HTTP maps** download.
+- **`loading_network.rmf`:** conditional map/download status panel in loading header via `_sofbuddy_loading_network` (`cninclude` on vanilla loading).
+- **`SCR_BeginLoadingPlaque`:** skip redundant second plaque push during HTTP precache (avoids killmenu flash / client instability before spawn); `killmenu` only on custom loading path.
+
 ## v7.0
 
 ### Scaled UI — per-font glyph snap & XP alignment fixes

VERSION

@@ -1 +1 @@
-7.0
+7.1

build/generated_detours.cpp

@@ -213,10 +213,6 @@ namespace detour_drawTeamIcons {
     tdrawTeamIcons odrawTeamIcons = nullptr;
 }
 
-namespace detour_SV_Frame {
-    tSV_Frame oSV_Frame = nullptr;
-}
-
 namespace detour_M_PushMenu {
     tM_PushMenu oM_PushMenu = nullptr;
 }
@@ -225,10 +221,6 @@ namespace detour_CinematicFreeze {
     tCinematicFreeze oCinematicFreeze = nullptr;
 }
 
-namespace detour_ExitLevel {
-    tExitLevel oExitLevel = nullptr;
-}
-
 namespace detour_Sys_Milliseconds {
     tSys_Milliseconds oSys_Milliseconds = nullptr;
 }
@@ -692,17 +684,6 @@ namespace detour_drawTeamIcons {
     }
 }
 
-namespace detour_SV_Frame {
-    ManagerType& GetManager() {
-        static ManagerType* instance = nullptr;
-        if (!instance) {
-            static char storage[sizeof(ManagerType)];
-            instance = new(storage) ManagerType();
-        }
-        return *instance;
-    }
-}
-
 namespace detour_M_PushMenu {
     ManagerType& GetManager() {
         static ManagerType* instance = nullptr;
@@ -725,17 +706,6 @@ namespace detour_CinematicFreeze {
     }
 }
 
-namespace detour_ExitLevel {
-    ManagerType& GetManager() {
-        static ManagerType* instance = nullptr;
-        if (!instance) {
-            static char storage[sizeof(ManagerType)];
-            instance = new(storage) ManagerType();
-        }
-        return *instance;
-    }
-}
-
 namespace detour_Sys_Milliseconds {
     ManagerType& GetManager() {
         static ManagerType* instance = nullptr;
@@ -947,17 +917,6 @@ namespace detour_CinematicFreeze {
     }
 }
 
-namespace detour_ExitLevel {
-    void __cdecl hkExitLevel() {
-        ManagerType& mgr = GetManager();
-        if (mgr.GetPreCallbackCount() > 0) mgr.DispatchPre();
-        if (oExitLevel) {
-            oExitLevel();
-        }
-        if (mgr.GetPostCallbackCount() > 0) mgr.DispatchPost();
-    }
-}
-
 // Override hooks (hooks.json override: true)
 // Note: Override hooks with custom_detour: true are manually installed at runtime and not generated here
 namespace detour_CL_Precache_f {
@@ -1098,12 +1057,6 @@ namespace detour_SCR_ExecuteLayoutString {
     }
 }
 
-namespace detour_SV_Frame {
-    void __cdecl hkSV_Frame(int msec) {
-        ::mfps_sv_frame_override(msec, oSV_Frame);
-    }
-}
-
 namespace detour_Sys_GetGameApi {
     void* __cdecl hkSys_GetGameApi(void* imports) {
         return ::sys_getgameapi_override_callback(imports, oSys_GetGameApi);

build/generated_detours.h

@@ -1082,33 +1082,6 @@ namespace {
     static AutoDetour_drawTeamIcons g_AutoDetour_drawTeamIcons;
 }
 
-namespace detour_SV_Frame {
-    using tSV_Frame = void(__cdecl*)(int msec);
-    extern tSV_Frame oSV_Frame;
-    using ManagerType = TypedSharedHookManager<void, int>;
-    ManagerType& GetManager();
-    
-    void __cdecl hkSV_Frame(int msec);
-}
-
-namespace {
-    struct AutoDetour_SV_Frame {
-        AutoDetour_SV_Frame() {
-            using namespace detour_SV_Frame;
-            if (!GetDetourSystem().IsDetourRegistered("SV_Frame")) {
-                GetDetourSystem().RegisterDetour(
-                    reinterpret_cast<void*>(0x0005F5B0),
-                    reinterpret_cast<void*>(detour_SV_Frame::hkSV_Frame),
-                    reinterpret_cast<void**>(&detour_SV_Frame::oSV_Frame),
-                    "SV_Frame",
-                    DetourModule::SofExe,
-                    static_cast<size_t>(0));
-            }
-        }
-    };
-    static AutoDetour_SV_Frame g_AutoDetour_SV_Frame;
-}
-
 namespace detour_M_PushMenu {
     using tM_PushMenu = void(__cdecl*)(char const* menu_file, char const* parentFrame, bool lock_input);
     extern tM_PushMenu oM_PushMenu;
@@ -1163,33 +1136,6 @@ namespace {
     static AutoDetour_CinematicFreeze g_AutoDetour_CinematicFreeze;
 }
 
-namespace detour_ExitLevel {
-    using tExitLevel = void(__cdecl*)();
-    extern tExitLevel oExitLevel;
-    using ManagerType = TypedSharedHookManager<void>;
-    ManagerType& GetManager();
-    
-    void __cdecl hkExitLevel();
-}
-
-namespace {
-    struct AutoDetour_ExitLevel {
-        AutoDetour_ExitLevel() {
-            using namespace detour_ExitLevel;
-            if (!GetDetourSystem().IsDetourRegistered("ExitLevel")) {
-                GetDetourSystem().RegisterDetour(
-                    reinterpret_cast<void*>(0xAE0A0),
-                    reinterpret_cast<void*>(detour_ExitLevel::hkExitLevel),
-                    reinterpret_cast<void**>(&detour_ExitLevel::oExitLevel),
-                    "ExitLevel",
-                    DetourModule::GameDll,
-                    static_cast<size_t>(0));
-            }
-        }
-    };
-    static AutoDetour_ExitLevel g_AutoDetour_ExitLevel;
-}
-
 namespace detour_Sys_Milliseconds {
     using tSys_Milliseconds = int(__cdecl*)();
     extern tSys_Milliseconds oSys_Milliseconds;

build/generated_registrations.h

@@ -10,8 +10,6 @@
 extern qboolean cbuf_addlatecommands_override_callback(detour_Cbuf_AddLateCommands::tCbuf_AddLateCommands original);
 extern void cinematicfreeze_callback(bool bEnable);
 extern void cl_maxfps_EarlyStartup();
-extern void cl_maxfps_GameDllLoaded(void* game_export);
-extern void cl_maxfps_ShutdownGameProgs();
 extern void cl_precache_http_maps_override_callback(detour_CL_Precache_f::tCL_Precache_f original);
 extern void console_protection_EarlyStartup();
 extern LRESULT dispatchmessagea_override_callback(const MSG* msg, detour_DispatchMessageA::tDispatchMessageA original);
@@ -60,10 +58,7 @@ extern void lightblend_PostCvarInit();
 extern void lightblend_RefDllLoaded(char const* name);
 extern void mediaTimers_EarlyStartup();
 extern void mediaTimers_PostCvarInit();
-extern void mfps_ExitLevel_post();
 extern void mfps_M_PushMenu_pre(char const*& menu_file, char const*& parentFrame, bool& lock_input);
-extern void mfps_qcommon_frame_pre(int& msec);
-extern void mfps_sv_frame_override(int msec, detour_SV_Frame::tSV_Frame original);
 extern void new_system_bug_EarlyStartup();
 extern void r_blendlightmaps_post_callback();
 extern void r_blendlightmaps_pre_callback();
@@ -89,12 +84,6 @@ inline void RegisterAllFeatureHooks() {
     SharedHookManager::Instance().RegisterCallback(
         "EarlyStartup", "cl_maxfps_singleplayer", "cl_maxfps_EarlyStartup",
         []() { cl_maxfps_EarlyStartup(); }, 70, SharedHookPhase::Post);
-    SharedHookManager::Instance().RegisterCallback<void*>(
-        "GameDllLoaded", "cl_maxfps_singleplayer", "cl_maxfps_GameDllLoaded",
-        std::function<void(void*)>([](void* game_export) { cl_maxfps_GameDllLoaded(game_export); }), 50, SharedHookPhase::Post);
-    SharedHookManager::Instance().RegisterCallback(
-        "SV_ShutdownGameProgs", "cl_maxfps_singleplayer", "cl_maxfps_ShutdownGameProgs",
-        []() { cl_maxfps_ShutdownGameProgs(); }, 90, SharedHookPhase::Pre);
     SharedHookManager::Instance().RegisterCallback(
         "EarlyStartup", "console_protection", "console_protection_EarlyStartup",
         []() { console_protection_EarlyStartup(); }, 80, SharedHookPhase::Post);
@@ -152,10 +141,6 @@ inline void RegisterAllFeatureHooks() {
     SharedHookManager::Instance().RegisterCallback(
         "PostCvarInit", "internal_menus", "internal_menus_PostCvarInit",
         []() { internal_menus_PostCvarInit(); }, 70, SharedHookPhase::Post);
-    detour_Qcommon_Frame::GetManager().RegisterPreCallback(
-        "cl_maxfps_singleplayer", "mfps_qcommon_frame_pre",
-        [](int& msec) { mfps_qcommon_frame_pre(msec); },
-        75);
     {
         auto& mgr = detour_CinematicFreeze::GetManager();
         PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] CinematicFreeze manager at 0x%p\n", &mgr);
@@ -169,15 +154,6 @@ inline void RegisterAllFeatureHooks() {
         "cl_maxfps_singleplayer", "mfps_M_PushMenu_pre",
         [](char const*& menu_file, char const*& parentFrame, bool& lock_input) { mfps_M_PushMenu_pre(menu_file, parentFrame, lock_input); },
         85);
-    {
-        auto& mgr = detour_ExitLevel::GetManager();
-        PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] ExitLevel manager at 0x%p\n", &mgr);
-        mgr.RegisterPostCallback(
-            "cl_maxfps_singleplayer", "mfps_ExitLevel_post",
-            []() { mfps_ExitLevel_post(); },
-            100);
-        PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] ExitLevel post callbacks: %zu\n", mgr.GetPostCallbackCount());
-    }
     detour_GL_BuildPolygonFromSurface::GetManager().RegisterPreCallback(
         "hd_textures", "gl_buildpolygonfromsurface_pre_callback",
         [](void*& msurface_s) { gl_buildpolygonfromsurface_pre_callback(msurface_s); },

compile_commands.json

@@ -79,6 +79,11 @@
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
         "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/cl_maxfps_singleplayer/hooks/cinematicfreeze.cpp"
     },
+    {
+        "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/cl_maxfps_singleplayer/hooks/m_pushmenu_pre.o src/features/cl_maxfps_singleplayer/hooks/m_pushmenu_pre.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
+        "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
+        "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/cl_maxfps_singleplayer/hooks/m_pushmenu_pre.cpp"
+    },
     {
         "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/cl_maxfps_singleplayer/hooks/sp_sys_mil.o src/features/cl_maxfps_singleplayer/hooks/sp_sys_mil.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
@@ -219,6 +224,11 @@
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
         "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/internal_menus/hooks/m_pushmenu_pre.cpp"
     },
+    {
+        "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/internal_menus/hooks/qcommon_frame_post.o src/features/internal_menus/hooks/qcommon_frame_post.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
+        "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
+        "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/internal_menus/hooks/qcommon_frame_post.cpp"
+    },
     {
         "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/internal_menus/hooks/scr_beginloadingplaque_post.o src/features/internal_menus/hooks/scr_beginloadingplaque_post.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
@@ -509,6 +519,16 @@
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
         "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/scaled_ui_base/hooks/vid_checkchanges.cpp"
     },
+    {
+        "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/scaled_ui_base/ref_gl_state.o src/features/scaled_ui_base/ref_gl_state.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
+        "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
+        "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/scaled_ui_base/ref_gl_state.cpp"
+    },
+    {
+        "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/scaled_ui_base/scale_round.o src/features/scaled_ui_base/scale_round.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
+        "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",
+        "file": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy/src/features/scaled_ui_base/scale_round.cpp"
+    },
     {
         "command": "i686-w64-mingw32-g++-posix -c -Ihdr -Isrc -Ibuild/release -MMD -MP -o obj/release/features/scaled_ui_base/sui_cvars.o src/features/scaled_ui_base/sui_cvars.cpp -D_WIN32_WINNT=0x0501 -std=c++14 -O3 -fno-omit-frame-pointer -DNDEBUG",
         "directory": "/home/dinda/git-projects/d3nd3/public/sof/sof_buddy",

detours.yaml

@@ -830,16 +830,6 @@ functions:
       - type: int
         name: msec
 
-  - name: SV_Frame
-    module: SofExe
-    identifier: "0x0005F5B0"
-    return_type: void
-    calling_convention: __cdecl
-    detour_len: 0
-    params:
-      - type: int
-        name: msec
-
   - name: M_PushMenu
     module: SofExe
     identifier: "0x200C7630"
@@ -864,14 +854,6 @@ functions:
       - type: bool
         name: bEnable
 
-  - name: ExitLevel
-    module: GameDll
-    identifier: "0xAE0A0"
-    return_type: void
-    calling_convention: __cdecl
-    detour_len: 0
-    params: []
-
   - name: Sys_Milliseconds
     module: SofExe
     identifier: "0x00055930"

hdr/version.h

@@ -7,4 +7,4 @@
     Increment version using: ./increment_version.sh
 */
 
-#define SOFBUDDY_VERSION "7.0"
+#define SOFBUDDY_VERSION "7.1"