1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaks in strategic pathing

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-10-20 08:40:25 +00:00
parent b170dbb1e5
commit 13288fd750
10 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JA2Prototypes.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef _JA2PROTOTYPES_H
#define _JA2PROTOTYPES_H
/*
* This header does not define any structures. It simply provides a way for all code that only needs a pointer
* reference to structures, to have it without getting locked into mutual includes and other
* hard-to-trace-and-fix behavior. More class and struct defs can be added as necessary.
*/
class SOLDIERTYPE;
struct AnimationSurfaceType;
#endif
MainMenuScreen.cpp
+1 -1
View File
@@ -555,7 +555,7 @@ BOOLEAN CreateDestroyMainMenuButtons( BOOLEAN fCreate )
INT32 cnt; INT32 cnt;
SGPFILENAME filename; SGPFILENAME filename;
INT16 sSlot; INT16 sSlot;
INT32 iStartLoc=0; //INT32 iStartLoc=0;
#ifndef _DEBUG #ifndef _DEBUG
CHAR16 zText[512]; CHAR16 zText[512];
#endif #endif
MessageBoxScreen.cpp
+21 -10
View File
@@ -629,11 +629,17 @@ INT32 DoMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UIN
} }
InterruptTime(); #if 0
PauseGame(); gMsgBox.fWasPaused = GamePaused();
LockPauseState( 1 ); if (!gMsgBox.fWasPaused)
// Pause timers as well.... {
PauseTime( TRUE ); InterruptTime();
PauseGame();
LockPauseState( 1 );
// Pause timers as well....
PauseTime( TRUE );
}
#endif
// Save mouse restriction region... // Save mouse restriction region...
GetRestrictedClipCursor( &gOldCursorLimitRectangle ); GetRestrictedClipCursor( &gOldCursorLimitRectangle );
@@ -867,11 +873,16 @@ UINT32 ExitMsgBox( INT8 ubExitCode )
// Delete button images // Delete button images
UnloadButtonImage( gMsgBox.iButtonImages ); UnloadButtonImage( gMsgBox.iButtonImages );
// Unpause game.... #if 0
UnLockPauseState(); if (!gMsgBox.fWasPaused)
UnPauseGame(); {
// UnPause timers as well.... // Unpause game....
PauseTime( FALSE ); UnLockPauseState();
UnPauseGame();
// UnPause timers as well....
PauseTime( FALSE );
}
#endif
// Restore mouse restriction region... // Restore mouse restriction region...
RestrictMouseCursor( &gOldCursorLimitRectangle ); RestrictMouseCursor( &gOldCursorLimitRectangle );
MessageBoxScreen.h
+1
View File
@@ -71,6 +71,7 @@ typedef struct
INT8 bHandled; INT8 bHandled;
INT32 iBoxId; INT32 iBoxId;
BOOLEAN fWasPaused;
} MESSAGE_BOX_STRUCT; } MESSAGE_BOX_STRUCT;
Options Screen.cpp
+4 -4
View File
@@ -470,7 +470,7 @@ Uncomment this to enable the check for files to activate the blood and gore opti
if( usTextWidth > OPT_TOGGLE_BOX_TEXT_WIDTH ) if( usTextWidth > OPT_TOGGLE_BOX_TEXT_WIDTH )
{ {
//Get how many lines will be used to display the string, without displaying the string //Get how many lines will be used to display the string, without displaying the string
UINT8 ubNumLines = DisplayWrappedString( 0, 0, OPT_TOGGLE_BOX_TEXT_WIDTH, 2, OPT_MAIN_FONT, OPT_HIGHLIGHT_COLOR, zOptionsToggleText[ cnt ], FONT_MCOLOR_BLACK, TRUE, LEFT_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( OPT_MAIN_FONT ); UINT8 ubNumLines = (UINT8) ( DisplayWrappedString( 0, 0, OPT_TOGGLE_BOX_TEXT_WIDTH, 2, OPT_MAIN_FONT, OPT_HIGHLIGHT_COLOR, zOptionsToggleText[ cnt ], FONT_MCOLOR_BLACK, TRUE, LEFT_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( OPT_MAIN_FONT ) );
usTextWidth = OPT_TOGGLE_BOX_TEXT_WIDTH; usTextWidth = OPT_TOGGLE_BOX_TEXT_WIDTH;
@@ -518,7 +518,7 @@ Uncomment this to enable the check for files to activate the blood and gore opti
if( usTextWidth > OPT_TOGGLE_BOX_TEXT_WIDTH ) if( usTextWidth > OPT_TOGGLE_BOX_TEXT_WIDTH )
{ {
//Get how many lines will be used to display the string, without displaying the string //Get how many lines will be used to display the string, without displaying the string
UINT8 ubNumLines = DisplayWrappedString( 0, 0, OPT_TOGGLE_BOX_TEXT_WIDTH, 2, OPT_MAIN_FONT, OPT_HIGHLIGHT_COLOR, zOptionsToggleText[ cnt ], FONT_MCOLOR_BLACK, TRUE, LEFT_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( OPT_MAIN_FONT ); UINT8 ubNumLines = (UINT8) ( DisplayWrappedString( 0, 0, OPT_TOGGLE_BOX_TEXT_WIDTH, 2, OPT_MAIN_FONT, OPT_HIGHLIGHT_COLOR, zOptionsToggleText[ cnt ], FONT_MCOLOR_BLACK, TRUE, LEFT_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( OPT_MAIN_FONT ) );
usTextWidth = OPT_TOGGLE_BOX_TEXT_WIDTH; usTextWidth = OPT_TOGGLE_BOX_TEXT_WIDTH;
@@ -1052,7 +1052,7 @@ void BtnOptionsTogglesCallback( GUI_BUTTON *btn, INT32 reason )
void HandleOptionToggle( UINT8 ubButton, BOOLEAN fState, BOOLEAN fDown, BOOLEAN fPlaySound ) void HandleOptionToggle( UINT8 ubButton, BOOLEAN fState, BOOLEAN fDown, BOOLEAN fPlaySound )
{ {
static UINT32 uiOptionToggleSound = NO_SAMPLE; static UINT32 uiOptionToggleSound = NO_SAMPLE;
UINT32 uiSideToPlaySoundOn = MIDDLEPAN; //UINT32 uiSideToPlaySoundOn = MIDDLEPAN;
// static BOOLEAN fCheckBoxDrawnDownLastTime = FALSE; // static BOOLEAN fCheckBoxDrawnDownLastTime = FALSE;
if( fState ) if( fState )
@@ -1218,7 +1218,7 @@ void HandleSliderBarMovementSounds()
{ {
static UINT32 uiLastSoundFxTime=0; static UINT32 uiLastSoundFxTime=0;
static UINT32 uiLastSpeechTime=0; static UINT32 uiLastSpeechTime=0;
UINT32 uiCurTime = GetJA2Clock(); //UINT32 uiCurTime = GetJA2Clock();
static UINT32 uiLastPlayingSoundID = NO_SAMPLE; static UINT32 uiLastPlayingSoundID = NO_SAMPLE;
static UINT32 uiLastPlayingSpeechID = NO_SAMPLE; static UINT32 uiLastPlayingSpeechID = NO_SAMPLE;
SCREENS.cpp
+4 -4
View File
@@ -19,11 +19,11 @@ int iScreenMode = 0; /* 0 for Fullscreen */
#endif #endif
BOOL bScreenModeCmdLine = FALSE; BOOL bScreenModeCmdLine = FALSE;
int SCREEN_WIDTH; UINT16 SCREEN_WIDTH;
int SCREEN_HEIGHT; UINT16 SCREEN_HEIGHT;
int iScreenWidthOffset; INT16 iScreenWidthOffset;
int iScreenHeightOffset; INT16 iScreenHeightOffset;
BOOLEAN fDisplayOverheadMap; BOOLEAN fDisplayOverheadMap;
SaveLoadGame.cpp
+11 -4
View File
@@ -513,7 +513,7 @@ BOOLEAN SaveGame( UINT8 ubSaveGameID, STR16 pGameDesc )
HWFILE hFile=0; HWFILE hFile=0;
SAVED_GAME_HEADER SaveGameHeader; SAVED_GAME_HEADER SaveGameHeader;
CHAR8 zSaveGameName[ MAX_PATH ]; CHAR8 zSaveGameName[ MAX_PATH ];
UINT32 uiSizeOfGeneralInfo = sizeof( GENERAL_SAVE_INFO ); //UINT32 uiSizeOfGeneralInfo = sizeof( GENERAL_SAVE_INFO );
//UINT8 saveDir[100]; //UINT8 saveDir[100];
BOOLEAN fPausedStateBeforeSaving = gfGamePaused; BOOLEAN fPausedStateBeforeSaving = gfGamePaused;
BOOLEAN fLockPauseStateBeforeSaving = gfLockPauseState; BOOLEAN fLockPauseStateBeforeSaving = gfLockPauseState;
@@ -1454,7 +1454,7 @@ BOOLEAN LoadSavedGame( UINT8 ubSavedGameID )
INT16 sLoadSectorY; INT16 sLoadSectorY;
INT8 bLoadSectorZ; INT8 bLoadSectorZ;
CHAR8 zSaveGameName[ MAX_PATH ]; CHAR8 zSaveGameName[ MAX_PATH ];
UINT32 uiSizeOfGeneralInfo = sizeof( GENERAL_SAVE_INFO ); //UINT32 uiSizeOfGeneralInfo = sizeof( GENERAL_SAVE_INFO );
UINT32 uiRelStartPerc; UINT32 uiRelStartPerc;
UINT32 uiRelEndPerc; UINT32 uiRelEndPerc;
@@ -3594,7 +3594,7 @@ BOOLEAN SaveEmailToSavedGame( HWFILE hFile )
UINT32 uiNumOfEmails=0; UINT32 uiNumOfEmails=0;
UINT32 uiSizeOfEmails=0; UINT32 uiSizeOfEmails=0;
EmailPtr pEmail = pEmailList; EmailPtr pEmail = pEmailList;
EmailPtr pTempEmail = NULL; //EmailPtr pTempEmail = NULL;
UINT32 cnt; UINT32 cnt;
UINT32 uiStringLength=0; UINT32 uiStringLength=0;
UINT32 uiNumBytesWritten=0; UINT32 uiNumBytesWritten=0;
@@ -4281,7 +4281,11 @@ BOOLEAN LoadMercPathToSoldierStruct( HWFILE hFile, UINT8 ubID )
//Allocate memory for the new node //Allocate memory for the new node
pTemp = (PathStPtr) MemAlloc( sizeof( PathSt ) ); pTemp = (PathStPtr) MemAlloc( sizeof( PathSt ) );
if( pTemp == NULL ) if( pTemp == NULL )
{
pTempPath = MoveToBeginningOfPathList( pTempPath );
ClearStrategicPathList( pTempPath, -1 );
return( FALSE ); return( FALSE );
}
memset( pTemp, 0 , sizeof( PathSt ) ); memset( pTemp, 0 , sizeof( PathSt ) );
@@ -4289,6 +4293,9 @@ BOOLEAN LoadMercPathToSoldierStruct( HWFILE hFile, UINT8 ubID )
FileRead( hFile, pTemp, sizeof( PathSt ), &uiNumBytesRead ); FileRead( hFile, pTemp, sizeof( PathSt ), &uiNumBytesRead );
if( uiNumBytesRead != sizeof( PathSt ) ) if( uiNumBytesRead != sizeof( PathSt ) )
{ {
MemFree( pTemp);
pTempPath = MoveToBeginningOfPathList( pTempPath );
ClearStrategicPathList( pTempPath, -1 );
return(FALSE); return(FALSE);
} }
@@ -5109,7 +5116,7 @@ void GetBestPossibleSectorXYZValues( INT16 *psSectorX, INT16 *psSectorY, INT8 *p
INT16 sSoldierCnt; INT16 sSoldierCnt;
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier;
INT16 bLastTeamID; INT16 bLastTeamID;
INT8 bCount=0; //INT8 bCount=0;
BOOLEAN fFoundAMerc=FALSE; BOOLEAN fFoundAMerc=FALSE;
// Set locator to first merc // Set locator to first merc
SaveLoadScreen.cpp
+1 -1
View File
@@ -1813,7 +1813,7 @@ void SelectedSaveRegionMovementCallBack(MOUSE_REGION * pRegion, INT32 reason )
void InitSaveLoadScreenTextInputBoxes() void InitSaveLoadScreenTextInputBoxes()
{ {
UINT32 uiStartLoc=0; //UINT32 uiStartLoc=0;
UINT16 usPosY; UINT16 usPosY;
SAVED_GAME_HEADER SaveGameHeader; SAVED_GAME_HEADER SaveGameHeader;
ja2_2005Express.vcproj
+8
View File
@@ -255,6 +255,10 @@
RelativePath=".\Options Screen.cpp" RelativePath=".\Options Screen.cpp"
> >
</File> </File>
<File
RelativePath=".\profiler.cpp"
>
</File>
<File <File
RelativePath=".\SaveLoadGame.cpp" RelativePath=".\SaveLoadGame.cpp"
> >
@@ -377,6 +381,10 @@
RelativePath=".\Options Screen.h" RelativePath=".\Options Screen.h"
> >
</File> </File>
<File
RelativePath=".\profiler.h"
>
</File>
<File <File
RelativePath=".\SaveLoadGame.h" RelativePath=".\SaveLoadGame.h"
> >
local.h
+4 -4
View File
@@ -25,12 +25,12 @@
#define WINDOWED_MODE #define WINDOWED_MODE
#endif #endif
extern int SCREEN_WIDTH; extern UINT16 SCREEN_WIDTH;
extern int SCREEN_HEIGHT; extern UINT16 SCREEN_HEIGHT;
extern int iResolution; // Resolution id from the ini file extern int iResolution; // Resolution id from the ini file
extern int iScreenWidthOffset; extern INT16 iScreenWidthOffset;
extern int iScreenHeightOffset; extern INT16 iScreenHeightOffset;
extern BOOLEAN fDisplayOverheadMap; extern BOOLEAN fDisplayOverheadMap;