summaryrefslogtreecommitdiff
path: root/src/heretic/d_main.c
diff options
context:
space:
mode:
authorSimon Howard2008-09-20 22:29:59 +0000
committerSimon Howard2008-09-20 22:29:59 +0000
commit5de8de49ccc2c14b7de14da465510b2368080dd4 (patch)
tree1fe49f046f96607675c0031261db0b45a88d82e7 /src/heretic/d_main.c
parent7c747c3d576521f2e1773fd285c0d2c7cb32aca8 (diff)
downloadchocolate-doom-5de8de49ccc2c14b7de14da465510b2368080dd4.tar.gz
chocolate-doom-5de8de49ccc2c14b7de14da465510b2368080dd4.tar.bz2
chocolate-doom-5de8de49ccc2c14b7de14da465510b2368080dd4.zip
Remove NeXT/WATCOMC ifdef blocks.
Subversion-branch: /branches/raven-branch Subversion-revision: 1259
Diffstat (limited to 'src/heretic/d_main.c')
-rw-r--r--src/heretic/d_main.c31
1 files changed, 1 insertions, 30 deletions
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
}