X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sv_save.c;h=4c0eca7d3958f1185464c80efb84863967ffb3ac;hb=ceb0443a38d14772e6bacb4c6215b6b209cf8bff;hp=ea5ab7046224e1e0083adba742eec3aeeeef3eb8;hpb=2f5dfa4708db4112f682b31146a8db1d456a0482;p=xonotic%2Fdarkplaces.git

diff --git a/sv_save.c b/sv_save.c
index ea5ab704..4c0eca7d 100644
--- a/sv_save.c
+++ b/sv_save.c
@@ -270,16 +270,11 @@ void SV_Loadgame_f(cmd_state_t *cmd)
 
 	Con_Printf("Loading game from %s...\n", filename);
 
-	// stop playing demos
-	if (cls.demoplayback)
-		CL_Disconnect();
-
-#ifdef CONFIG_MENU
-	// remove menu
-	if (key_dest == key_menu || key_dest == key_menu_grabbed)
-		MR_ToggleMenu(0);
-#endif
-	key_dest = key_game;
+	if(host.hook.Disconnect)
+		host.hook.Disconnect(false, NULL);
+
+	if(host.hook.ToggleMenu)
+		host.hook.ToggleMenu();
 
 	cls.demonum = -1;		// stop demo loop in case this fails
 
@@ -442,7 +437,7 @@ void SV_Loadgame_f(cmd_state_t *cmd)
 			PRVM_ED_ParseEdict (prog, start, ent);
 
 			// link it into the bsp tree
-			if (!ent->free && !VectorCompare(PRVM_serveredictvector(ent, absmin), PRVM_serveredictvector(ent, absmax)))
+			if (!ent->free)
 				SV_LinkEdict(ent);
 		}