zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Autoloading a game (e.g. respawning after dying in single player)

Browse source 
during demo playback prematurely ended demo control of the player.


SVN r1321 (trunk)
This commit is contained in:
Randy Heit 2008-12-16 04:56:25 +00:00
parent 86c04f6b82
commit 45fc728f2e
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
December 15, 2008 December 15, 2008
- Fixed: Autoloading a game (e.g. respawning after dying in single player)
during demo playback prematurely ended demo control of the player.
- Fixed: Loading a multiplayer save with only one player crashed.
- Changed the co-op intermission screen to draw the stats with the small font. - Changed the co-op intermission screen to draw the stats with the small font.
- Added Karate Chris's patch to optionally specify an angle offset for - Added Karate Chris's patch to optionally specify an angle offset for
summoning. summoning.

1
src/d_event.h
View file

@ -61,6 +61,7 @@ typedef enum
ga_newgame, ga_newgame,
ga_newgame2, ga_newgame2,
ga_loadgame, ga_loadgame,
ga_autoloadgame,
ga_savegame, ga_savegame,
ga_autosave, ga_autosave,
ga_playdemo, ga_playdemo,

8
src/g_game.cpp
View file

@ -900,6 +900,7 @@ void G_Ticker ()
G_DoNewGame (); G_DoNewGame ();
break; break;
case ga_loadgame: case ga_loadgame:
case ga_autoloadgame:
G_DoLoadGame (); G_DoLoadGame ();
break; break;
case ga_savegame: case ga_savegame:
@ -1424,7 +1425,7 @@ void G_DoReborn (int playernum, bool freshbot)
if (BackupSaveName.Len() > 0 && FileExists (BackupSaveName.GetChars())) if (BackupSaveName.Len() > 0 && FileExists (BackupSaveName.GetChars()))
{ // Load game from the last point it was saved { // Load game from the last point it was saved
savename = BackupSaveName; savename = BackupSaveName;
gameaction = ga_loadgame; gameaction = ga_autoloadgame;
} }
else else
{ // Reload the level from scratch { // Reload the level from scratch
@ -1698,8 +1699,11 @@ void G_DoLoadGame ()
char *text = NULL; char *text = NULL;
char *map; char *map;
if (gameaction != ga_autoloadgame)
{
demoplayback = false;
}
gameaction = ga_nothing; gameaction = ga_nothing;
demoplayback = false;
FILE *stdfile = fopen (savename.GetChars(), "rb"); FILE *stdfile = fopen (savename.GetChars(), "rb");
if (stdfile == NULL) if (stdfile == NULL)