From 5ddd2ecffa2cebf0a5697dc7b41a0bb1634e95f0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 5 Jan 2011 22:45:25 +0000 Subject: [PATCH] - fixed: Hexen's chess ending should never use the cluster's endtext. SVN r3091 (trunk) --- src/intermission/intermission_parse.cpp | 3 ++- src/namedef.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/intermission/intermission_parse.cpp b/src/intermission/intermission_parse.cpp index fab4dca29..d621d4c6c 100644 --- a/src/intermission/intermission_parse.cpp +++ b/src/intermission/intermission_parse.cpp @@ -810,7 +810,8 @@ void F_StartFinale (const char *music, int musicorder, int cdtrack, unsigned int const char *text, INTBOOL textInLump, INTBOOL finalePic, INTBOOL lookupText, bool ending, FName endsequence) { - if (text != NULL && *text != 0) + // Hexen's chess ending doesn't have a text screen, even if the cluster has a message defined. + if (text != NULL && *text != 0 && endsequence != NAME_Inter_Chess) { FIntermissionActionTextscreen *textscreen = new FIntermissionActionTextscreen; if (textInLump) diff --git a/src/namedef.h b/src/namedef.h index d9573b747..52fc87e66 100644 --- a/src/namedef.h +++ b/src/namedef.h @@ -529,6 +529,7 @@ xx(res_9) xx(AlwaysRun) // end sequences +xx(Inter_Chess) xx(Inter_Strife) xx(Inter_Strife_Good) xx(Inter_Strife_Sad)