More compiling...

Makefile

@@ -1,7 +1,7 @@
 CC = gcc
 NASM = nasm
 
-CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend
+CFLAGS = -g -Wall -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets
 CXXFLAGS = $(CFLAGS)
 LDLIBS = -lm # /home/relnev/ElectricFence-2.2.2/libefence.a
 
@@ -11,8 +11,10 @@ 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 avpview.c
-# avpitems.cpp avppages.cpp
+AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cheatmodes.c comp_map.c comp_shp.c consolelog.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c gameflow.c hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c movement.c paintball.c particle.c pfarlocs.c pheromon.c pmove.c psndproj.c pvisible.c
+# unused?: avpitems.cpp avppages.cpp
+# not needed: mp_launch.c
+# need fix: cconvars.cpp cdtrackselection.cpp davehook.cpp game_statistics.c gamecmds.cpp gamevars.cpp missions.cpp player.c psnd.c
 
 # the following should really be autogenerated...
 

src/avp/bh_agun.c

@@ -38,10 +38,10 @@
 #include "bh_agun.h"
 #include "plat_shp.h"
 #include "psnd.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "sequnces.h"
 #include "huddefs.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "sfx.h"
 #include "bh_marin.h"
 #include "bh_far.h"

src/avp/bh_ais.c

@@ -26,10 +26,10 @@
 #include "psnd.h"
 #include "equipmnt.h"
 #include "los.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "targeting.h"
 #include "dxlog.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "huddefs.h"
 
 #define UseLocalAssert Yes

src/avp/bh_alien.c

@@ -36,7 +36,7 @@
 #define UseLocalAssert Yes
 #include "ourasert.h"
 #include "pldnet.h"
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 
 /* external global variables used in this file */
 extern int ModuleArraySize;

src/avp/bh_corpse.c

@@ -32,7 +32,7 @@
 #include "pldghost.h"
 #include "pldnet.h"
 #include "psndplat.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "los.h"
 #include "bh_corpse.h"
 
@@ -42,7 +42,7 @@
 #include "ourasert.h"
 
 #include "sequnces.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "extents.h"
 
 extern int NormalFrameTime;

src/avp/bh_debri.c

@@ -32,7 +32,7 @@
 #include "pldghost.h"
 #endif
 
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 #include "savegame.h"
 
 #include <math.h>

src/avp/bh_dummy.c

@@ -36,10 +36,10 @@
 #include "bh_agun.h"
 #include "plat_shp.h"
 #include "psnd.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "sequnces.h"
 #include "huddefs.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "sfx.h"
 #include "bh_marin.h"
 #include "bh_dummy.h"

src/avp/bh_far.c

@@ -22,7 +22,7 @@
 #include "pvisible.h"
 #include "bh_marin.h"
 #include "weapons.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 
 #define UseLocalAssert Yes
 #include "ourasert.h"

src/avp/bh_fhug.c

@@ -23,7 +23,7 @@
 
 #define UseLocalAssert Yes
 #include "ourasert.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "sfx.h"
 
 #define HUGGER_STATE_PRINT	0

src/avp/bh_gener.c

@@ -23,7 +23,7 @@
 #include "ourasert.h"
 
 #include "huddefs.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 
 /* externs for this file */
 extern int NormalFrameTime;

src/avp/bh_marin.c

@@ -33,7 +33,7 @@
 #include "pldghost.h"
 #include "pldnet.h"
 #include "psndplat.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "los.h"
 #include "bh_corpse.h"
 #include "bh_dummy.h"
@@ -45,9 +45,9 @@
 #include "ourasert.h"
 
 #include "sequnces.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "extents.h"
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 
 #define ALL_PULSERIFLES 0
 #define MOTIONTRACKERS 0

src/avp/bh_near.c

@@ -24,8 +24,8 @@
 #include "psnd.h"
 #include "psndplat.h"
 #include "dxlog.h"
-#include "ShowCmds.h"
-#include "AI_Sight.h"
+#include "showcmds.h"
+#include "ai_sight.h"
 #include "los.h"
 #include "bh_gener.h"
 #include "pldnet.h"

src/avp/bh_pred.c

@@ -26,10 +26,10 @@ Source file for predator AI
 #include "psnd.h"
 #include "equipmnt.h"
 #include "los.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "targeting.h"
 #include "dxlog.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "huddefs.h"
 #include "pldghost.h"
 #include "bh_gener.h"

src/avp/bh_queen.c

@@ -26,7 +26,7 @@
 #include "weapons.h"
 #include "extents.h"
 #include "sequnces.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "targeting.h"
 #include "dxlog.h"
 #include <math.h>

src/avp/bh_rubberduck.c

@@ -18,7 +18,7 @@
 #include "particle.h"
 
 #include "bh_types.h"
-#include "bh_RubberDuck.h"			   
+#include "bh_rubberduck.h"			   
 #include "bh_weap.h"
 #include "sfx.h"
 

src/avp/bh_weap.c

@@ -31,10 +31,10 @@
 
 #include "particle.h"
 #include "sfx.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "savegame.h"
 #include "los.h"
-#include "DetailLevels.h"
+#include "detaillevels.h"
 
 #if SupportWindows95
 /* for win95 net game support */

src/avp/bh_xeno.c

@@ -24,10 +24,10 @@
 #include "bh_debri.h"
 #include "plat_shp.h"
 #include "particle.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "sequnces.h"
 #include "huddefs.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "sfx.h"
 #include "bh_marin.h"
 #include "bh_far.h"

src/avp/cconvars.cpp

@@ -27,15 +27,15 @@
 #include "dxlog.h"
 #include "avp_menus.h"
 #include "pheromon.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 #include "pfarlocs.h"
 
 #define UseLocalAssert Yes
 #include "ourasert.h"
 
 #include "game_statistics.h"
-#include "AvP_EnvInfo.h"
-#include "AvP_UserProfile.h"
+#include "avp_envinfo.h"
+#include "avp_userprofile.h"
 
 extern "C"
 {

src/avp/cdtrackselection.cpp

@@ -4,11 +4,11 @@ extern "C"
 #include "ourasert.h"
 #include "psndplat.h"
 #include "dxlog.h"
-#include "CD_player.h"
+#include "cd_player.h"
 #include "avp_menus.h"
 #include "gamedef.h"
 
-#include "AvP_EnvInfo.h"
+#include "avp_envinfo.h"
 #include "dxlog.h"
 };
 

src/avp/cheatmodes.c

@@ -3,8 +3,8 @@
 #include "module.h"
 #include "stratdef.h"
 
-#include "AvP_UserProfile.h"
-#include "AvP_Menus.h"
+#include "avp_userprofile.h"
+#include "avp_menus.h"
 
 int CheatMode_Active=0;
 int CheatMode_Species=0;

src/avp/consolelog.cpp

@@ -15,7 +15,7 @@
 #include "gameplat.h"
 
 #include "debuglog.hpp"
-#include "ConsoleLog.hpp"
+#include "consolelog.hpp"
 
 #include "bh_types.h"
 #include "inventry.h"

src/avp/deaths.c

@@ -25,10 +25,10 @@
 #include "psnd.h"
 #include "equipmnt.h"
 #include "los.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "targeting.h"
 #include "dxlog.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 
 #define UseLocalAssert Yes
 #include "ourasert.h"

src/avp/detaillevels.c

@@ -1,4 +1,4 @@
-#include "DetailLevels.h"
+#include "detaillevels.h"
 
 DETAIL_LEVELS LocalDetailLevels;
 MENU_DETAIL_LEVEL_OPTIONS MenuDetailLevelOptions;

src/avp/game.c

@@ -23,13 +23,13 @@
 #include "particle.h"
 #include "sfx.h"
 #include "version.h"
-#include "bh_RubberDuck.h"
+#include "bh_rubberduck.h"
 #include "bh_marin.h"
 #include "dxlog.h"
 #include "avp_menus.h"
 #include "avp_userprofile.h"
 #include "davehook.h"
-#include "CDTrackSelection.h"
+#include "cdtrackselection.h"
 #include "savegame.h"
 	// Added 18/11/97 by DHM: all hooks for my code
 

src/avp/game_statistics.c

@@ -16,8 +16,8 @@
 #define UseLocalAssert Yes
 #include "ourasert.h"
 
-#include "AvP_EnvInfo.h"
-#include "AvP_UserProfile.h"
+#include "avp_envinfo.h"
+#include "avp_userprofile.h"
 
 #define FIXED_MINUTE (ONE_FIXED*60)
 

src/avp/gamecmds.cpp

@@ -29,17 +29,16 @@ extern "C"
 #include "cheat.h"
 #include "cd_player.h"
 #include "dynblock.h"
-#include "bh_RubberDuck.h"
+#include "bh_rubberduck.h"
 #include "pvisible.h"
 #include "pldnet.h"
 
 #include "lighting.h"
 #include "paintball.h"		  
 #include "decal.h"
-#include "ConsoleLog.hpp"
+#include "consolelog.hpp"
 #include "psndplat.h"
 #include "avp_menus.h"
-#include "smacker.h"
 #include "detaillevels.h"
 #include "savegame.h"
 

src/avp/hud.c

@@ -31,7 +31,7 @@
 #include "gadget.h"
 #include "lighting.h"
 #include "d3d_hud.h"
-#include "frustrum.h"
+#include "frustum.h"
 #include "pldghost.h"
 
 #include "d3d_render.h"
@@ -42,7 +42,7 @@
 #include "ourasert.h"
 
 #include "vision.h"
-#include "BonusAbilities.h"
+#include "bonusabilities.h"
 #include "avp_menus.h"
 #include "showcmds.h"
 #include "game_statistics.h"

src/avp/inventry.c

@@ -25,7 +25,7 @@ rounds fired etc etc etc*/
 #include "pldghost.h"
 #endif
 
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 
 #define UseLocalAssert Yes
 #include "ourasert.h"

src/avp/movement.c

@@ -25,10 +25,10 @@
 #include "psnd.h"
 #include "equipmnt.h"
 #include "los.h"
-#include "AI_Sight.h"
+#include "ai_sight.h"
 #include "targeting.h"
 #include "dxlog.h"
-#include "ShowCmds.h"
+#include "showcmds.h"
 
 #define UseLocalAssert Yes
 #include "ourasert.h"

src/avp/paintball.h

@@ -2,7 +2,7 @@
 #ifndef _included_paintball_h_ /* Is this your first time? */
 #define _included_paintball_h_ 1
 
-#include "Decal.h"
+#include "decal.h"
 
 typedef struct
 {

src/avp/particle.c

@@ -5164,7 +5164,7 @@ void HandlePheromoneTrails(void)
 
 	}					 
 }
-#include "frustrum.h"
+#include "frustum.h"
 void RenderTrailSegment(PHEROMONE_TRAIL *trailPtr)
 {
  	POLYHEADER fakeHeader;

src/avp/player.c

@@ -35,8 +35,8 @@ so player.c is looking a bit bare at the moment. */
 #include "pldghost.h"
 #include "dp_func.h"
 #endif
-#include "ShowCmds.h"
-#include "BonusAbilities.h"
+#include "showcmds.h"
+#include "bonusabilities.h"
 
 #define PLAYER_HMODEL 0
 

src/avp/pmove.c

@@ -34,7 +34,7 @@
 #include "los.h"
 #include "krender.h"
 #include "pldnet.h"
-#include "BonusAbilities.h"
+#include "bonusabilities.h"
 #include "avp_menus.h"
 #include "lighting.h"
 #include "scream.h"

src/avp/win95/gadgets/conssym.hpp

@@ -30,6 +30,7 @@
 /* Macros ***************************************************************/
 
 /* Type definitions *****************************************************/
+
 	class ConsoleSymbol
 	{
 		friend class TextInputState;
@@ -63,7 +64,8 @@
 
 
 	private:
-		static List <ConsoleSymbol*> List_pConsoleSym;
+		
+		static List <ConsoleSymbol *> List_pConsoleSym;
 	};	// suggested naming: "ConsoleSym"
 
 /* Exported globals *****************************************************/

src/avp/win95/psndplat.h

@@ -26,7 +26,8 @@ typedef struct soundsampledata
 	int activeInstances;	 
 	int volume;		
 	int pitch;					
-	LPDIRECTSOUNDBUFFER dsBufferP;
+//	LPDIRECTSOUNDBUFFER dsBufferP;
+
 	unsigned int flags;
 	int dsFrequency;
 	char * wavName;
@@ -57,9 +58,9 @@ typedef struct activesoundsample
 	unsigned int reverb_off :1;
 	SOUND3DDATA threedeedata;
 	
-	LPDIRECTSOUNDBUFFER dsBufferP;
-	LPDIRECTSOUND3DBUFFER ds3DBufferP;
-	LPKSPROPERTYSET	PropSetP;
+//	LPDIRECTSOUNDBUFFER dsBufferP;
+//	LPDIRECTSOUND3DBUFFER ds3DBufferP;
+//	LPKSPROPERTYSET	PropSetP;
 	
 }ACTIVESOUNDSAMPLE;
 

src/win95/db.h

@@ -68,11 +68,7 @@
 #define DB_H_INCLUDED
 
 /* I N C L U D E D S ************************************************** */
-#include "advwin32.h"
-#ifndef DB_NOWINDOWS
-//	#include <windows.h>
-	#include "advwin32.h"
-#endif
+//#include "advwin32.h"
 
 /* Permit use in a C++ source file. */
 #ifdef __cplusplus

src/win95/dxlog.h

@@ -2,9 +2,6 @@
 #define _included_dxlog_h_
 
 #include "system.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "d3drm.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,7 +9,7 @@ extern "C" {
 
 #if debug
 
-void dx_err_log(HRESULT error, int line, char const * file);
+void dx_err_log(int error, int line, char const * file);
 void dx_str_log(char const * str, int line, char const * file);
 void dx_line_log(int line, char const * file);
 void dx_strf_log(char const * fmt, ...);
@@ -23,10 +20,21 @@ void dx_strf_log(char const * fmt, ...);
 
 #else
 
+/* TODO: make these static inline to hush the compiler */
+void dx_err_log(int error, int line, char const * file);
+void dx_str_log(char const * str, int line, char const * file);
+void dx_line_log(int line, char const * file);
+void dx_strf_log(char const * fmt, ...);
+
+#define LOGDXERR(error) dx_err_log(error,__LINE__,__FILE__)
+#define LOGDXSTR(str) dx_str_log(str,__LINE__,__FILE__)
+#define LOGDXFMT(args) (dx_line_log(__LINE__,__FILE__),dx_strf_log args)
+
+/*
 #define LOGDXERR(error) (void)0
 #define LOGDXSTR(str) (void)0
 #define LOGDXFMT(args) (void)0
-
+*/
 #endif
 
 

src/win95/list_tem.hpp

@@ -18,7 +18,7 @@
 #ifndef list_template_hpp
 #define list_template_hpp
 
-#pragma once
+//#pragma once
 
 #include <stdio.h>
 

src/win95/platform.h

@@ -1,6 +1,9 @@
 #ifndef PLATFORM_INCLUDED
 #define PLATFORM_INCLUDED
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <stdint.h> // int64_t
 
 #include "shape.h" // struct imageheader
@@ -33,12 +36,20 @@ extern "C"  {
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 
-#define stricmp	strcasecmp
+#define	TRUE	1
+#define FALSE	0
+
+#define stricmp		strcasecmp
+#define _stricmp	strcasecmp
 
 /* Types */
 
+/* windows junk */
 typedef int GUID;
 typedef int DPID;
+typedef int HINSTANCE;
+typedef int WPARAM;
+typedef int LPARAM;
 
 typedef int BOOL;
 

src/win95/showcmds.h

@@ -30,6 +30,7 @@ extern struct DEBUGGINGTEXTOPTIONS ShowDebuggingText;
 	#define DEBUGGING_TEXT_ON 0
 #endif
 
+#if 0 /* stupid defines */
 #if DEBUGGING_TEXT_ON
 extern int PrintDebuggingText(const char* t, ...);
 #else
@@ -41,3 +42,7 @@ extern int ReleasePrintDebuggingText(const char* t, ...);
 #else
 #define PrintDebuggingText(ignore)
 #endif
+#endif /* ... */
+
+extern int PrintDebuggingText(const char* t, ...);
+extern int ReleasePrintDebuggingText(const char* t, ...);