Release v7.3: deathmatch-only loading rule, simplify connect latch

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

Author: d3nd3

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## v7.3
+
+### Internal menus — deathmatch-only loading rule
+
+- **Removed cls/connect-flow latch** (`Qcommon_Frame` Post, plaque context, savegame/`sv.loadgame` heuristics) — vanilla vs custom loading now follows stock **`deathmatch` `exinclude`** timing only.
+- **`internal_menus_use_vanilla_loading_menu()`:** `deathmatch==0` → pak `loading.rmf`; `deathmatch!=0` → Buddy custom loading menu.
+- **Loading header:** `<exinclude deathmatch>` picks **`loading_network`** (map + download status) in DM or empty **`loading_network_sp`** in SP — replaces `_sofbuddy_loading_network` `cninclude`.
+- **`SCR_BeginLoadingPlaque`:** skip redundant second plaque only when still on the **vanilla** path; never skip when switching to custom MP loading (e.g. deathmatch set after first plaque).
+
+### HTTP maps
+
+- **Connect assist** gated on latched **`deathmatch`** only (removed MP connect-flow check).
+
+## v7.2
+
+### Internal menus — loading context & connect-flow fixes
+
+- **Loading plaque context:** `begin/end_loading_plaque_context` tracks savegame loads (`sv.loadgame`) and SP local map loads so vanilla vs custom loading UI is chosen per plaque, not from stale latch state.
+- **MP connect latch:** Requires **two consecutive `ca_disconnected` frames** in deathmatch before clearing (avoids one-frame cls glitches during MP map load). SP `newgame.cfg` disconnect+map scripts clear immediately.
+- **`ca_active` → `ca_connected`:** Treated as SP local reload (mission/quickload), not MP connect — clears connect latch and HTTP maps loading state.
+- **Savegame loads:** Always use vanilla pak `loading.rmf`; network status panel hidden.
+
+### HTTP maps — loading UI state
+
+- **`http_maps_on_sp_local_map_load()`:** Clears cached loading UI / map labels when SP loads a local map.
+- **`http_maps_refresh_loading_menu_labels()`:** Updates map name on the existing loading menu when the second `SCR_BeginLoadingPlaque` is skipped (no killmenu flash).
+- **Network panel:** `_sofbuddy_loading_network` is on only during **MP connect + HTTP maps assist**, not savegame or SP local loads.
+- **Loading UI show:** Sets `loading_ui_active` / map path before `loading_show_ui()`; `http_maps_should_assist_connect` exported in `shared.h`.
+
 ## v7.1
 
 ### cl_maxfps singleplayer — simplify freeze sync

VERSION

@@ -1 +1 @@
-7.2
+7.3

build/generated_registrations.h

@@ -53,7 +53,6 @@ extern void internal_menus_M_PushMenu_pre(char const*& menu_file, char const*& p
 extern void internal_menus_PostCvarInit();
 extern void internal_menus_SCR_BeginLoadingPlaque_post(qboolean noPlaque);
 extern int internal_menus_fs_loadfile_override_callback(char* path, void** buffer, bool override_pak, detour_FS_LoadFile::tFS_LoadFile original);
-extern void internal_menus_qcommon_frame_post(int msec);
 extern void lightblend_PostCvarInit();
 extern void lightblend_RefDllLoaded(char const* name);
 extern void mediaTimers_EarlyStartup();
@@ -235,15 +234,6 @@ inline void RegisterAllFeatureHooks() {
             90);
         PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] M_PushMenu post callbacks: %zu\n", mgr.GetPostCallbackCount());
     }
-    {
-        auto& mgr = detour_Qcommon_Frame::GetManager();
-        PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] Qcommon_Frame manager at 0x%p\n", &mgr);
-        mgr.RegisterPostCallback(
-            "internal_menus", "internal_menus_qcommon_frame_post",
-            [](int msec) { internal_menus_qcommon_frame_post(msec); },
-            85);
-        PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] Qcommon_Frame post callbacks: %zu\n", mgr.GetPostCallbackCount());
-    }
     {
         auto& mgr = detour_SCR_BeginLoadingPlaque::GetManager();
         PrintOut(PRINT_LOG, "[RegisterAllFeatureHooks] SCR_BeginLoadingPlaque manager at 0x%p\n", &mgr);

hdr/version.h

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

src/features/http_maps/http_maps.cpp

@@ -1732,7 +1732,7 @@ bool http_maps_should_assist_connect(void)
 	if (static_cast<int>(_sofbuddy_http_maps->value) <= 0) return false;
 	if (http_maps_frame_work_pending()) return true;
 #if FEATURE_INTERNAL_MENUS
-	return internal_menus_mp_connect_flow_active() || internal_menus_deathmatch_mode_active();
+	return internal_menus_deathmatch_mode_active();
 #else
 	if (!detour_Cvar_Get::oCvar_Get) return false;
 	cvar_t* dm = detour_Cvar_Get::oCvar_Get("deathmatch", "0", 0, nullptr);

src/features/internal_menus/hooks/fs_loadfile_override.cpp

@@ -55,7 +55,7 @@ int internal_menus_fs_loadfile_override_callback(char* path, void** buffer, bool
     std::string filename = path_to_filename(path);
     if (menu_name.empty() || filename.empty()) return original(path, buffer, override_pak);
 
-    // SP / non-DM: vanilla pak loading menus (deathmatch exinclude / menu_nostats stats gating).
+    // SP (deathmatch==0): vanilla pak loading.rmf — same rule as stock <exinclude deathmatch> in loading.rmf.
     if (menu_name == "loading" && internal_menus_use_vanilla_loading_menu())
         return original(path, buffer, override_pak);
 

src/features/internal_menus/hooks/hooks.json

@@ -1 +1,6 @@
-[{"function":"FS_LoadFile","callback":"internal_menus_fs_loadfile_override_callback","override":true},{"function":"M_PushMenu","callback":"internal_menus_M_PushMenu_pre","phase":"Pre","priority":90},{"function":"M_PushMenu","callback":"internal_menus_M_PushMenu_post","phase":"Post","priority":90},{"function":"Qcommon_Frame","callback":"internal_menus_qcommon_frame_post","phase":"Post","priority":85},{"function":"SCR_BeginLoadingPlaque","callback":"internal_menus_SCR_BeginLoadingPlaque_post","phase":"Post","priority":90}]
+[
+  {"function":"FS_LoadFile","callback":"internal_menus_fs_loadfile_override_callback","override":true},
+  {"function":"M_PushMenu","callback":"internal_menus_M_PushMenu_pre","phase":"Pre","priority":90},
+  {"function":"M_PushMenu","callback":"internal_menus_M_PushMenu_post","phase":"Post","priority":90},
+  {"function":"SCR_BeginLoadingPlaque","callback":"internal_menus_SCR_BeginLoadingPlaque_post","phase":"Post","priority":90}
+]

src/features/internal_menus/hooks/qcommon_frame_post.cpp

@@ -14,29 +14,22 @@ void internal_menus_SCR_BeginLoadingPlaque_post(qboolean noPlaque) {
     if (noPlaque) return;
     if (!detour_M_PushMenu::oM_PushMenu) return;
 
-    static int* s_cls_state = (int*)rvaToAbsExe((void*)0x001C1F00);
-    const int cls = s_cls_state ? *s_cls_state : -1;
-    if (s_cls_state) internal_menus_update_connect_flow(cls);
-    internal_menus_begin_loading_plaque_context(cls);
-
-    // SP local load: vanilla loading.rmf from pak. Avoid killmenu so blankscreen/outfit interstitials
-    // are not cleared early.
     if (internal_menus_use_vanilla_loading_menu()) {
-        if (internal_menus_savegame_load_active())
-            internal_menus_on_loadgame_map_load();
         internal_menus_sync_loading_network_ui();
         detour_M_PushMenu::oM_PushMenu("loading", "", true);
         internal_menus_call_SCR_UpdateScreen(true);
-        internal_menus_end_loading_plaque_context();
         return;
     }
 
     const bool lock_input = internal_menus_should_lock_loading_input();
 #if FEATURE_HTTP_MAPS
-    if (lock_input && http_maps_should_skip_loading_plaque_menu()) {
+    // Vanilla re-evaluates <exinclude deathmatch> on every menu push; only skip a redundant
+    // second vanilla re-push. Never skip when switching to the custom MP menu (deathmatch set
+    // after the first plaque, or map/http_maps finished before CL_Changing).
+    if (lock_input && internal_menus_use_vanilla_loading_menu() &&
+        http_maps_should_skip_loading_plaque_menu()) {
         internal_menus_sync_loading_network_ui();
         http_maps_refresh_loading_menu_labels();
-        internal_menus_end_loading_plaque_context();
         return;
     }
 #endif
@@ -53,7 +46,6 @@ void internal_menus_SCR_BeginLoadingPlaque_post(qboolean noPlaque) {
 #endif
     detour_M_PushMenu::oM_PushMenu(internal_menus_loading_menu_name(), "", lock_input);
     internal_menus_call_SCR_UpdateScreen(true);
-    internal_menus_end_loading_plaque_context();
 }
 
 #endif

src/features/internal_menus/hooks/scr_beginloadingplaque_post.cpp

@@ -426,135 +426,17 @@ bool internal_menus_deathmatch_mode_active(void) {
     return dm && dm->value != 0.0f;
 }
 
-static bool g_mp_connect_flow = false;
-static bool g_plaque_savegame_load = false;
-static bool g_plaque_sp_local = false;
-static int s_prev_cls_for_connect = -1;
-
-// server_t.loadgame (Q2 layout: state + attractloop + loadgame).
-static constexpr uintptr_t kSvLoadgameRva = 0x003A1F25;
-
-static bool internal_menus_is_connect_handshake_state(connstate_t st) {
-    switch (st) {
-        case ca_connecting:
-        case ca_won_receive_result:
-        case ca_connecting_stage2:
-        case ca_won_challenge:
-        case ca_won_receive_challenge1:
-            return true;
-        default:
-            return false;
-    }
-}
-
-static int internal_menus_read_sv_loadgame(void) {
-    auto* loadgame = reinterpret_cast<unsigned char*>(rvaToAbsExe(reinterpret_cast<void*>(kSvLoadgameRva)));
-    return (loadgame && *loadgame) ? 1 : 0;
-}
-
-void internal_menus_update_connect_flow(int cls_state) {
-    const connstate_t st = static_cast<connstate_t>(cls_state);
-    switch (st) {
-        case ca_uninitialized:
-        case ca_disconnected:
-            // cls can glitch to disconnected for one frame during MP map load; require two
-            // consecutive disconnected observations before clearing (matches http_maps).
-            // SP menu loads (newgame.cfg: disconnect; map) run in one script — one frame only.
-            if (!internal_menus_deathmatch_mode_active())
-                g_mp_connect_flow = false;
-            else if (s_prev_cls_for_connect == ca_disconnected)
-                g_mp_connect_flow = false;
-            break;
-        case ca_connecting:
-        case ca_won_receive_result:
-        case ca_connecting_stage2:
-        case ca_won_challenge:
-        case ca_won_receive_challenge1:
-            g_mp_connect_flow = true;
-            break;
-        case ca_connected: {
-            const connstate_t prev = static_cast<connstate_t>(s_prev_cls_for_connect);
-            // SP local reload (mission, quickload): 8 -> 7 — not MP connect, even if deathmatch latched.
-            if (prev == ca_active) {
-                g_mp_connect_flow = false;
-#if FEATURE_HTTP_MAPS
-                http_maps_on_sp_local_map_load();
-#endif
-                break;
-            }
-            // MP join: 2 -> 4 -> 7. Keep latch through map load.
-            if (!g_mp_connect_flow && internal_menus_is_connect_handshake_state(prev))
-                g_mp_connect_flow = true;
-            break;
-        }
-        case ca_active:
-            g_mp_connect_flow = false;
-            break;
-        default:
-            break;
-    }
-    s_prev_cls_for_connect = cls_state;
-}
-
-bool internal_menus_mp_connect_flow_active(void) {
-    return g_mp_connect_flow;
-}
-
-void internal_menus_begin_loading_plaque_context(int cls_state) {
-    const int lg = internal_menus_read_sv_loadgame();
-    g_plaque_savegame_load = lg != 0 && cls_state != static_cast<int>(ca_connected);
-    g_plaque_sp_local = false;
-    if (internal_menus_deathmatch_mode_active()) return;
-    const connstate_t st = static_cast<connstate_t>(cls_state);
-    const connstate_t prev = static_cast<connstate_t>(s_prev_cls_for_connect);
-    if (internal_menus_is_connect_handshake_state(st) || internal_menus_is_connect_handshake_state(prev))
-        return;
-    g_plaque_sp_local = true;
-    g_mp_connect_flow = false;
-#if FEATURE_HTTP_MAPS
-    http_maps_on_sp_local_map_load();
-#endif
-}
-
-void internal_menus_end_loading_plaque_context(void) {
-    g_plaque_savegame_load = false;
-    g_plaque_sp_local = false;
-}
-
-bool internal_menus_savegame_load_active(void) {
-    return g_plaque_savegame_load;
-}
-
-void internal_menus_on_loadgame_map_load(void) {
-    g_mp_connect_flow = false;
-#if FEATURE_HTTP_MAPS
-    http_maps_on_sp_local_map_load();
-#endif
-}
-
 bool internal_menus_use_vanilla_loading_menu(void) {
-    if (internal_menus_savegame_load_active()) return true;
-    if (g_plaque_sp_local) return true;
-#if FEATURE_HTTP_MAPS
-    if (http_maps_wants_custom_loading_menu()) return false;
-#endif
-    if (g_mp_connect_flow) return false;
-    return true;
+    return !internal_menus_deathmatch_mode_active();
 }
 
 bool internal_menus_should_killmenu_before_loading(void) {
     return !internal_menus_use_vanilla_loading_menu();
 }
 
 void internal_menus_sync_loading_network_ui(void) {
-#if FEATURE_HTTP_MAPS
-    const bool network = !internal_menus_savegame_load_active() &&
-                         internal_menus_mp_connect_flow_active() &&
-                         http_maps_should_assist_connect();
-    set_runtime_cvar_int("_sofbuddy_loading_network", network ? 1 : 0);
-#else
-    set_runtime_cvar_int("_sofbuddy_loading_network", 0);
-#endif
+    // Map/download header uses <exinclude deathmatch> in loading_header.rmf (same timing as vanilla).
+    set_runtime_cvar_int("_sofbuddy_loading_network", internal_menus_deathmatch_mode_active() ? 1 : 0);
 }
 
 bool internal_menus_is_mp_loading_context(void) {