Commit e13d79d1 authored by Steven Fuller's avatar Steven Fuller

Small cleanups

parent 8cb83d7e
...@@ -11,15 +11,14 @@ ...@@ -11,15 +11,14 @@
* Network support! * Network support!
* Fully compile with no warnings/errors using -Wall -ansi -pedantic and with * Fully compile with no warnings/errors using -Wall -ansi -pedantic and with
other compilers (would need to turn off warnings about unused parameters) other compilers (would need to turn off warnings about unused parameters)
* Port to: Linux/SVGAlib, Linux/X (Windowed and DGA), Linux/OpenGL, * Port to: Linux/SVGAlib, Linux/X (Windowed and DGA), Linux/OpenGL?,
DOS/Allegro?, Win32/GDI?, Win32/DX, Win32/D3D?, Win32/OpenGL, BeOS?, MacOS?, DOS/Allegro?, Win32/GDI?, Win32/DX?, Win32/D3D?, Win32/OpenGL, BeOS?,
QNX? MacOS?, QNX?
* Ease in using demos. Playing demos from files, recording to files, batch * Ease in using demos. Playing demos from files, recording to files, batch
playing, and so on. playing, and so on.
* Make Wolf3D the game it was originally planned to be... More strategy... * 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 * 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 regardless of future plans [IDEAS]) and no TODOs in the source code
code
* Test with other available mods (that were compatible with the original * Test with other available mods (that were compatible with the original
game) game)
* Unified input handling * Unified input handling
......
...@@ -2,6 +2,7 @@ CC = gcc ...@@ -2,6 +2,7 @@ CC = gcc
#CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro #CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
CFLAGS = -g -Wall CFLAGS = -g -Wall
#CFLAGS = -g -Wall -pedantic
#CFLAGS = -Os -Wall #CFLAGS = -Os -Wall
#CFLAGS = -Os -Wall -fomit-frame-pointer -ffast-math -mpentiumpro -mcpu=pentiumpro -march=pentiumpro #CFLAGS = -Os -Wall -fomit-frame-pointer -ffast-math -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
......
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
#define PI 3.14159265358979323846 #define PI 3.14159265358979323846
#endif #endif
#ifndef INLINE
#define INLINE inline #define INLINE inline
#endif
void logerror(const char *text, ...) void logerror(const char *text, ...)
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
pictabletype *pictable; pictabletype *pictable;
int px, py; int px, py;
byte fontcolor,backcolor; byte fontcolor, backcolor;
int fontnumber; int fontnumber;
boolean screenfaded; boolean screenfaded;
...@@ -209,7 +209,7 @@ void VL_FadeOut(int start, int end, int red, int green, int blue, int steps) ...@@ -209,7 +209,7 @@ void VL_FadeOut(int start, int end, int red, int green, int blue, int steps)
// //
// final color // final color
// //
VL_FillPalette (red,green,blue); VL_FillPalette(red, green, blue);
screenfaded = true; screenfaded = true;
} }
...@@ -245,7 +245,7 @@ void VL_FadeIn(int start, int end, const byte *palette, int steps) ...@@ -245,7 +245,7 @@ void VL_FadeIn(int start, int end, const byte *palette, int steps)
} }
VL_WaitVBL(1); VL_WaitVBL(1);
VL_SetPalette (&palette2[0][0]); VL_SetPalette(&palette2[0][0]);
} }
// //
......
...@@ -885,8 +885,6 @@ extern fixed viewx,viewy; // the focal point ...@@ -885,8 +885,6 @@ extern fixed viewx,viewy; // the focal point
extern int viewangle; extern int viewangle;
extern fixed viewsin,viewcos; extern fixed viewsin,viewcos;
extern unsigned postx;
extern int horizwall[],vertwall[]; extern int horizwall[],vertwall[];
extern unsigned pwallpos; extern unsigned pwallpos;
...@@ -908,9 +906,6 @@ void ThreeDRefresh (void); ...@@ -908,9 +906,6 @@ void ThreeDRefresh (void);
#define SPDPATROL 512 #define SPDPATROL 512
#define SPDDOG 1500 #define SPDDOG 1500
extern dirtype opposite[9];
extern dirtype diagonal[9][9];
void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state); void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state);
void NewState (objtype *ob, statetype *state); void NewState (objtype *ob, statetype *state);
...@@ -943,8 +938,6 @@ typedef struct ...@@ -943,8 +938,6 @@ typedef struct
/* table data after dataofs[rightpix-leftpix+1] */ /* table data after dataofs[rightpix-leftpix+1] */
} PACKED t_compshape; } PACKED t_compshape;
extern int maxscale;
void SetupScaling (int maxscaleheight); void SetupScaling (int maxscaleheight);
void ScaleShape (int xcenter, int shapenum, unsigned height); void ScaleShape (int xcenter, int shapenum, unsigned height);
void SimpleScaleShape (int xcenter, int shapenum, unsigned height); void SimpleScaleShape (int xcenter, int shapenum, unsigned height);
...@@ -1123,7 +1116,7 @@ void SpawnHitler (int tilex, int tiley); ...@@ -1123,7 +1116,7 @@ void SpawnHitler (int tilex, int tiley);
============================================================================= =============================================================================
*/ */
extern void HelpScreens(void); extern void HelpScreens();
extern void EndText(void); extern void EndText();
#endif #endif
...@@ -38,6 +38,8 @@ static unsigned postx; ...@@ -38,6 +38,8 @@ static unsigned postx;
static void AsmRefresh(); static void AsmRefresh();
void xBuildCompScale(int height, byte *source, int x); void xBuildCompScale(int height, byte *source, int x);
#define NOASM
#ifndef NOASM #ifndef NOASM
#define FixedByFrac(x, y) \ #define FixedByFrac(x, y) \
({ unsigned long z; \ ({ unsigned long z; \
......
...@@ -653,7 +653,7 @@ void CalcProjection(long focal) ...@@ -653,7 +653,7 @@ void CalcProjection(long focal)
=================== ===================
*/ */
void SetupWalls (void) void SetupWalls()
{ {
int i; int i;
......
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