commit 5de8de49ccc2c14b7de14da465510b2368080dd4
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 20 22:29:59 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 20 22:29:59 2008 +0000
Remove NeXT/WATCOMC ifdef blocks.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1259
---
src/heretic/d_main.c | 31 +------------------------------
src/heretic/m_misc.c | 31 -------------------------------
src/heretic/mn_menu.c | 2 --
src/heretic/r_bsp.c | 15 ---------------
src/heretic/r_local.h | 9 ---------
src/heretic/r_main.c | 5 -----
src/heretic/r_segs.c | 3 ---
7 files changed, 1 insertion(+), 95 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
}
diff --git a/src/heretic/m_misc.c b/src/heretic/m_misc.c
index cd08d8d9..26794e9d 100644
--- a/src/heretic/m_misc.c
+++ b/src/heretic/m_misc.c
@@ -174,7 +174,6 @@ typedef struct
int untranslated; // lousy hack
} default_t;
-#ifndef __NeXT__
extern int snd_Channels;
extern int snd_DesiredMusicDevice, snd_DesiredSfxDevice;
extern int snd_MusicDevice, // current music card # (index to dmxCodes)
@@ -182,17 +181,13 @@ extern int snd_MusicDevice, // current music card # (index to dmxCodes)
extern int snd_SBport, snd_SBirq, snd_SBdma; // sound blaster variables
extern int snd_Mport; // midi variables
-#endif
default_t defaults[] = {
{"mouse_sensitivity", &mouseSensitivity, 5},
-#ifndef __NeXT__
{"sfx_volume", &snd_MaxVolume, 10},
{"music_volume", &snd_MusicVolume, 10},
-#endif
-#ifdef __WATCOMC__
#define SC_UPARROW 0x48
#define SC_DOWNARROW 0x50
#define SC_LEFTARROW 0x4b
@@ -231,30 +226,6 @@ default_t defaults[] = {
{"key_use", &key_use, SC_SPACE, 1},
{"key_strafe", &key_strafe, SC_RALT, 1},
{"key_speed", &key_speed, SC_RSHIFT, 1},
-#endif
-
-#ifdef __NeXT__
- {"key_right", &key_right, KEY_RIGHTARROW},
- {"key_left", &key_left, KEY_LEFTARROW},
- {"key_up", &key_up, KEY_UPARROW},
- {"key_down", &key_down, KEY_DOWNARROW},
- {"key_strafeleft", &key_strafeleft, ','},
- {"key_straferight", &key_straferight, '.'},
- {"key_flyup", &key_flyup, 'u'},
- {"key_flydown", &key_flydown, 'j'},
- {"key_flycenter", &key_flycenter, 'k'},
- {"key_lookup", &key_lookup, 'm'},
- {"key_lookdown", &key_lookdown, 'b'},
- {"key_lookcenter", &key_lookcenter, 'n'},
- {"key_invleft", &key_invleft, '['},
- {"key_invright", &key_invright, ']'},
- {"key_useartifact", &key_useartifact, 13},
-
- {"key_fire", &key_fire, ' ', 1},
- {"key_use", &key_use, 'x', 1},
- {"key_strafe", &key_strafe, 'c', 1},
- {"key_speed", &key_speed, 'z', 1},
-#endif
{"use_mouse", &usemouse, 1},
{"mouseb_fire", &mousebfire, 0},
@@ -269,7 +240,6 @@ default_t defaults[] = {
{"screenblocks", &screenblocks, 10},
-#ifndef __NeXT__
{"snd_channels", &snd_Channels, 3},
{"snd_musicdevice", &snd_DesiredMusicDevice, 0},
{"snd_sfxdevice", &snd_DesiredSfxDevice, 0},
@@ -277,7 +247,6 @@ default_t defaults[] = {
{"snd_sbirq", &snd_SBirq, -1},
{"snd_sbdma", &snd_SBdma, -1},
{"snd_mport", &snd_Mport, -1},
-#endif
{"usegamma", &usegamma, 0},
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index 5c411813..1a7a6f86 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -1163,7 +1163,6 @@ boolean MN_Responder(event_t * event)
BorderNeedRefresh = true;
UpdateState |= I_FULLSCRN;
return (true);
-#ifndef __NeXT__
case KEY_F1: // help screen
SCInfo(0); // start up info screens
MenuActive = true;
@@ -1301,7 +1300,6 @@ boolean MN_Responder(event_t * event)
}
I_SetPalette((byte *) W_CacheLumpName("PLAYPAL", PU_CACHE));
return true;
-#endif
}
}
diff --git a/src/heretic/r_bsp.c b/src/heretic/r_bsp.c
index be9ef769..aed96007 100644
--- a/src/heretic/r_bsp.c
+++ b/src/heretic/r_bsp.c
@@ -215,9 +215,6 @@ void R_AddLine(seg_t * line)
int x1, x2;
angle_t angle1, angle2, span, tspan;
-#ifdef __NeXT__
- RD_DrawLineCheck(line);
-#endif
curline = line;
// OPTIMIZE: quickly reject orthogonal back sides
@@ -327,10 +324,6 @@ boolean R_CheckBBox(fixed_t * bspcoord)
cliprange_t *start;
int sx1, sx2;
-#ifdef __NeXT__
- RD_DrawBBox(bspcoord);
-#endif
-
// find the corners of the box that define the edges from current viewpoint
if (viewx <= bspcoord[BOXLEFT])
boxx = 0;
@@ -356,10 +349,6 @@ boolean R_CheckBBox(fixed_t * bspcoord)
y2 = bspcoord[checkcoord[boxpos][3]];
-#ifdef __NeXT__
-// RD_DisplayLine (x1, y1, x2, y2, 0.1);
-#endif
-
//
// check clip list for an open space
//
@@ -481,10 +470,6 @@ void R_RenderBSPNode(int bspnum)
bsp = &nodes[bspnum];
-#ifdef __NeXT__
- RD_DrawNodeLine(bsp);
-#endif
-
//
// decide which side the view point is on
//
diff --git a/src/heretic/r_local.h b/src/heretic/r_local.h
index e7b7c531..d590cb7f 100644
--- a/src/heretic/r_local.h
+++ b/src/heretic/r_local.h
@@ -381,15 +381,6 @@ visplane_t *R_CheckPlane(visplane_t * pl, int start, int stop);
//
extern int drawbsp;
-void RD_OpenMapWindow(void);
-void RD_ClearMapWindow(void);
-void RD_DisplayLine(int x1, int y1, int x2, int y2, float gray);
-void RD_DrawNodeLine(node_t * node);
-void RD_DrawLineCheck(seg_t * line);
-void RD_DrawLine(seg_t * line);
-void RD_DrawBBox(fixed_t * bbox);
-
-
//
// R_data.c
//
diff --git a/src/heretic/r_main.c b/src/heretic/r_main.c
index ef5ec6d2..a83422cf 100644
--- a/src/heretic/r_main.c
+++ b/src/heretic/r_main.c
@@ -822,12 +822,7 @@ void R_SetupFrame(player_t * player)
UpdateState |= I_MESSAGES;
}
-#ifdef __NeXT__
- RD_ClearMapWindow();
-#endif
-#ifdef __WATCOMC__
destview = destscreen + (viewwindowx >> 2) + viewwindowy * 80;
-#endif
#if 0
{
diff --git a/src/heretic/r_segs.c b/src/heretic/r_segs.c
index 0d4c47ea..6a675450 100644
--- a/src/heretic/r_segs.c
+++ b/src/heretic/r_segs.c
@@ -352,9 +352,6 @@ void R_StoreWallRange(int start, int stop)
if (start >= viewwidth || start > stop)
I_Error("Bad R_RenderWallRange: %i to %i", start, stop);
#endif
-#ifdef __NeXT__
- RD_DrawLine(curline);
-#endif
sidedef = curline->sidedef;
linedef = curline->linedef;