From 0c2dfc30f6d03bf08a697dc7442999c5ac18eebe Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 4 May 2006 15:01:32 +0000
Subject: [PATCH] Little Alien

- Deadlock delay adjustable in ja2.ini
- Sight Range adjustable in ja2.ini




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@55 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 NewGameSettings.cpp       | 3 ++-
 Tactical/Overhead Types.h | 2 +-
 TacticalAI/AIMain.cpp     | 5 ++++-
 Utils/Sound Control.cpp   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NewGameSettings.cpp b/NewGameSettings.cpp
index 560543f4..cbe27cd8 100644
--- a/NewGameSettings.cpp
+++ b/NewGameSettings.cpp
@@ -106,8 +106,9 @@ TSetting gpSettings[] =
 	// Maximal search distance for grenades
 	//{"MaxTossSearchDist", SET_TACTICAL_AI, &guiMaxTossSearchDist, VT_UINT32},
 
+	// System settings
 	//{"fEnableEmergencyButton_NumLock_ToSkipStrategicEvents", SET_SPECIAL, &gfEnableEmergencyButton_SkipStrategicEvents, VT_BOOLEAN},
-
+	{"DeadLockDelay", SET_SPECIAL, &gubDeadLockDelay, VT_UINT8},
 
 
 	// Rain settings
diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h
index 68e841f5..0116fb55 100644
--- a/Tactical/Overhead Types.h	
+++ b/Tactical/Overhead Types.h	
@@ -186,7 +186,7 @@ enum
 
 
 // CHANGE THIS VALUE TO AFFECT TOTAL SIGHT RANGE
-#define STRAIGHT_RANGE	13
+#define STRAIGHT_RANGE	ubStraightSightRange
 
 // CHANGE THESE VALUES TO ADJUST VARIOUS FOV ANGLES
 #define STRAIGHT_RATIO	1 //* 1.5
diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp
index de696948..cd537244 100644
--- a/TacticalAI/AIMain.cpp
+++ b/TacticalAI/AIMain.cpp
@@ -61,7 +61,10 @@ UINT8 gubAICounter;
 // lots of other stuff, I think
 //
 
-#define DEADLOCK_DELAY							10000 //Madd - let's see what this does -- orig: 15000
+extern UINT8 gubDeadLockDelay;
+
+//#define DEADLOCK_DELAY							10000 //Madd - let's see what this does -- orig: 15000
+#define DEADLOCK_DELAY							( gubDeadLockDelay * 1000 )
 
 // Very representing if this computer is the host, therefore controlling the ai
 extern	BYTE			gfAmIHost;
diff --git a/Utils/Sound Control.cpp b/Utils/Sound Control.cpp
index da61cb33..76b3e30f 100644
--- a/Utils/Sound Control.cpp	
+++ b/Utils/Sound Control.cpp	
@@ -548,7 +548,7 @@ UINT32 PlayJA2Ambient( UINT32 usNum, UINT32 ubVolume, UINT32 ubLoops)
 
 UINT32 PlayJA2AmbientRandom( UINT32 usNum, UINT32 uiTimeMin, UINT32 uiTimeMax)
 {
-RANDOMPARMS rpParms;
+	RANDOMPARMS rpParms;
 
 	memset(&rpParms, 0xff, sizeof(RANDOMPARMS));