More compiling. All 'easy-to-compile' files now do.

Added the Rebellion license.

src/avp/cdtrackselection.cpp

@@ -9,7 +9,6 @@ extern "C"
 #include "gamedef.h"
 
 #include "avp_envinfo.h"
-#include "dxlog.h"
 };
 
 #include "list_tem.hpp"
@@ -32,7 +31,7 @@ void EmptyCDTrackList()
 		while(LevelCDTracks[i].size()) LevelCDTracks[i].delete_first_entry();
 	}
 
-	for(i=0;i<3;i++)
+	for(int i=0;i<3;i++)
 	{
 		while(MultiplayerCDTracks[i].size()) MultiplayerCDTracks[i].delete_first_entry();
 	}
@@ -90,7 +89,7 @@ static void ExtractTracksForLevel(char* & buffer,List<int> & track_list)
 		}
 		else
 		{
-			*buffer++;
+			buffer++;
 		}
 	}
 
@@ -140,7 +139,7 @@ void LoadCDTrackList()
 	}
 	
 	//now the level tracks
-	for(i=0 ;i<AVP_ENVIRONMENT_END_OF_LIST;i++)
+	for(int i=0 ;i<AVP_ENVIRONMENT_END_OF_LIST;i++)
 	{
 		ExtractTracksForLevel(bufferptr,LevelCDTracks[i]);
 	}

src/avp/gamecmds.cpp

@@ -47,12 +47,12 @@ int DebuggingCommandsActive=0;
 extern void GimmeCharge(void);
 
 // just change these to prototypes etc.
-extern void QuickLoad()
+extern void QuickLoad(void)
 {
 	//set the load request
 	LoadGameRequest = 0; //(that's slot 0 - not false)
 }
-extern void QuickSave()
+extern void QuickSave(void)
 {
 	//set the save request
 	SaveGameRequest = 0; //(that's slot 0 - not false)
@@ -73,7 +73,7 @@ void ConsoleCommandSave(int slot)
 		SaveGameRequest = slot-1;
 	}
 }
-extern void DisplaySavesLeft();
+extern void DisplaySavesLeft(void);
 
 
 
@@ -83,7 +83,7 @@ extern void ChangeNetGameType_Individual();
 extern void ChangeNetGameType_Coop();
 extern void ChangeNetGameType_LastManStanding();
 extern void ChangeNetGameType_PredatorTag();
-extern void ShowNearestPlayersName();
+extern void ShowNearestPlayersName(void);
 extern void ScreenShot(void);
 extern void CastAlienBot(void);
 extern void CastMarineBot(int weapon);
@@ -209,7 +209,7 @@ static void ChangeToSpecialist_Pistols()
 	ChangeToMarine();
 }
 
-extern void ShowMultiplayerScores()
+extern void ShowMultiplayerScores(void)
 {
 	ShowMultiplayerScoreTimer=5*ONE_FIXED;
 }
@@ -810,8 +810,4 @@ void CreateGameSpecificConsoleCommands(void)
 
 }	
 
-
-
-						
-
-} // extern "C"
+} // extern "C"

src/avp/support/consbind.cpp

@@ -15,6 +15,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "consbind.hpp"
 

src/avp/support/consbtch.cpp

@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 
 	#include "consbtch.hpp"

src/avp/support/coordstr.cpp

@@ -723,8 +723,3 @@ void AcyclicFixedSpeedHoming :: SetSpeed_FixP
 }
 
 #endif
-
-
-
-
-

src/avp/support/daemon.cpp

@@ -372,11 +372,13 @@ void DAEMON_Init(void)
 {
 }
 
+extern "C" {
 #if UseRealFrameTime
-extern "C" extern int RealFrameTime;
+extern int RealFrameTime;
 #else
-extern "C" extern int NormalFrameTime;
+extern int NormalFrameTime;
 #endif
+}
 
 void DAEMON_Maintain(void)
 {

src/avp/support/daemon.h

@@ -66,14 +66,14 @@
 				Daemon* p666_New,
 				void* pUser_New
 			);
-			virtual ~CallbackHook();
 			
 		// ought to be private:
 			CallbackHook* pNxtHook;
 			CallbackHook* pPrvHook;
 			Daemon* p666_Val; 
 			void* pUser_Val;
-
+			
+			virtual ~CallbackHook();
 			
 	};
 	#endif // SupportCallbackHooks
@@ -87,8 +87,6 @@
 				OurBool fActive
 			);
 
-			virtual ~Daemon();
-
 		// Per object stuff:
 		public:
 			void Start(void);
@@ -132,6 +130,8 @@
 		public: // but probably ought to be private:
 			CallbackHook* pFirstHook;
 		#endif
+		public:
+			virtual ~Daemon();
 	};
 	#endif // ifdef __cplusplus
 

src/avp/support/indexfnt.hpp

@@ -409,7 +409,7 @@
 			ProjChar nextProjCh
 		) const = 0;
 		
-		virtual LPDIRECTDRAWSURFACE GetImagePtr(void) const = 0;
+//		virtual LPDIRECTDRAWSURFACE GetImagePtr(void) const = 0;
 
 	protected:
 		IndexedFont_Kerned

src/avp/support/r2base.cpp

@@ -249,7 +249,9 @@ extern void R2BASE_ScreenModeChange_Setup(void)
 	}
 }
 
-extern "C" extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock;
+extern "C" {
+	extern SCREENDESCRIPTORBLOCK ScreenDescriptorBlock;
+};
 
 extern void R2BASE_ScreenModeChange_Cleanup(void)
 {

src/avp/support/rebmenus.hpp

@@ -572,9 +572,7 @@ namespace RebMenus
 			{
 			}
 
-			~SelectionList();
-
-			AddSelection
+			void AddSelection
 			(
 				Selectable Sel_ToAdd
 			)
@@ -587,6 +585,8 @@ namespace RebMenus
 		private:
 			int NumInList;
 			Selectable theSel_A[MAX_IN_LIST];
+		public:
+			~SelectionList();
 		};
 	};
 

src/avp/support/refobj.cpp

@@ -336,4 +336,4 @@ RefCountObject_TrackData :: Globals :: ~Globals()
 }
 #endif
 
-#endif // TrackReferenceCounted
+#endif // TrackReferenceCounted

src/avp/support/strutil.c

@@ -7,6 +7,7 @@
 	rather than chars
 
 */
+#include <ctype.h>
 
 #include "3dc.h"
 

src/avp/support/tallfont.hpp

@@ -95,6 +95,7 @@
 		int SpaceWidth_Val;
 
 		LPDIRECTDRAWSURFACE image_ptr;
+
 		AW_BACKUPTEXTUREHANDLE hBackup;
 
 		r2size R2Size_OverallImage;

src/avp/win95/d3d_hud.cpp

@@ -27,7 +27,7 @@ extern "C" {
 #include "chnktexi.h"
 
 
-#include "HUD_layout.h"
+#include "hud_layout.h"
 #include "language.h"
 
 

src/avp/win95/ffread.cpp

@@ -1,6 +1,7 @@
 #include <string.h>
-#include <malloc.h>
-#include <windows.h>
+#include <stdlib.h>
+#include <ctype.h>
+//#include <windows.h>
 #include <stdio.h>
 
 #include "ffread.hpp"
@@ -27,6 +28,7 @@ void ReportError(char const * mesg1, char const * mesg2)
 	}
 	else
 	{
+#if 0
 		char * lpMsgBuf;
 
 		err = GetLastError();
@@ -49,6 +51,10 @@ void ReportError(char const * mesg1, char const * mesg2)
 		
 		// Free the buffer.
 		LocalFree( lpMsgBuf );
+#endif
+		mesg = new char [strlen(mesg1)+32];
+		strcpy(mesg, mesg1);
+		strcat(mesg, "\n\nReportError: I have no clue!\n");
 	}
 	
 	// Display the string.

src/avp/win95/frontend/avp_menus.c

@@ -6,11 +6,11 @@
 #include "bh_types.h"
 #include "pldnet.h"
 
-#include "AvP_Menus.h"
-#include "AvP_EnvInfo.h"
+#include "avp_menus.h"
+#include "avp_envinfo.h"
 
-#include "hud_Layout.h"
-#include "AvP_UserProfile.h"
+#include "hud_layout.h"
+#include "avp_userprofile.h"
 #include "huffman.hpp"
 
 #include "hudgfx.h"
@@ -19,9 +19,8 @@
 #include "ourasert.h"
 #include "iofocus.h"
 #include <time.h>
-#include "winnls.h"
-#include "GammaControl.h"
-#include "AvP_MP_Config.h"
+#include "gammacontrol.h"
+#include "avp_mp_config.h"
 #include "psnd.h"
 #include "savegame.h"
 

src/avp/win95/frontend/avp_mp_config.cpp

@@ -6,10 +6,10 @@
 #include "bh_types.h"
 #include "pldnet.h"
 
-#include "AvP_MP_Config.h"
-#include "AvP_Envinfo.h"
+#include "avp_mp_config.h"
+#include "avp_envinfo.h"
 
-#include "AvP_Menus.h"
+#include "avp_menus.h"
 #include "list_tem.hpp"
 
 #define UseLocalAssert Yes

src/avp/win95/frontend/avp_userprofile.cpp

@@ -7,7 +7,7 @@ extern "C"
 #include "module.h"
 #include "stratdef.h"
 
-#include "AvP_UserProfile.h"
+#include "avp_userprofile.h"
 #include "language.h"
 #include "GammaControl.h"
 #include "psnd.h"

src/avp/win95/gadgets/conscmnd.hpp

@@ -76,7 +76,7 @@
 
 		virtual void Execute( ProjChar* pProjCh_In ) = 0;
 
-		virtual ~ConsoleCommand();
+		
 
 		void Display(void) const;
 
@@ -96,7 +96,8 @@
 		SCString* pSCString_Description;
 
 		static List <ConsoleCommand*> List_pConsoleCommand;
-
+	public:
+		virtual ~ConsoleCommand();
 	};
 	
 

src/avp/win95/gadgets/conssym.hpp

@@ -51,11 +51,10 @@
 		(
 			ProjChar* pProjCh_ToUse
 		);
-		virtual ~ConsoleSymbol();
+		
 
 		SCString* pSCString_Symbol;
 
-
 	public:
 		SCString* GetpSCString(void) const
 		{
@@ -66,6 +65,9 @@
 	private:
 		
 		static List <ConsoleSymbol *> List_pConsoleSym;
+
+	public:
+		virtual ~ConsoleSymbol();
 	};	// suggested naming: "ConsoleSym"
 
 /* Exported globals *****************************************************/

src/avp/win95/gadgets/consvar.hpp

@@ -62,7 +62,7 @@
 			OurBool Cheat = FALSE
 		);
 
-		~ConsoleVariable();
+		
 
 		virtual int GetValue(void) const = 0;
 		virtual void SetValue(int Val_New) = 0;
@@ -120,6 +120,8 @@
 		SCString* pSCString_Description;
 
 		static List <ConsoleVariable*> List_pConsoleVar;
+	public:
+		~ConsoleVariable();
 	};	// suggested naming: "ConsoleVar"
 
 /* Exported globals *****************************************************/

src/avp/win95/gadgets/hudgadg.hpp

@@ -99,7 +99,7 @@
 
 
 		// Destructor:
-		virtual ~HUDGadget();
+		
 
 	protected:
 		// Constructor is protected since an abstract class
@@ -118,7 +118,9 @@
 	protected:
 		SCString* pSCString_Current;
 	#endif
-
+	
+	public:
+		virtual ~HUDGadget();
 	};
 
 	// Inline methods:

src/avp/win95/gadgets/rootgadg.hpp

@@ -49,14 +49,15 @@
 
 	private:
 		RootGadget();
-		~RootGadget();
+		
 
 	private:
 		static RootGadget* pSingleton;
 
 		HUDGadget* pHUDGadg;
 			// allowed to be NULL if no head-up-display e.g. when not in a game
-
+	private:
+		~RootGadget();
 	};
 	
 	// Inline methods:

src/avp/win95/gadgets/textexp.hpp

@@ -34,7 +34,7 @@
 	class TextExpansion
 	{
 	public:
-		~TextExpansion();
+		
 
 		void Display(void);
 			// sends info on this expansion to the screen
@@ -81,6 +81,8 @@
 
 		static List<TextExpansion*> List_pTextExp;
 
+	public:
+		~TextExpansion();
 	};  // suggested naming: TextExp
 
 /* Exported globals *****************************************************/

src/avp/win95/gadgets/textin.cpp

@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "textin.hpp"
 

src/avp/win95/gadgets/trepgadg.cpp

@@ -23,7 +23,7 @@
 
 #include "iofocus.h"
 
-#include "ConsoleLog.hpp"
+#include "consolelog.hpp"
 
 	#include "rootgadg.hpp"
 	#include "hudgadg.hpp"

src/avp/win95/gflwplat.c

@@ -153,7 +153,7 @@ void ShowMissionMessage ()
 
 // this will only print one string from the top of the screen
 
-static int CharWidthInPixels(char Ch)
+static int CharWidthInPixels(unsigned char Ch)
 {
 	if 
 	(

src/avp/win95/hudgfx.h

@@ -66,7 +66,8 @@ enum HUD_RES_ID
 /* description of a single DD surface used for HUD gfx */
 struct DDGraphicTag 
 {
-	LPDIRECTDRAWSURFACE    LPDDS;
+//	LPDIRECTDRAWSURFACE    LPDDS;
+
 	AW_BACKUPTEXTUREHANDLE hBackup; // JH 12/2/98 changed for new gfx loading system
     RECT				   SrcRect;
 };
@@ -117,7 +118,7 @@ extern void RestoreAllDDGraphics(void);
 /*KJL****************************************************************************************
 * 										 E X T E R N S 	  									*
 ****************************************************************************************KJL*/
-extern LPDIRECTDRAW lpDD;
-extern LPDIRECTDRAWSURFACE lpDDSBack;
+//extern LPDIRECTDRAW lpDD;
+//extern LPDIRECTDRAWSURFACE lpDDSBack;
 
 #endif

src/avp/win95/jsndsup.cpp

@@ -11,7 +11,6 @@
 
 extern "C"
 {
-	extern LPDIRECTSOUND DSObject; 
 	extern int SoundSwitchedOn;
 	// Pat sets this up
 };

src/avp/win95/modcmds.cpp

@@ -9,6 +9,8 @@
  *******************************************************************/
 
 /* Includes ********************************************************/
+#include <ctype.h>
+
 #include "3dc.h"
 #include "gadget.h"
 
@@ -131,8 +133,7 @@ void ModuleCommands :: ListModules(void)
 							(
 								Msg,
 								"MODULE:%3i NULL NAME",
-								Index,
-								pModule -> name
+								Index
 							);							
 						}
 						

src/fixer.h

@@ -52,6 +52,8 @@ typedef unsigned short WORD;
 typedef unsigned int DWORD;
 typedef long LONG;
 typedef char TCHAR;
+typedef DWORD * LPDWORD;
+typedef char * LPTSTR;
 
 #define TEXT(x) x
 
@@ -90,11 +92,12 @@ typedef struct SYSTEMTIME
 #define FILE_CURRENT		6
 #define FILE_BEGIN		7
 #define FILE_END		8
+#define FILE_SHARE_READ		9
 
 HANDLE CreateFile(const char *file, int write, int x, int y, int flags, int flags2, int z);
 HANDLE CreateFileA(const char *file, int write, int x, int y, int flags, int flags2, int z);
 int WriteFile(HANDLE file, const void *data, int len, unsigned long *byteswritten, int x);
-int ReadFile(HANDLE file, void *data, int len, unsigned long *bytesread, int x);
+int ReadFile(HANDLE file, void *data, int len, /* unsigned long */ void *bytesread, int x);
 int GetFileSize(HANDLE file, int x);
 int CloseHandle(HANDLE file);
 int DeleteFile(const char *file);

src/win95/awbmpld.cpp

@@ -1,4 +1,3 @@
-#include "advwin32.h"
 #ifndef DB_LEVEL
 #define DB_LEVEL 4
 #endif

src/win95/bmpnames.cpp

@@ -958,7 +958,3 @@ size_t Bitmap_MD5_Chunk::size_chunk()
 		+(shapename ? strlen(shapename) : 0)
 		+3 +3&~3;
 }
-
-
-
-

src/win95/d3_func.cpp

@@ -907,43 +907,7 @@ void FlushZB(void)
 
 }
 
-
-
 // For extern "C"
 
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
  

src/win95/debuglog.cpp

@@ -1,6 +1,5 @@
 #include <string.h>
 #include <stdlib.h>
-#include <windows.h>
 #include "debuglog.hpp"
 
 LogFile::LogFile(char const * const _fname) : fname(0) , ever_written(0)
@@ -37,7 +36,7 @@ LogFile::~LogFile()
 		FILE * fp = fopen(fname,"a");
 		for (int attempt=0; !fp && attempt<10; ++attempt)
 		{
-			Sleep(100);
+			/* Sleep(100); */
 			fp = fopen(fname,"a");
 		}
 		if (fp)

src/win95/texio.c

@@ -17,7 +17,6 @@
 #else
 
 #include <stdio.h>
-#include <conio.h>
 #include <sys/stat.h>
 
 #include "system.h"