fix bug with loading a saved game while a demo is playing (such as the

demo loop when Quake starts up), thanks to Bill Pickett for giving a
clear and concise description of the problem

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7702 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index 706d24d07d8d9a27a2d86e72827b6dd3e32c2505..99f48c30ac8cdb4860fd2353e85c3261b0d6054a 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -561,6 +561,13 @@ void Host_Loadgame_f (void)
 
        Con_Printf("Loading game from %s...\n", filename);
 
+       // stop playing demos
+       if (cls.demoplayback)
+               CL_Disconnect ();
+
+       // remove menu
+       key_dest = key_game;
+
        cls.demonum = -1;               // stop demo loop in case this fails
 
        t = text = (char *)FS_LoadFile (filename, tempmempool, false, NULL);

diff --git a/todo b/todo
index 128f8eeb908ac406b15773180c926de7e57ab0dd..8a3964045adcaeb04af09ce0917cdbfe8c430ad5 100644 (file)
--- a/todo
+++ b/todo
@@ -1,4 +1,8 @@
 - todo: difficulty ratings are: 0 = trivial, 1 = easy, 2 = easy-moderate, 3 = moderate, 4 = moderate-hard, 5 = hard, 6 = hard++, 7 = nightmare, d = done, -d = done but have not notified the people who asked for it, f = failed, -f = failed but have not notified the people who asked for it
+0 bug darkplaces client csqc: engine prediction function is not implemented - could just return the engine's current cl.movement_origin (Spike)
+0 bug darkplaces client csqc: entities not being drawn with VF_PERSPECTIVE 0? (daemon)
+0 bug darkplaces client csqc: input queue functions needed for csqc prediction aren't implemented (Spike)
+0 bug darkplaces client csqc: precaches on client don't work, have to precache on server - what's going wrong here? (daemon, Urre)
 0 bug darkplaces client qw: add .mvd demo support
 0 bug darkplaces client qw: add .qwd demo support
 0 bug darkplaces client qw: add spectator cvar (Plague Monkey Rat)
@@ -485,6 +489,7 @@ d bug darkplaces client: finale text during episode-end intermissions shows brie
 d bug darkplaces client: fix cl_bobmodel bug which momentarily jolts the gun when you pass through a trigger, pick up an item, etc, Sajt thinks this is related to console prints as well as centerprint (Sajt)
 d bug darkplaces client: fix gl_flashblend, it's still drawing rtdlights even when gl_flashblend is on (Toddd)
 d bug darkplaces client: hipnotic: health is one character to the right on the sbar, covering up the key icons (M`Shacron)
+d bug darkplaces client: loading savegames while a demo is playing does not stop the demo, causing a broken state and ultimately a disconnect before the client enters the loaded game (Bill Pickett)
 d bug darkplaces client: make "wait" command wait fornext network frame somehow when connected, to make frikbot .way files load properly (Transfusion, FrikaC)
 d bug darkplaces client: make envmap command work with the corrected layout
 d bug darkplaces client: make server queries use a queue to avoid flooding out queries too fast (Willis)