OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- merged finale branch back into trunk.

Browse source 
SVN r2911 (trunk)
This commit is contained in:
Christoph Oelckers 2010-10-06 10:44:03 +00:00
commit d9970ab9b6
30 changed files with 6132 additions and 5157 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);
}
}
}