summaryrefslogtreecommitdiff
path: root/src/strife/f_finale.c
diff options
context:
space:
mode:
authorJames Haley2011-02-26 03:36:24 +0000
committerJames Haley2011-02-26 03:36:24 +0000
commit8de669ac9b3d53144e201abf62982d0e31d56940 (patch)
tree828d9b9f08bf00dfe280825cbc3588754ad7faaf /src/strife/f_finale.c
parent1b7d9ea6f72b2fdaae747f0d453b8bca214fa255 (diff)
downloadchocolate-doom-8de669ac9b3d53144e201abf62982d0e31d56940.tar.gz
chocolate-doom-8de669ac9b3d53144e201abf62982d0e31d56940.tar.bz2
chocolate-doom-8de669ac9b3d53144e201abf62982d0e31d56940.zip
P_GiveBody seems to need a P_SubstNullMobj, otherwise a crash occurs in
P_DestroyConverter when it tries to give items to players that aren't in the game... needs add'l verification. Also fixed first frame of the good ending (how the hell did that get screwed up??) Subversion-branch: /branches/strife-branch Subversion-revision: 2279
Diffstat (limited to 'src/strife/f_finale.c')
-rw-r--r--src/strife/f_finale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/strife/f_finale.c b/src/strife/f_finale.c
index 1761ad44..32d09021 100644
--- a/src/strife/f_finale.c
+++ b/src/strife/f_finale.c
@@ -329,7 +329,7 @@ static void F_DoSlideShow(void)
break;
case SLIDE_GOODEND1: // state #10
- slideshow_panel = DEH_String("SS4F2");
+ slideshow_panel = DEH_String("SS4F1");
S_StartMusic(mus_happy);
I_StartVoice(DEH_String("RIE01"));
slideshow_state = SLIDE_GOODEND2;