- bug fix: CTD in endgame when killing Deidrana

- disabled code for CD-ROM check (game was killed every time when USB-Stick was removed)







git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-06-09 20:35:59 +00:00
parent df685592e0
commit 005a424314
5 changed files with 17 additions and 19 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.212" };
INT16 zVersionLabel[256] = { L"Release v1.13.215" };
#endif
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.208_2006_06_07.exe"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.215_2006_06_07.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.208_2006_06_07.exe"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.215_2006_06_07.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
+13 -13
View File
@@ -383,20 +383,20 @@ INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LP
#if defined( JA2 )
case WM_DEVICECHANGE:
{
DEV_BROADCAST_HDR *pHeader = (DEV_BROADCAST_HDR *)lParam;
//DEV_BROADCAST_HDR *pHeader = (DEV_BROADCAST_HDR *)lParam;
//if a device has been removed
if( wParam == DBT_DEVICEREMOVECOMPLETE )
{
//if its a disk
if( pHeader->dbch_devicetype == DBT_DEVTYP_VOLUME )
{
//check to see if the play cd is still in the cdrom
if( !CheckIfGameCdromIsInCDromDrive() )
{
}
}
}
////if a device has been removed
//if( wParam == DBT_DEVICEREMOVECOMPLETE )
//{
// //if its a disk
// if( pHeader->dbch_devicetype == DBT_DEVTYP_VOLUME )
// {
// //check to see if the play cd is still in the cdrom
// if( !CheckIfGameCdromIsInCDromDrive() )
// {
// }
// }
//}
}
break;
#endif
+1 -1
View File
@@ -247,7 +247,7 @@ void DoneFadeOutKilledQueen( void )
// ON THE STRAGETY LAYER KILL BAD GUYS!
if ( !pTeamSoldier->bNeutral && (pTeamSoldier->bSide != gbPlayerNum ) )
{
ProcessQueenCmdImplicationsOfDeath( pSoldier );
ProcessQueenCmdImplicationsOfDeath( pTeamSoldier );
}
}
}
-2
View File
@@ -16,8 +16,6 @@
#include "Isometric Utils.h"
#endif
#define ATTACK_VALUE_MULTIPLIER_FOR_SMOKE_GRENADES 0.5
extern INT16 DirIncrementer[8];
//