diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/avp/avpview.c | 6 | ||||
| -rw-r--r-- | src/win95/platform.h | 5 |
3 files changed, 11 insertions, 6 deletions
@@ -1,7 +1,7 @@ CC = gcc NASM = nasm -CFLAGS = -g -Wall -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend +CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend CXXFLAGS = $(CFLAGS) LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a @@ -11,8 +11,8 @@ LDLIBS += `sdl-config --libs` AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow ROOT = afont.c frustum.c kshape.c map.c maths.c mem3dc.c mem3dcpp.cpp module.c morph.c mslhand.c object.c shpanim.c sphere.c tables.c vdb.c version.c -AVP = ai_sight.c -# avpitems.cpp +AVP = ai_sight.c avpview.c +# avpitems.cpp avppages.cpp # the following should really be autogenerated... diff --git a/src/avp/avpview.c b/src/avp/avpview.c index e522bca..2f0dbb5 100644 --- a/src/avp/avpview.c +++ b/src/avp/avpview.c @@ -10,13 +10,12 @@ #include "kshape.h" #include "kzsort.h" -#include "frustrum.h" +#include "frustum.h" #include "krender.h" #include "vision.h" #include "lighting.h" #include "weapons.h" #include "sfx.h" -#include "smacker.h" /* character extents data so you know where the player's eyes are */ #include "extents.h" #include "avp_userprofile.h" @@ -43,7 +42,8 @@ extern int ScanDrawMode; extern int DrawMode; extern int ZBufferMode; -extern DPID MultiplayerObservedPlayer; +//extern DPID MultiplayerObservedPlayer; +extern int MultiplayerObservedPlayer; #if SupportMorphing MORPHDISPLAY MorphDisplay; diff --git a/src/win95/platform.h b/src/win95/platform.h index 7547802..9059f19 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -33,8 +33,13 @@ extern "C" { #define max(a, b) (((a) > (b)) ? (a) : (b)) #endif +#define stricmp strcasecmp + /* Types */ +typedef int GUID; +typedef int DPID; + typedef int BOOL; typedef struct RECT |