diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | src/avp/ai_sight.c | 5 | ||||
| -rw-r--r-- | src/avp/win95/frontend/avp_menugfx.hpp | 3 | ||||
| -rw-r--r-- | src/avp/win95/frontend/avp_menus.h | 6 | ||||
| -rw-r--r-- | src/kshape.c | 4 | ||||
| -rw-r--r-- | src/maths.c | 12 | ||||
| -rw-r--r-- | src/win95/db.h | 4 | ||||
| -rw-r--r-- | src/win95/inline.h | 9 | ||||
| -rw-r--r-- | src/win95/platform.h | 24 |
9 files changed, 52 insertions, 31 deletions
@@ -2,6 +2,7 @@ CC = gcc NASM = nasm CFLAGS = -g -Wall -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend +CXXFLAGS = $(CFLAGS) LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a CFLAGS += `sdl-config --cflags` @@ -10,6 +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 # the following should really be autogenerated... @@ -19,17 +22,18 @@ OBJNAMES1 = $(addsuffix .o,$(basename $(1))) ROOTSRC = $(ROOT) ROOTOBJ = $(call OBJNAMES1,$(ROOT)) +AVPSRC = $(call SRCNAMES,$(AVP),avp) +AVPOBJ = $(call OBJNAMES,$(AVP),avp) - -SRC = $(ROOTSRC) -OBJ = $(ROOTOBJ) +SRC = $(ROOTSRC) $(AVPSRC) +OBJ = $(ROOTOBJ) $(AVPOBJ) .SUFFIXES: .asm -all: avp +all: AvP -avp: depend $(OBJ) - gcc -o avp $(OBJ) $(LDLIBS) +AvP: depend $(OBJ) + gcc -o AvP $(OBJ) $(LDLIBS) compile: $(OBJ) diff --git a/src/avp/ai_sight.c b/src/avp/ai_sight.c index a1815ef..7663e8a 100644 --- a/src/avp/ai_sight.c +++ b/src/avp/ai_sight.c @@ -9,14 +9,15 @@ #include "dynblock.h" #include "dynamics.h" #include "los.h" -#include "ShowCmds.h" +#include "showcmds.h" #include "equipmnt.h" #include "bh_marin.h" #include "bh_xeno.h" #include "targeting.h" #include "bh_weap.h" +#include "bh_agun.h" -#include "AI_Sight.h" +#include "ai_sight.h" #define UseLocalAssert Yes #include "ourasert.h" diff --git a/src/avp/win95/frontend/avp_menugfx.hpp b/src/avp/win95/frontend/avp_menugfx.hpp index 2502f59..8e78157 100644 --- a/src/avp/win95/frontend/avp_menugfx.hpp +++ b/src/avp/win95/frontend/avp_menugfx.hpp @@ -74,7 +74,8 @@ enum AVPMENUGFX_ID typedef struct { char *FilenamePtr; - LPDIRECTDRAWSURFACE ImagePtr; +// LPDIRECTDRAWSURFACE ImagePtr; + AW_BACKUPTEXTUREHANDLE hBackup; int Width; int Height; diff --git a/src/avp/win95/frontend/avp_menus.h b/src/avp/win95/frontend/avp_menus.h index 1437e9b..80a009a 100644 --- a/src/avp/win95/frontend/avp_menus.h +++ b/src/avp/win95/frontend/avp_menus.h @@ -314,7 +314,9 @@ typedef struct { char Name[40]; char levelIndex;//local level index - GUID Guid; +// GUID Guid; + int Guid; + BOOL AllowedToJoin; } SESSION_DESC; #define MAX_NO_OF_SESSIONS 10 @@ -342,4 +344,4 @@ typedef struct #define NUMBER_OF_SAVE_SLOTS 8 -#endif
\ No newline at end of file +#endif diff --git a/src/kshape.c b/src/kshape.c index c7d4883..29de827 100644 --- a/src/kshape.c +++ b/src/kshape.c @@ -7228,13 +7228,11 @@ void RenderBoomSphere(VECTORCH *position, int radius) } } - - #endif + int Alpha[SPHERE_VERTICES]; void RenderExplosionSurface(VOLUMETRIC_EXPLOSION *explosionPtr) { - extern D3DTEXTUREHANDLE FMVTextureHandle[]; int red,green,blue; switch (CurrentVisionMode) diff --git a/src/maths.c b/src/maths.c index 42546bb..da5e23a 100644 --- a/src/maths.c +++ b/src/maths.c @@ -1,15 +1,3 @@ - -#if PSX -#include <kernel.h> -#include <sys/types.h> -#include <libetc.h> -#include <libgte.h> -#include <libgpu.h> -#include <stdlib.h> -#include <inline_c.h> -#include <gtemac.h> -#endif - #include "3dc.h" #include "inline.h" diff --git a/src/win95/db.h b/src/win95/db.h index 10e5d4d..cc0ee47 100644 --- a/src/win95/db.h +++ b/src/win95/db.h @@ -70,7 +70,7 @@ /* I N C L U D E D S ************************************************** */ #include "advwin32.h" #ifndef DB_NOWINDOWS - #include <windows.h> +// #include <windows.h> #include "advwin32.h" #endif @@ -292,6 +292,8 @@ struct db_dd_mode_tag /* Don't prototype anything or declare globals if NDEBUG is defined. */ #ifndef NDEBUG +#define __cdecl + /* New formatted debugging fns. */ extern void __cdecl db_logf_fired(const char *fmtStrP, ...); extern void __cdecl db_printf_fired(int x, int y, const char *fmtStrP, ...); diff --git a/src/win95/inline.h b/src/win95/inline.h index 719daf3..f09e79a 100644 --- a/src/win95/inline.h +++ b/src/win95/inline.h @@ -1,6 +1,15 @@ #ifndef INLINE_INCLUDED #define INLINE_INCLUDED +#ifndef min +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif + +#ifndef max +#define max(a, b) (((a) > (b)) ? (a) : (b)) +#endif + + #if SUPPORT_MMX #include "mmx_math.h" #endif diff --git a/src/win95/platform.h b/src/win95/platform.h index cefebf1..7547802 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -25,12 +25,15 @@ extern "C" { #define Hardware2dTextureClipping No +#ifndef min +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif -/* - - Types +#ifndef max +#define max(a, b) (((a) > (b)) ? (a) : (b)) +#endif -*/ +/* Types */ typedef int BOOL; @@ -56,6 +59,19 @@ typedef struct LONGLONGCH { } LONGLONGCH; +typedef int FILETIME; + +typedef struct SYSTEMTIME +{ +//#warning "SYSTEMTIME format is not correct" + int wHour; + int wMinute; + int wSecond; + int wYear; + int wMonth; + int wDay; +} SYSTEMTIME; + /* Sine and Cosine |