Commit 0c2226af authored by Steven Fuller's avatar Steven Fuller

Everything except InterMis.c compiles.

parent 97bb5845
#include "Wolfdef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
/********************************** /**********************************
......
#include "WolfDef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
#include "WolfDef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
...@@ -144,7 +144,7 @@ jmp_buf ResetJmp; ...@@ -144,7 +144,7 @@ jmp_buf ResetJmp;
Boolean JumpOK; Boolean JumpOK;
extern Word NumberIndex; extern Word NumberIndex;
void main(void) int main(int argc, char *argv[])
{ {
InitTools(); /* Init the system environment */ InitTools(); /* Init the system environment */
WaitTick(); /* Wait for a system tick to go by */ WaitTick(); /* Wait for a system tick to go by */
...@@ -171,4 +171,6 @@ DoGame: ...@@ -171,4 +171,6 @@ DoGame:
} }
} }
} }
return 0;
} }
...@@ -6,10 +6,10 @@ CFLAGS = -g ...@@ -6,10 +6,10 @@ CFLAGS = -g
#CFLAGS = -Os #CFLAGS = -Os
#CFLAGS = -g -Wall -I/home/relnev/cvs/oal/include #CFLAGS = -g -Wall -I/home/relnev/cvs/oal/include
OBJS = Data.o Doors.o EnMove.o EnThink.o InterMis.o Intro.o Level.o \ OBJS = Data.o Doors.o EnMove.o EnThink.o Intro.o Level.o \
Missiles.o Music.o PlMove.o PlStuff.o PlThink.o PushWall.o \ Missiles.o Music.o PlMove.o PlStuff.o PlThink.o PushWall.o \
RefBsp.o RefSprite.o Refresh.o Refresh2.o Sight.o Main.o \ RefBsp.o RefSprite.o Refresh.o Refresh2.o Sight.o Main.o \
StateDef.o WolfMain.o WolfIO.o Burger.o StateDef.o WolfMain.o WolfIO.o InterMis.o
SOBJS = $(OBJS) SOBJS = $(OBJS)
XOBJS = $(OBJS) XOBJS = $(OBJS)
GOBJS = $(OBJS) GOBJS = $(OBJS)
......
#include "Wolfdef.h" #include "wolfdef.h"
/********************************** /**********************************
......
#include "WolfDef.h" #include "wolfdef.h"
static Word checkcoord[11][4] = { /* Indexs to the bspcoord table */ static Word checkcoord[11][4] = { /* Indexs to the bspcoord table */
{3,0,2,1}, {3,0,2,1},
......
#include "WolfDef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
Word *src1,*src2,*dest; /* Used by the sort */ Word *src1,*src2,*dest; /* Used by the sort */
......
#include "WolfDef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
......
#include "WolfDef.h" #include "wolfdef.h"
#include <stdlib.h> #include <stdlib.h>
Word MathSize; /* What size of math data is calculated? */ Word MathSize; /* What size of math data is calculated? */
......
#include "WolfDef.h" #include "wolfdef.h"
#include <string.h> #include <string.h>
/********************************** /**********************************
......
#ifndef __WOLFDEF__ #ifndef __WOLFDEF__
#define __WOLFDEF__ #define __WOLFDEF__
#define DEMO /* Define if this is the lame demo for dealers */ #ifndef TRUE
#define TRUE 1
/* japversion has mission pics instead */ #endif
/* #define JAPVERSION */ #ifndef FALSE
#define FALSE 0
/* If code is compiled on a IIgs, pass the compiler presets... */
#ifdef __ORCAC__
#pragma optimize 15 /* Normal optimization */
#pragma memorymodel 0 /* Force small memory model */
#pragma noroot /* No root files */
#pragma lint -1 /* Full error checking */
segment "Wolf3d"; /* Code segment */
#endif #endif
/* an angle_t occupies an entire 16 bits so wraparound is automatically handled */ /* an angle_t occupies an entire 16 bits so wraparound is automatically handled */
...@@ -25,7 +17,7 @@ typedef unsigned short angle_t; /* Must be short to allow wraparound */ ...@@ -25,7 +17,7 @@ typedef unsigned short angle_t; /* Must be short to allow wraparound */
typedef short fixed_t; /* 8.8 fixed point number */ typedef short fixed_t; /* 8.8 fixed point number */
typedef unsigned short ufixed_t; /* 8.8 unsigned fixed point number */ typedef unsigned short ufixed_t; /* 8.8 unsigned fixed point number */
#include <burger.h> /* My standard system equates */ #include "burger.h" /* My standard system equates */
#include "States.h" /* Think state equates */ #include "States.h" /* Think state equates */
#include "Sounds.h" /* Sound equates */ #include "Sounds.h" /* Sound equates */
#include "Sprites.h" /* Sprite indexs */ #include "Sprites.h" /* Sprite indexs */
...@@ -540,10 +532,9 @@ extern int rw_centerangle; ...@@ -540,10 +532,9 @@ extern int rw_centerangle;
extern Boolean rw_downside; /* True for dir_east and dir_south*/ extern Boolean rw_downside; /* True for dir_east and dir_south*/
extern Byte *ArtData[64]; extern Byte *ArtData[64];
extern Byte textures[MAPSIZE*2+5][MAPSIZE]; /* 0-63 is horizontal, 64-127 is vertical*/ extern Byte textures[MAPSIZE*2+5][MAPSIZE]; /* 0-63 is horizontal, 64-127 is vertical*/
/* 128 - 132 are doors*/
/* In Mac.c, 3DO.c, AppleIIgs.c */
/* TODO - these were in Mac.c etc */ /* 128 - 132 are doors*/
/*
extern void InitTools(void); extern void InitTools(void);
extern void BlastScreen(void); extern void BlastScreen(void);
extern void BlastScreen2(Rect *BlastRect); extern void BlastScreen2(Rect *BlastRect);
...@@ -558,6 +549,7 @@ extern void EndGetPsyched(void); ...@@ -558,6 +549,7 @@ extern void EndGetPsyched(void);
extern Word ChooseGameDiff(void); extern Word ChooseGameDiff(void);
extern void ShareWareEnd(void); extern void ShareWareEnd(void);
extern void FinishLoadGame(void); extern void FinishLoadGame(void);
*/
/* In StateDef.c */ /* In StateDef.c */
......
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