Small cleanups

src/IDEAS

@@ -11,15 +11,14 @@
 * Network support!
 * Fully compile with no warnings/errors using -Wall -ansi -pedantic and with
   other compilers (would need to turn off warnings about unused parameters)
-* Port to: Linux/SVGAlib, Linux/X (Windowed and DGA), Linux/OpenGL, 
-  DOS/Allegro?, Win32/GDI?, Win32/DX, Win32/D3D?, Win32/OpenGL, BeOS?, MacOS?,
-  QNX?
+* Port to: Linux/SVGAlib, Linux/X (Windowed and DGA), Linux/OpenGL?, 
+  DOS/Allegro?, Win32/GDI?, Win32/DX?, Win32/D3D?, Win32/OpenGL, BeOS?,
+  MacOS?, QNX?
 * Ease in using demos. Playing demos from files, recording to files, batch
   playing, and so on.
 * Make Wolf3D the game it was originally planned to be...  More strategy...
 * Empty TODO File (TODO states a list of things which need to/should be done
-  regardless of future plans [IDEAS]) and no TODO/FIXMEs in the source 
-  code
+  regardless of future plans [IDEAS]) and no TODOs in the source code 
 * Test with other available mods (that were compatible with the original
   game)
 * Unified input handling

src/Makefile

@@ -2,6 +2,7 @@ CC = gcc
 
 #CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
 CFLAGS = -g -Wall
+#CFLAGS = -g -Wall -pedantic
 #CFLAGS = -Os -Wall
 #CFLAGS = -Os -Wall -fomit-frame-pointer -ffast-math -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
 

src/fmopl.c

@@ -20,7 +20,9 @@
 #define PI 3.14159265358979323846
 #endif
 
+#ifndef INLINE
 #define INLINE inline
+#endif
 
 void logerror(const char *text, ...)
 {

src/id_vh.c

@@ -7,7 +7,7 @@
 pictabletype *pictable;
 
 int px, py;
-byte fontcolor,backcolor;
+byte fontcolor, backcolor;
 int fontnumber;
 
 boolean	screenfaded;
@@ -209,7 +209,7 @@ void VL_FadeOut(int start, int end, int red, int green, int blue, int steps)
 //
 // final color
 //
-	VL_FillPalette (red,green,blue);
+	VL_FillPalette(red, green, blue);
 
 	screenfaded = true;
 }
@@ -245,7 +245,7 @@ void VL_FadeIn(int start, int end, const byte *palette, int steps)
 		}
 
 		VL_WaitVBL(1);
-		VL_SetPalette (&palette2[0][0]);
+		VL_SetPalette(&palette2[0][0]);
 	}
 
 //

src/wl_def.h

@@ -30,25 +30,25 @@
 =============================================================================
 */
 
-#define MAXACTORS		150				// max number of nazis, etc / map
-#define MAXSTATS		400				// max number of lamps, bonus, etc
-#define MAXDOORS		64				// max number of sliding doors
-#define MAXWALLTILES	64				// max number of wall tiles
+#define MAXACTORS		150		// max number of nazis, etc / map
+#define MAXSTATS		400		// max number of lamps, bonus, etc
+#define MAXDOORS		64		// max number of sliding doors
+#define MAXWALLTILES		64		// max number of wall tiles
 
 //
 // tile constants
 //
 
 #define	ICONARROWS		90
-#define PUSHABLETILE	98
-#define EXITTILE		99				// at end of castle
-#define AREATILE		107				// first of NUMAREAS floor tiles
+#define PUSHABLETILE		98
+#define EXITTILE		99		// at end of castle
+#define AREATILE		107		// first of NUMAREAS floor tiles
 #define NUMAREAS		37
-#define ELEVATORTILE	21
+#define ELEVATORTILE		21
 #define AMBUSHTILE		106
-#define	ALTELEVATORTILE	107
+#define	ALTELEVATORTILE		107
 
-#define HEIGHTRATIO            0.50
+#define HEIGHTRATIO		0.50
 
 //----------------
 
@@ -56,8 +56,8 @@
 
 #define RUNSPEED   		6000
 
-#define PLAYERSIZE		MINDIST			// player radius
-#define MINACTORDIST	0x10000l		// minimum dist from player center
+#define PLAYERSIZE		MINDIST		// player radius
+#define MINACTORDIST		0x10000l	// minimum dist from player center
 						// to any actor center
 						
 #define GLOBAL1		(1l<<16)
@@ -885,8 +885,6 @@ extern	fixed	viewx,viewy;			// the focal point
 extern	int		viewangle;
 extern	fixed	viewsin,viewcos;
 
-extern	unsigned	postx;
-
 extern	int		horizwall[],vertwall[];
 
 extern	unsigned	pwallpos;
@@ -908,9 +906,6 @@ void	ThreeDRefresh (void);
 #define SPDPATROL	512
 #define SPDDOG		1500
 
-extern	dirtype opposite[9];
-extern	dirtype diagonal[9][9];
-
 void	SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state);
 void	NewState (objtype *ob, statetype *state);
 
@@ -943,8 +938,6 @@ typedef struct
 /* table data after dataofs[rightpix-leftpix+1] */
 } PACKED t_compshape;
 
-extern	int			maxscale;
-
 void SetupScaling (int maxscaleheight);
 void ScaleShape (int xcenter, int shapenum, unsigned height);
 void SimpleScaleShape (int xcenter, int shapenum, unsigned height);
@@ -1097,7 +1090,7 @@ void SpawnStand (enemy_t which, int tilex, int tiley, int dir);
 void SpawnPatrol (enemy_t which, int tilex, int tiley, int dir);
 void KillActor (objtype *ob);
 
-void	US_ControlPanel(byte);
+void US_ControlPanel(byte);
 
 void SpawnDeadGuard (int tilex, int tiley);
 void SpawnBoss (int tilex, int tiley);
@@ -1123,7 +1116,7 @@ void SpawnHitler (int tilex, int tiley);
 =============================================================================
 */
 
-extern	void	HelpScreens(void);
-extern	void	EndText(void);
+extern void HelpScreens();
+extern void EndText();
 
 #endif

src/wl_draw.c

@@ -38,6 +38,8 @@ static unsigned postx;
 static void AsmRefresh();
 void xBuildCompScale(int height, byte *source, int x);
 
+#define NOASM
+
 #ifndef NOASM
 #define FixedByFrac(x, y) \
  ({ unsigned long z; \

src/wl_main.c

@@ -653,7 +653,7 @@ void CalcProjection(long focal)
 ===================
 */
 
-void SetupWalls (void)
+void SetupWalls()
 {
 	int     i;