Commit 89713beb authored by Steven Fuller's avatar Steven Fuller

Minor cleanups

parent b9b5ef39
Just some random facts/thoughts/ideas/musings: Just some random facts/thoughts/ideas/musings:
http://www.warzone.com/fullnews/902317374.shtml
* Wolfenstein 3D for: * Wolfenstein 3D for:
- PC (released, of course) [May 5, 1992] - PC (released, of course) [May 5, 1992]
- PC Spear of Destiny 1992 - PC Spear of Destiny 1992
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#ifdef _WIN32 #ifdef _WIN32
/* TODO: rename dosism, because like djgpp has glob() */ /* TODO: rename dosism, because for example djgpp has glob() */
#define DOSISM /* for junk which isn't abstracted (namely stuff in wl_menu.c with glob/findfirst and misc.c) */ #define DOSISM /* for junk which isn't abstracted (namely stuff in wl_menu.c with glob/findfirst and misc.c) */
#undef HAVE_FFBLK /* TODO: what to do with hacks like this */ #undef HAVE_FFBLK /* TODO: what to do with hacks like this */
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define ssize_t SSIZE_T #define ssize_t SSIZE_T
#else #else
#undef DOSISM #undef DOSISM
...@@ -46,15 +45,11 @@ typedef enum {false,true} boolean; ...@@ -46,15 +45,11 @@ typedef enum {false,true} boolean;
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <math.h> #include <math.h>
#include "misc.h" #include "misc.h"
#include "version.h" #include "version.h"
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
...@@ -83,7 +78,6 @@ typedef enum {false,true} boolean; ...@@ -83,7 +78,6 @@ typedef enum {false,true} boolean;
/* ---------------- */ /* ---------------- */
typedef unsigned char byte; typedef unsigned char byte;
typedef unsigned short int word; typedef unsigned short int word;
typedef unsigned long longword; typedef unsigned long longword;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
/* SDM = 2 */ /* SDM = 2 */
/* SOD = 3 */ /* SOD = 3 */
#ifndef WMODE #ifndef WMODE
#define WMODE 0 #define WMODE 3
#endif #endif
#if WMODE == 0 #if WMODE == 0
......
...@@ -295,7 +295,7 @@ void VL_Startup() ...@@ -295,7 +295,7 @@ void VL_Startup()
attr.event_mask = KeyPressMask | KeyReleaseMask | ExposureMask; attr.event_mask = KeyPressMask | KeyReleaseMask | ExposureMask;
attrmask = /*CWColormap |*/ CWEventMask; attrmask = /*CWColormap |*/ CWEventMask;
if (dga) { if (fullscreen || dga) {
attrmask |= CWOverrideRedirect; attrmask |= CWOverrideRedirect;
attr.override_redirect = True; attr.override_redirect = True;
} }
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define MAPSPOT(x,y,plane) (*(mapsegs[plane]+farmapylookup[y]+x)) #define MAPSPOT(x,y,plane) (*(mapsegs[plane]+farmapylookup[y]+x))
#define ABS(x) ((int)(x)>0?(x):-(x))
#define LABS(x) ((long)(x)>0?(x):-(x)) #define LABS(x) ((long)(x)>0?(x):-(x))
/* /*
...@@ -716,8 +715,6 @@ extern fixed sintable[], *costable; ...@@ -716,8 +715,6 @@ extern fixed sintable[], *costable;
extern char configname[13]; extern char configname[13];
void HelpScreens (void);
void OrderingInfo (void);
void CalcProjection (long focal); void CalcProjection (long focal);
boolean SetViewSize (unsigned width, unsigned height); boolean SetViewSize (unsigned width, unsigned height);
void NewGame (int difficulty,int episode); void NewGame (int difficulty,int episode);
...@@ -753,7 +750,6 @@ extern boolean spearflag; ...@@ -753,7 +750,6 @@ extern boolean spearflag;
void DrawPlayBorder (void); void DrawPlayBorder (void);
void ScanInfoPlane (void); void ScanInfoPlane (void);
void SetupGameLevel (void); void SetupGameLevel (void);
void NormalScreen (void);
void DrawPlayScreen (void); void DrawPlayScreen (void);
void FizzleOut (void); void FizzleOut (void);
void GameLoop (void); void GameLoop (void);
...@@ -776,9 +772,7 @@ void DrawAllPlayBorderSides (void); ...@@ -776,9 +772,7 @@ void DrawAllPlayBorderSides (void);
============================================================================= =============================================================================
*/ */
#ifdef SPEAR
extern long funnyticount; // FOR FUNNY BJ FACE extern long funnyticount; // FOR FUNNY BJ FACE
#endif
extern exit_t playstate; extern exit_t playstate;
...@@ -1043,8 +1037,6 @@ void InitAreas (void); ...@@ -1043,8 +1037,6 @@ void InitAreas (void);
============================================================================= =============================================================================
*/ */
#define s_nakedbody s_static10
extern statetype s_grddie1; extern statetype s_grddie1;
extern statetype s_dogdie1; extern statetype s_dogdie1;
extern statetype s_ofcdie1; extern statetype s_ofcdie1;
...@@ -1066,7 +1058,6 @@ extern statetype s_uberdie0; ...@@ -1066,7 +1058,6 @@ extern statetype s_uberdie0;
extern statetype s_willdie1; extern statetype s_willdie1;
extern statetype s_deathdie1; extern statetype s_deathdie1;
extern statetype s_grdchase1; extern statetype s_grdchase1;
extern statetype s_dogchase1; extern statetype s_dogchase1;
extern statetype s_ofcchase1; extern statetype s_ofcchase1;
......
...@@ -443,7 +443,6 @@ boolean LoadTheGame(int file,int x,int y) ...@@ -443,7 +443,6 @@ boolean LoadTheGame(int file,int x,int y)
CA_FarRead (file,(void *)areabyplayer,sizeof(areabyplayer)); CA_FarRead (file,(void *)areabyplayer,sizeof(areabyplayer));
InitActorList (); InitActorList ();
DiskFlopAnim(x,y); DiskFlopAnim(x,y);
CA_FarRead (file,(void *)player,sizeof(*player)); CA_FarRead (file,(void *)player,sizeof(*player));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment