From 56412813c70ba44a6f6a74cee5bf460ca6a31402 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 8 Feb 2010 21:14:30 +0000
Subject: Add Heretic implementation of HHE "Text" section, add DEH_String()
 around appropriate strings to allow string replacements.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1867
---
 src/heretic/f_finale.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/heretic/f_finale.c')

diff --git a/src/heretic/f_finale.c b/src/heretic/f_finale.c
index 03806214..27b33e96 100644
--- a/src/heretic/f_finale.c
+++ b/src/heretic/f_finale.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 
 #include "doomdef.h"
+#include "deh_str.h"
 #include "i_swap.h"
 #include "i_video.h"
 #include "s_sound.h"
@@ -72,30 +73,30 @@ void F_StartFinale(void)
     switch (gameepisode)
     {
         case 1:
-            finaleflat = "FLOOR25";
+            finaleflat = DEH_String("FLOOR25");
             finaletext = e1text;
             break;
         case 2:
-            finaleflat = "FLATHUH1";
+            finaleflat = DEH_String("FLATHUH1");
             finaletext = e2text;
             break;
         case 3:
-            finaleflat = "FLTWAWA2";
+            finaleflat = DEH_String("FLTWAWA2");
             finaletext = e3text;
             break;
         case 4:
-            finaleflat = "FLOOR28";
+            finaleflat = DEH_String("FLOOR28");
             finaletext = e4text;
             break;
         case 5:
-            finaleflat = "FLOOR08";
+            finaleflat = DEH_String("FLOOR08");
             finaletext = e5text;
             break;
     }
 
     finalestage = 0;
     finalecount = 0;
-    FontABaseLump = W_GetNumForName("FONTA_S") + 1;
+    FontABaseLump = W_GetNumForName(DEH_String("FONTA_S")) + 1;
 
 //      S_ChangeMusic(mus_victor, true);
     S_StartSong(mus_cptd, true);
@@ -277,8 +278,8 @@ void F_DemonScroll(void)
     {
         return;
     }
-    p1 = W_CacheLumpName("FINAL1", PU_LEVEL);
-    p2 = W_CacheLumpName("FINAL2", PU_LEVEL);
+    p1 = W_CacheLumpName(DEH_String("FINAL1"), PU_LEVEL);
+    p2 = W_CacheLumpName(DEH_String("FINAL2"), PU_LEVEL);
     if (finalecount < 70)
     {
         memcpy(I_VideoBuffer, p1, SCREENHEIGHT * SCREENWIDTH);
@@ -319,8 +320,8 @@ void F_DrawUnderwater(void)
             {
                 underwawa = true;
                 memset((byte *) 0xa0000, 0, SCREENWIDTH * SCREENHEIGHT);
-                I_SetPalette(W_CacheLumpName("E2PAL", PU_CACHE));
-                V_DrawRawScreen(W_CacheLumpName("E2END", PU_CACHE));
+                I_SetPalette(W_CacheLumpName(DEH_String("E2PAL"), PU_CACHE));
+                V_DrawRawScreen(W_CacheLumpName(DEH_String("E2END"), PU_CACHE));
             }
             paused = false;
             MenuActive = false;
@@ -328,7 +329,7 @@ void F_DrawUnderwater(void)
 
             break;
         case 2:
-            V_DrawRawScreen(W_CacheLumpName("TITLE", PU_CACHE));
+            V_DrawRawScreen(W_CacheLumpName(DEH_String("TITLE"), PU_CACHE));
             //D_StartTitle(); // go to intro/demo mode.
     }
 }
-- 
cgit v1.2.3


From 9c97b50afead04ff47ed6e465e5c366e8f276ad8 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 18 Apr 2010 18:54:52 +0000
Subject: Do dehacked string substitution for end of episode text.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1907
---
 src/heretic/f_finale.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/heretic/f_finale.c')

diff --git a/src/heretic/f_finale.c b/src/heretic/f_finale.c
index 27b33e96..4077bb82 100644
--- a/src/heretic/f_finale.c
+++ b/src/heretic/f_finale.c
@@ -38,11 +38,6 @@ int finalecount;
 #define TEXTSPEED       3
 #define TEXTWAIT        250
 
-char *e1text = E1TEXT;
-char *e2text = E2TEXT;
-char *e3text = E3TEXT;
-char *e4text = E4TEXT;
-char *e5text = E5TEXT;
 char *finaletext;
 char *finaleflat;
 
@@ -74,23 +69,23 @@ void F_StartFinale(void)
     {
         case 1:
             finaleflat = DEH_String("FLOOR25");
-            finaletext = e1text;
+            finaletext = DEH_String(E1TEXT);
             break;
         case 2:
             finaleflat = DEH_String("FLATHUH1");
-            finaletext = e2text;
+            finaletext = DEH_String(E2TEXT);
             break;
         case 3:
             finaleflat = DEH_String("FLTWAWA2");
-            finaletext = e3text;
+            finaletext = DEH_String(E3TEXT);
             break;
         case 4:
             finaleflat = DEH_String("FLOOR28");
-            finaletext = e4text;
+            finaletext = DEH_String(E4TEXT);
             break;
         case 5:
             finaleflat = DEH_String("FLOOR08");
-            finaletext = e5text;
+            finaletext = DEH_String(E5TEXT);
             break;
     }
 
-- 
cgit v1.2.3