From 5de8de49ccc2c14b7de14da465510b2368080dd4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 20 Sep 2008 22:29:59 +0000
Subject: Remove NeXT/WATCOMC ifdef blocks.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1259
---
 src/heretic/d_main.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

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

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 900f4ff6..5bba9aa2 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -441,34 +441,14 @@ void D_CheckRecordFrom(void)
 // MAPDIR should be defined as the directory that holds development maps
 // for the -wart # # command
 
-#ifdef __NeXT__
-
-#define MAPDIR "/Novell/Heretic/data/"
-
-#define SHAREWAREWADNAME "/Novell/Heretic/source/heretic1.wad"
-
-char *wadfiles[MAXWADFILES] = {
-    "/Novell/Heretic/source/heretic.wad",
-    "/Novell/Heretic/data/texture1.lmp",
-    "/Novell/Heretic/data/texture2.lmp",
-    "/Novell/Heretic/data/pnames.lmp"
-};
-
-#else
-
 #define MAPDIR "\\data\\"
 
 #define SHAREWAREWADNAME "heretic1.wad"
 
 char *wadfiles[MAXWADFILES] = {
     "heretic.wad",
-    "texture1.lmp",
-    "texture2.lmp",
-    "pnames.lmp"
 };
 
-#endif
-
 char *basedefault = "heretic.cfg";
 
 char exrnwads[80];
@@ -685,20 +665,12 @@ void blitStartup(void)
 char tmsg[300];
 void tprintf(char *msg, int initflag)
 {
-#if 0
 #ifdef __WATCOMC__
     char temp[80];
     int start;
     int add;
     int i;
-#endif
 
-    if (debugmode)
-    {
-        printf(msg);
-        return;
-    }
-#ifdef __WATCOMC__
     if (initflag)
         tmsg[0] = 0;
     strcat(tmsg, msg);
@@ -719,8 +691,7 @@ void tprintf(char *msg, int initflag)
     _settextposition(25, 1);
     drawstatus();
 #else
-    printf(msg);
-#endif
+    puts(msg);
 #endif
 }
 
-- 
cgit v1.2.3