From 005a4243140532fdd8c5d0a189b9a8c221defab0 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 9 Jun 2006 20:35:59 +0000
Subject: [PATCH] - 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
---
 GameVersion.cpp                  |  2 +-
 JA2.vcproj                       |  4 ++--
 Standard Gaming Platform/sgp.cpp | 26 +++++++++++++-------------
 Tactical/End Game.cpp            |  2 +-
 TacticalAI/Attacks.cpp           |  2 --
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index c92ff0a6..0ac25a98 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -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
diff --git a/JA2.vcproj b/JA2.vcproj
index cb4761fa..7f6dbe17 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -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\"
diff --git a/Standard Gaming Platform/sgp.cpp b/Standard Gaming Platform/sgp.cpp
index 58b056f9..23a6abb6 100644
--- a/Standard Gaming Platform/sgp.cpp	
+++ b/Standard Gaming Platform/sgp.cpp	
@@ -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
diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp
index e1faf0d5..618fe1b0 100644
--- a/Tactical/End Game.cpp	
+++ b/Tactical/End Game.cpp	
@@ -247,7 +247,7 @@ void DoneFadeOutKilledQueen( void )
 			// ON THE STRAGETY LAYER KILL BAD GUYS!
 			if ( !pTeamSoldier->bNeutral && (pTeamSoldier->bSide != gbPlayerNum ) )
 			{
-				ProcessQueenCmdImplicationsOfDeath( pSoldier );
+				ProcessQueenCmdImplicationsOfDeath( pTeamSoldier );
 			}
 		}
 	}
diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp
index 742ddeea..be6c2238 100644
--- a/TacticalAI/Attacks.cpp
+++ b/TacticalAI/Attacks.cpp
@@ -16,8 +16,6 @@
 	#include "Isometric Utils.h"
 #endif
 
-#define ATTACK_VALUE_MULTIPLIER_FOR_SMOKE_GRENADES 0.5
-
 extern INT16 DirIncrementer[8];
 
 //