Added a makefile, some cleanup to id_ca.c

src/Makefile

+CC = gcc
+#CFLAGS = -Wall -O6 -fomit-frame-pointer -mpentiumpro -mcpu=pentiumpro -march=pentiumpro -DUSEVGA
+CFLAGS = -g -DUSEVGA
+#CFLAGS = -g -Wall -DUSEVGA -DDEBUG 
+#CFLAGS = -g -DUSEVGA -DDEBUG
+#CFLAGS = -g -pg -DDEBUG
+OBJS = objs.o id_ca.o id_in.o id_sd.o id_vl.o id_vh.o wl_scale.o wl_draw.o \
+	wl_act1.o wl_act2.o wl_agent.o wl_game.o wl_inter.o wl_menu.o \
+	wl_play.o wl_state.o wl_main.o wl_debug.o
+
+#LFLAGS = -lm -lvga -pg
+LFLAGS = -lm -lvga 
+
+#LFLAGS = /home/relnev/midas/lib/linux/gcdebug/libmidas.a -lpthread -lm -lvga 
+# /home/relnev/ElectricFence-2.0.5/libefence.a -lm -lvga 
+NASM = nasm
+
+.SUFFIXES: .asm
+
+all:	wolf3d
+
+.asm.o:
+	$(NASM) -f elf -o $@ $<
+
+wolf3d: $(OBJS)
+	gcc -o wolf3d $(OBJS) $(LFLAGS) 
+
+clean:
+	-rm -rf wolf3d *.o
+
+distclean: clean
+	rm -rf *~ DEADJOE

src/id_ca.h

@@ -49,11 +49,11 @@ extern long		*audiostarts;	// array of offsets in audio / audiot
 
 //===========================================================================
 
-boolean CA_FarRead (int handle, byte *dest, long length);
-boolean CA_FarWrite (int handle, byte *source, long length);
-boolean CA_ReadFile (char *filename, memptr *ptr);
-boolean CA_LoadFile (char *filename, memptr *ptr);
-boolean CA_WriteFile (char *filename, void *ptr, long length);
+boolean CA_FarRead(int handle, byte *dest, long length);
+boolean CA_FarWrite(int handle, byte *source, long length);
+boolean CA_ReadFile(char *filename, memptr *ptr);
+boolean CA_LoadFile(char *filename, memptr *ptr);
+boolean CA_WriteFile(char *filename, void *ptr, long length);
 
 long CA_RLEWCompress (unsigned *source, long length, unsigned *dest,
   unsigned rlewtag);
@@ -136,8 +136,6 @@ void CA_CacheScreen (int chunk);
 
 //==========================================================================
 
-typedef void * memptr;
-
 typedef struct
 {
 	long	nearheap,farheap,EMSmem,XMSmem,mainmem;

src/id_heads.h

 #ifndef __ID_HEADS_H__
 #define __ID_HEADS_H__
 
-#include <alloc.h>
 #include <ctype.h>
-#include <dos.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <io.h>
-#include <mem.h>
-#include <process.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <values.h>
-#include <dir.h>
 
 #include "version.h"
 
@@ -82,6 +76,8 @@ typedef	unsigned	int			word;
 typedef	unsigned	long		longword;
 typedef	byte *					Ptr;
 
+typedef void * memptr;
+
 typedef	struct
 		{
 			int	x,y;
@@ -93,9 +89,6 @@ typedef	struct
 
 #define	nil	((void *)0)
 
-
-#include "id_mm.h"
-#include "id_pm.h"
 #include "id_ca.h"
 #include "id_vl.h"
 #include "id_vh.h"

src/wl_draw.c

-// WL_DRAW.C
+/* wl_draw.c */
 
-#include "WL_DEF.H"
-#include <DOS.H>
-#pragma hdrstop
-
-//#define DEBUGWALLS
-//#define DEBUGTICS
+#include "wl_def.h"
+#include <dos.h>
 
 /*
 =============================================================================
@@ -29,11 +25,7 @@
 */
 
 
-#ifdef DEBUGWALLS
-unsigned screenloc[3]= {0,0,0};
-#else
 unsigned screenloc[3]= {PAGE1START,PAGE2START,PAGE3START};
-#endif
 unsigned freelatch = FREESTART;
 
 long 	lasttimecount;