Few more cleanups

src/TODO

@@ -41,3 +41,4 @@ Trying to free null audio chunk 207!
 CA_FarRead hit EOF?
 CA_FarRead hit EOF?
 CA_FarRead hit EOF?
+* if possible fix/or at least add ViewMap?

src/version.h

@@ -5,7 +5,9 @@
 /* WL6 = 1 */
 /* SDM = 2 */
 /* SOD = 3 */
+#ifndef WMODE
 #define WMODE 1
+#endif
 
 #if WMODE == 0
 /* #define SPEAR */

src/wl_debug.c

@@ -229,8 +229,7 @@ static	char	buf[10];
 			// draw the wall
 			//
 				postx = 128;
-				postwidth = 1;
-				for (x=0;x<64;x++,postx++,postsource+=64)
+				for (x=0;x<64;x++,postx++)
 				{
 					wallheight[postx] = 256;
 					ScalePost((byte *)addr, x);
@@ -439,7 +438,6 @@ int DebugKeys (void)
 		DebugMemory();
 		return 1;
 	}
-#ifdef SPEAR
 	else if (Keyboard[sc_N])			// N = no clip
 	{
 		noclip^=1;
@@ -452,7 +450,6 @@ int DebugKeys (void)
 		IN_Ack ();
 		return 1;
 	}
-#endif
 #if 0
 	else if (Keyboard[sc_O])			// O = overhead
 	{
@@ -503,6 +500,7 @@ int DebugKeys (void)
 	{
 		CenterWindow(26,3);
 		PrintY+=6;
+	/* TODO: wouldn't work on sod demo etc */
 #ifndef SPEAR
 		US_Print("  Warp to which level(1-10):");
 #else
@@ -525,15 +523,6 @@ int DebugKeys (void)
 		}
 		return 1;
 	}
-	else if (Keyboard[sc_X])			// X = item cheat
-	{
-		CenterWindow (12,3);
-		US_PrintCentered ("Extra stuff!");
-		VW_UpdateScreen();
-		// DEBUG: put stuff here
-		IN_Ack ();
-		return 1;
-	}
 
 	return 0;
 }

src/wl_def.h

@@ -553,17 +553,15 @@ typedef enum {
 	en_death
 } enemy_t;
 
-
 typedef struct statestruct
 {
 	boolean	rotate;
-	int		shapenum; /* a shapenum of -1 means get from ob->temp1 */
-	int		tictime;
-	void	(*think) (),(*action) ();
+	int shapenum; /* a shapenum of -1 means get from ob->temp1 */
+	int tictime;
+	void (*think)(), (*action)();
 	struct statestruct *next;
 } PACKED statetype;
 
-
 //---------------------
 //
 // trivial actor structure
@@ -603,7 +601,7 @@ typedef struct doorstruct
 typedef struct objstruct
 {
 	activetype	active;
-	int			ticcount;
+	int		ticcount;
 	classtype	obclass;
 	statetype	*state;
 
@@ -621,7 +619,7 @@ typedef struct objstruct
 	fixed		transx, transy;		/* in global coord */
 
 	int 		angle;
-	int			hitpoints;
+	int		hitpoints;
 	long		speed;
 
 	int		temp1,temp2,temp3;
@@ -652,7 +650,7 @@ typedef enum	{
 } weapontype;
 
 
-/* typedef */ enum {
+enum {
 	gd_baby,
 	gd_easy,
 	gd_medium,
@@ -735,7 +733,6 @@ extern fixed sintable[], *costable;
 // derived constants
 //
 extern	fixed maxslope;
-extern	int		minheightdiv;
 
 extern	char	configname[13];
 
@@ -872,11 +869,10 @@ void StartBonusFlash (void);
 void IntroScreen (void);
 void PreloadGraphics(void);
 void LevelCompleted (void);
-void	CheckHighScore (long score,word other);
+void CheckHighScore (long score,word other);
 void Victory (void);
 void ClearSplitVWB (void);
 
-
 /*
 =============================================================================
 
@@ -888,7 +884,6 @@ void ClearSplitVWB (void);
 int DebugKeys (void);
 void PicturePause (void);
 
-
 /*
 =============================================================================
 
@@ -905,13 +900,12 @@ extern	unsigned	wallheight[MAXVIEWWIDTH];
 
 extern	fixed	tileglobal;
 extern	fixed	focallength;
-extern	fixed	mindist;
 
 //
 // derived constants
 //
 extern	fixed 	scale;
-extern	long	heightnumerator,mindist;
+extern	long	heightnumerator;
 
 //
 // refresh variables
@@ -920,10 +914,7 @@ extern	fixed	viewx,viewy;			// the focal point
 extern	int		viewangle;
 extern	fixed	viewsin,viewcos;
 
-extern	long		postsource;
 extern	unsigned	postx;
-extern	unsigned	postwidth;
-
 
 extern	int		horizwall[],vertwall[];
 
@@ -950,12 +941,9 @@ void	ThreeDRefresh (void);
 #define SPDPATROL	512
 #define SPDDOG		1500
 
-
 extern	dirtype opposite[9];
 extern	dirtype diagonal[9][9];
 
-
-void	InitHitRect (objtype *ob, unsigned radius);
 void	SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state);
 void	NewState (objtype *ob, statetype *state);
 

src/wl_draw.c

@@ -268,9 +268,7 @@ int CalcHeight (void)
 ===================
 */
 
-long		postsource;
 unsigned	postx;
-unsigned	postwidth;
 
 void ScalePost (byte *wall, int texture)		// VGA version
 {

src/wl_main.c

@@ -48,8 +48,6 @@ int             centerx;
 int             shootdelta;                     // pixels away from centerx a target can be
 fixed           scale,maxslope;
 long            heightnumerator;
-int                     minheightdiv;
-
 
 void            Quit (char *error);
 
@@ -584,7 +582,6 @@ void CalcProjection (long focal)
 // the heightbuffer.  The pixel height is height>>2
 //
 	heightnumerator = (TILEGLOBAL*scale)>>6;
-	minheightdiv = heightnumerator/0x7fff +1;
 
 //
 // calculate the angle offset from view angle of each pixel's ray