diff options
author | Simon Howard | 2008-10-01 19:20:45 +0000 |
---|---|---|
committer | Simon Howard | 2008-10-01 19:20:45 +0000 |
commit | 89d95067fc7cde0e3f99f15cf5fc1e89381f9edf (patch) | |
tree | 1d2633356845400be2d180bc5fbb2070914a26d6 /src | |
parent | 313e56805e28ff78868dce3806c813bc1e98d16b (diff) | |
download | chocolate-doom-89d95067fc7cde0e3f99f15cf5fc1e89381f9edf.tar.gz chocolate-doom-89d95067fc7cde0e3f99f15cf5fc1e89381f9edf.tar.bz2 chocolate-doom-89d95067fc7cde0e3f99f15cf5fc1e89381f9edf.zip |
Remove some redundant DOS and NeXT-related code.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1319
Diffstat (limited to 'src')
-rw-r--r-- | src/hexen/d_net.c | 2 | ||||
-rw-r--r-- | src/hexen/h2_main.c | 6 | ||||
-rw-r--r-- | src/hexen/h2def.h | 2 | ||||
-rw-r--r-- | src/hexen/mn_menu.c | 9 | ||||
-rw-r--r-- | src/hexen/p_inter.c | 4 | ||||
-rw-r--r-- | src/hexen/r_bsp.c | 15 | ||||
-rw-r--r-- | src/hexen/r_main.c | 7 | ||||
-rw-r--r-- | src/hexen/r_segs.c | 3 |
8 files changed, 1 insertions, 47 deletions
diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c index 2f6a53c3..ff6e7d5e 100644 --- a/src/hexen/d_net.c +++ b/src/hexen/d_net.c @@ -97,7 +97,7 @@ unsigned NetbufferChecksum(void) c = 0x1234567; -#if defined(NeXT) || defined(NORMALUNIX) +#if defined(NORMALUNIX) return 0; // byte order problems #endif diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index 25f04aa5..394a52bc 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -126,15 +126,9 @@ static int WarpMap; static int demosequence; static int pagetic; static char *pagename; -#ifdef __NeXT__ -static char *wadfiles[MAXWADFILES] = { - "/Novell/H2/source/hexen.wad" -}; -#else static char *wadfiles[MAXWADFILES] = { "hexen.wad" }; -#endif static execOpt_t ExecOptions[] = { {"-file", ExecOptionFILE, 1, 0}, {"-scripts", ExecOptionSCRIPTS, 1, 0}, diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h index 41e8043d..621af01c 100644 --- a/src/hexen/h2def.h +++ b/src/hexen/h2def.h @@ -91,8 +91,6 @@ // header generated by multigen utility #include "info.h" -extern byte *destview, *destscreen; // PC direct to screen pointers - /* =============================================================================== diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c index 717fbe28..334a9a85 100644 --- a/src/hexen/mn_menu.c +++ b/src/hexen/mn_menu.c @@ -1276,14 +1276,6 @@ boolean MN_Responder(event_t * event) BorderNeedRefresh = true; UpdateState |= I_FULLSCRN; return (true); -#ifdef __NeXT__ - case 'q': - MenuActive = false; - askforquit = true; - typeofask = 5; // suicide - return true; -#endif -#ifndef __NeXT__ case KEY_F1: // help screen SCInfo(0); // start up info screens MenuActive = true; @@ -1448,7 +1440,6 @@ boolean MN_Responder(event_t * event) G_DeferedInitNew(gameskill, gameepisode, gamemap); P_SetMessage(&players[consoleplayer], TXT_CHEATWARP, false); return true; -#endif } } diff --git a/src/hexen/p_inter.c b/src/hexen/p_inter.c index a539eb64..879cd422 100644 --- a/src/hexen/p_inter.c +++ b/src/hexen/p_inter.c @@ -62,10 +62,6 @@ static void TryPickupWeapon(player_t * player, pclass_t weaponClass, static void TryPickupWeaponPiece(player_t * player, pclass_t matchClass, int pieceValue, mobj_t * pieceMobj); -#ifdef __NeXT__ -extern void strupr(char *s); -#endif - //-------------------------------------------------------------------------- // // PROC P_SetMessage diff --git a/src/hexen/r_bsp.c b/src/hexen/r_bsp.c index 624c8c13..267fe38a 100644 --- a/src/hexen/r_bsp.c +++ b/src/hexen/r_bsp.c @@ -217,9 +217,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 @@ -330,10 +327,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; @@ -359,10 +352,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 // @@ -503,10 +492,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/hexen/r_main.c b/src/hexen/r_main.c index 3437ca74..1ee0168e 100644 --- a/src/hexen/r_main.c +++ b/src/hexen/r_main.c @@ -816,13 +816,6 @@ 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 { static int frame; diff --git a/src/hexen/r_segs.c b/src/hexen/r_segs.c index 353aaa21..40f5a80c 100644 --- a/src/hexen/r_segs.c +++ b/src/hexen/r_segs.c @@ -344,9 +344,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; |