zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 02:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r2911:

Browse source 
- Merged finale branch back into trunk.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1025 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-10-06 14:20:13 +00:00
parent 177e2ce70e
commit 71e6229dc1
31 changed files with 2705 additions and 1738 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_user.cpp
View file

@ -44,7 +44,7 @@
#include "w_wad.h"
#include "cmdlib.h"
#include "sbar.h"
#include "f_finale.h"
#include "intermission/intermission.h"
#include "c_console.h"
#include "doomdef.h"
#include "c_dispatch.h"
@ -1215,9 +1215,9 @@ void APlayerPawn::Die (AActor *source, AActor *inflictor)
}
}
}
if (!multiplayer && (level.flags2 & LEVEL2_DEATHSLIDESHOW))
if (!multiplayer && level.info->deathsequence != NAME_None)
{
F_StartSlideshow ();
F_StartIntermission(level.info->deathsequence, FSTATE_EndingGame);
}
}
}