diff options
Diffstat (limited to 'src')
36 files changed, 86 insertions, 108 deletions
diff --git a/src/avp/cdtrackselection.cpp b/src/avp/cdtrackselection.cpp index 826c041..42f5b7e 100644 --- a/src/avp/cdtrackselection.cpp +++ b/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]); } diff --git a/src/avp/gamecmds.cpp b/src/avp/gamecmds.cpp index c84b538..53b4b96 100644 --- a/src/avp/gamecmds.cpp +++ b/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"
\ No newline at end of file +} // extern "C" diff --git a/src/avp/support/consbind.cpp b/src/avp/support/consbind.cpp index b621bac..97e6de6 100644 --- a/src/avp/support/consbind.cpp +++ b/src/avp/support/consbind.cpp @@ -15,6 +15,8 @@ *******************************************************************/ /* Includes ********************************************************/ +#include <ctype.h> + #include "3dc.h" #include "consbind.hpp" diff --git a/src/avp/support/consbtch.cpp b/src/avp/support/consbtch.cpp index 0f137de..859220c 100644 --- a/src/avp/support/consbtch.cpp +++ b/src/avp/support/consbtch.cpp @@ -9,6 +9,8 @@ *******************************************************************/ /* Includes ********************************************************/ +#include <ctype.h> + #include "3dc.h" #include "consbtch.hpp" diff --git a/src/avp/support/coordstr.cpp b/src/avp/support/coordstr.cpp index 92d983f..909f416 100644 --- a/src/avp/support/coordstr.cpp +++ b/src/avp/support/coordstr.cpp @@ -723,8 +723,3 @@ void AcyclicFixedSpeedHoming :: SetSpeed_FixP } #endif - - - - - diff --git a/src/avp/support/daemon.cpp b/src/avp/support/daemon.cpp index 3cf38ec..059ba57 100644 --- a/src/avp/support/daemon.cpp +++ b/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) { diff --git a/src/avp/support/daemon.h b/src/avp/support/daemon.h index 7079bbf..64c8071 100644 --- a/src/avp/support/daemon.h +++ b/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 diff --git a/src/avp/support/indexfnt.hpp b/src/avp/support/indexfnt.hpp index 9521966..1e942d5 100644 --- a/src/avp/support/indexfnt.hpp +++ b/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 diff --git a/src/avp/support/r2base.cpp b/src/avp/support/r2base.cpp index 23da40c..5ce7839 100644 --- a/src/avp/support/r2base.cpp +++ b/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) { diff --git a/src/avp/support/rebmenus.hpp b/src/avp/support/rebmenus.hpp index 3b18509..864719d 100644 --- a/src/avp/support/rebmenus.hpp +++ b/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(); }; }; diff --git a/src/avp/support/refobj.cpp b/src/avp/support/refobj.cpp index e1c4181..df7d45f 100644 --- a/src/avp/support/refobj.cpp +++ b/src/avp/support/refobj.cpp @@ -336,4 +336,4 @@ RefCountObject_TrackData :: Globals :: ~Globals() } #endif -#endif // TrackReferenceCounted
\ No newline at end of file +#endif // TrackReferenceCounted diff --git a/src/avp/support/strutil.c b/src/avp/support/strutil.c index 8175a2e..faa3b7a 100644 --- a/src/avp/support/strutil.c +++ b/src/avp/support/strutil.c @@ -7,6 +7,7 @@ rather than chars */ +#include <ctype.h> #include "3dc.h" diff --git a/src/avp/support/tallfont.hpp b/src/avp/support/tallfont.hpp index d8008a8..317e94f 100644 --- a/src/avp/support/tallfont.hpp +++ b/src/avp/support/tallfont.hpp @@ -95,6 +95,7 @@ int SpaceWidth_Val; LPDIRECTDRAWSURFACE image_ptr; + AW_BACKUPTEXTUREHANDLE hBackup; r2size R2Size_OverallImage; diff --git a/src/avp/win95/d3d_hud.cpp b/src/avp/win95/d3d_hud.cpp index 2c7fb7b..0987812 100644 --- a/src/avp/win95/d3d_hud.cpp +++ b/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" diff --git a/src/avp/win95/ffread.cpp b/src/avp/win95/ffread.cpp index 98f1d09..6d5ef90 100644 --- a/src/avp/win95/ffread.cpp +++ b/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. diff --git a/src/avp/win95/frontend/avp_menus.c b/src/avp/win95/frontend/avp_menus.c index 50e9754..a6cd3ab 100644 --- a/src/avp/win95/frontend/avp_menus.c +++ b/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" diff --git a/src/avp/win95/frontend/avp_mp_config.cpp b/src/avp/win95/frontend/avp_mp_config.cpp index bf3e5a0..aa5b338 100644 --- a/src/avp/win95/frontend/avp_mp_config.cpp +++ b/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 diff --git a/src/avp/win95/frontend/avp_userprofile.cpp b/src/avp/win95/frontend/avp_userprofile.cpp index 3ff88fb..ed5babe 100644 --- a/src/avp/win95/frontend/avp_userprofile.cpp +++ b/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" diff --git a/src/avp/win95/gadgets/conscmnd.hpp b/src/avp/win95/gadgets/conscmnd.hpp index c52a3ad..517d8f9 100644 --- a/src/avp/win95/gadgets/conscmnd.hpp +++ b/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(); }; diff --git a/src/avp/win95/gadgets/conssym.hpp b/src/avp/win95/gadgets/conssym.hpp index 2c03cd6..f9d7664 100644 --- a/src/avp/win95/gadgets/conssym.hpp +++ b/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 *****************************************************/ diff --git a/src/avp/win95/gadgets/consvar.hpp b/src/avp/win95/gadgets/consvar.hpp index 0b42eec..025cdae 100644 --- a/src/avp/win95/gadgets/consvar.hpp +++ b/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 *****************************************************/ diff --git a/src/avp/win95/gadgets/hudgadg.hpp b/src/avp/win95/gadgets/hudgadg.hpp index 38e0c52..6f5cf28 100644 --- a/src/avp/win95/gadgets/hudgadg.hpp +++ b/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: diff --git a/src/avp/win95/gadgets/rootgadg.hpp b/src/avp/win95/gadgets/rootgadg.hpp index 573473e..99238ac 100644 --- a/src/avp/win95/gadgets/rootgadg.hpp +++ b/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: diff --git a/src/avp/win95/gadgets/textexp.hpp b/src/avp/win95/gadgets/textexp.hpp index fc08ccc..fa7e7d0 100644 --- a/src/avp/win95/gadgets/textexp.hpp +++ b/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 *****************************************************/ diff --git a/src/avp/win95/gadgets/textin.cpp b/src/avp/win95/gadgets/textin.cpp index a5ba230..4c8eae6 100644 --- a/src/avp/win95/gadgets/textin.cpp +++ b/src/avp/win95/gadgets/textin.cpp @@ -9,6 +9,8 @@ *******************************************************************/ /* Includes ********************************************************/ +#include <ctype.h> + #include "3dc.h" #include "textin.hpp" diff --git a/src/avp/win95/gadgets/trepgadg.cpp b/src/avp/win95/gadgets/trepgadg.cpp index 0f513f7..b4c17ff 100644 --- a/src/avp/win95/gadgets/trepgadg.cpp +++ b/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" diff --git a/src/avp/win95/gflwplat.c b/src/avp/win95/gflwplat.c index 309686b..b6598f1 100644 --- a/src/avp/win95/gflwplat.c +++ b/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 ( diff --git a/src/avp/win95/hudgfx.h b/src/avp/win95/hudgfx.h index e0f3882..38b5e52 100644 --- a/src/avp/win95/hudgfx.h +++ b/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
\ No newline at end of file diff --git a/src/avp/win95/jsndsup.cpp b/src/avp/win95/jsndsup.cpp index 1268818..ced63a6 100644 --- a/src/avp/win95/jsndsup.cpp +++ b/src/avp/win95/jsndsup.cpp @@ -11,7 +11,6 @@ extern "C" { - extern LPDIRECTSOUND DSObject; extern int SoundSwitchedOn; // Pat sets this up }; diff --git a/src/avp/win95/modcmds.cpp b/src/avp/win95/modcmds.cpp index 2e29d09..7d67085 100644 --- a/src/avp/win95/modcmds.cpp +++ b/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 ); } diff --git a/src/fixer.h b/src/fixer.h index faba91d..173b82a 100644 --- a/src/fixer.h +++ b/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); diff --git a/src/win95/awbmpld.cpp b/src/win95/awbmpld.cpp index 375e1d7..e47b156 100644 --- a/src/win95/awbmpld.cpp +++ b/src/win95/awbmpld.cpp @@ -1,4 +1,3 @@ -#include "advwin32.h" #ifndef DB_LEVEL #define DB_LEVEL 4 #endif diff --git a/src/win95/bmpnames.cpp b/src/win95/bmpnames.cpp index 1918033..92cb05a 100644 --- a/src/win95/bmpnames.cpp +++ b/src/win95/bmpnames.cpp @@ -958,7 +958,3 @@ size_t Bitmap_MD5_Chunk::size_chunk() +(shapename ? strlen(shapename) : 0) +3 +3&~3; } - - - - diff --git a/src/win95/d3_func.cpp b/src/win95/d3_func.cpp index 923e7f2..35de5bd 100644 --- a/src/win95/d3_func.cpp +++ b/src/win95/d3_func.cpp @@ -907,43 +907,7 @@ void FlushZB(void) } - - // For extern "C" }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/src/win95/debuglog.cpp b/src/win95/debuglog.cpp index 2e76b9f..9b64a76 100644 --- a/src/win95/debuglog.cpp +++ b/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) diff --git a/src/win95/texio.c b/src/win95/texio.c index 0ffb1ae..6cea7d8 100644 --- a/src/win95/texio.c +++ b/src/win95/texio.c @@ -17,7 +17,6 @@ #else #include <stdio.h> -#include <conio.h> #include <sys/stat.h> #include "system.h" |