From 860caec123c1bb38011cc5c495eb6c139fbc390d Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 19 Sep 2006 06:21:49 +0000
Subject: [PATCH] - Updated tooltip code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp             |   1 +
 GameSettings.h               |   2 ++
 GameVersion.cpp              |   4 ++--
 JA2.suo                      | Bin 197632 -> 197632 bytes
 Tactical/SoldierTooltips.cpp |   3 +--
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index a8e70096..147a0ff0 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -538,6 +538,7 @@ void LoadGameExternalOptions()
 	// ShadoWarrior: Tooltip changes (start)
 	gGameExternalOptions.ubSoldierTooltipDetailLevel		= iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2);
 
+	gGameExternalOptions.fEnableDynamicSoldierTooltips		= iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipLocation		= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipBrightness	= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS", TRUE);
 	gGameExternalOptions.fEnableSoldierTooltipRangeToTarget	= iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_RANGE_TO_TARGET", TRUE);
diff --git a/GameSettings.h b/GameSettings.h
index 152a8586..c5a615eb 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -143,6 +143,7 @@ typedef struct
 	BOOLEAN fSellAll;
 	INT16 iPriceModifier;
 
+	INT32 iMaxIMPMaleCharacters;
 	INT32 iMaxIMPCharacters;
 	INT32 iMinAttribute;
 	INT32 iMaxAttribute;
@@ -350,6 +351,7 @@ typedef struct
 	// ShadoWarrior: Tooltip changes (start)
 	UINT8 ubSoldierTooltipDetailLevel;
 
+	BOOLEAN fEnableDynamicSoldierTooltips;
 	BOOLEAN fEnableSoldierTooltipLocation;
 	BOOLEAN fEnableSoldierTooltipBrightness;
 	BOOLEAN fEnableSoldierTooltipRangeToTarget;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index ef91fddb..a5902e92 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.536" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.538" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.09.18" };
+INT8		czVersionNumber[16]	= { "Build 06.09.19" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.suo b/JA2.suo
index 1e933d5ee897ce0f69d4d9c8c4973493ba3864d0..745808afa804f50b8ccc177b2a1b87ee92bb668f 100644
GIT binary patch
delta 831
zcmZ8f&1(}u6n}5Bn{0G8ZIiA2t|`<Sa<E?_sKusjq>!RUL{AE}R4~|s#UR>hSv=HS
zEaD&oo@(?U=)rcth^GiKhk7taLD2pO_7JP~YkeDPl@9!7=l$mG`}obXGu+Pb*Ky`=
z27oQcaV&9)?br8^)uJZZItH#s3ag7>is&KAw$+qYM9p<naj&DB5Fpz9ml#K$HL+c#
z`5aaOAOZyGqKyEeCQzsA+ozC-1xli=s=?&MoQE`|U;=KaBUKMPCbSUe@;d=VIhf?u
zHuH~7hms<0b$K@_j}OFJD8bF$PI@&lnz(IEV@Uk4PK%-WZjr7{a&5P#D%WzRBO?(M
zcC2HzF_4W0vk@j%8oA<q69LA&YASKza_1T)TqXP@Y!H4Ewg~I)m+JcqhiqUVp1yBT
z^{>Y2#YSONtrff|@6KURHv7=f-@*_a6O*N*VrDZSmcy-TytwS)ZkILNC00Zg>7_H3
z;>$}VPU3>w*p3#e{E;6P*}|YKO`#@7E@7Aa9>=~)4!k3r!mxW|$v21{vRT9DB3}sm
zHz~k9it||d8IGXa_)C;wFXnT34Pz+BG_=ISYnuG!#j7&!!<hJL7}A)<sCf|*FaSLe
zhMUkW`)6_J1cd?^uk3ZO==p>+MUHcTfh&Z&GRITKd|%3NZJ+zbv>I_5dMVC;9Q9#>
zhHQe$?Uj$JF(PAryp@|b@P)_NORhWp=F%K9rsoPIb4~+dQ1pDT<hLitrQM0G?x2c=
zX#Zl=M!`z^NY-}o?ojdn1jD=B2crFQC525nwSZyN<In{sWvmJFa`2!lM-Rr%J+q@s
R24^sGKa#;*B*Q*W{{c8c5*`2m

delta 1002
zcmZ9KOH30%7{}+o-L@2VxAcWYrSzbt7}0`=sMR!xk6_dqACZF!1QU%U3ihBt2=RdR
zAW<hWiSd9vsEL}Wd#ESlqvZfG;i55W1g}PeiS;e6-!7oW+5C2AzHjEg^ZjS~Qc7P+
zx!oYSe2lSQhGCTPtx~ytK8*_X4(SK95AP1IY<@Wm8--ZE-X#x1_DPKC4GzPuLZc`x
zvzpkUVu7Ai2H>_afH5y6ONqtYqs_6qs8>uqACGHeszRgPEXfYDc6OXA?lOI~`;1LR
z8O2q?RI~(n-kVU0W+H#1Nnb)SNB)23IwacJGMRt(HS(-4YA>ebUVhTw4L|?n-^SOg
zRXiC;D4zf2^n5^(noI*sY@{L+cEUk8i2}k!6cR;*La2mBxQSxILwJc<odESqh&eif
z*N~p8rB_Soi1%*ngeJ8*^{&P}Ez1n@=`-<#0L}eI-|xf^;wLdh{3866V-n+69+v9C
zo2@|}&xQG`Y_t9%>j3W@tK+>>8lMP<^tRy%n<CR}_e_=3HYP{5^T&;AFN|gt^LR~b
zO#h}2EkCN%@QIwMT912tJiAGZbwL(e_8}@J8xW)82Va}pfS%c;Uz7lgXu$&46zQBI
zy+^_&VG9Pu4hgz^ks{|?@?yV?kXQ$#GY@3MAzFbwJeJ!idSo<+@CcpFxg)X&I&eq~
zy@e(QoQRQbiRg16E-n-!BH}Kb$P5+Wx~;&xIDa;tNh(OGwkozXW0V5k%;l@7gD)a6
zvdn6!HD8@Wv9C_C{wDJ7UF;}5?bf|J#*T}jIvl83QCrKRtdcFKr<Sc?t623yT3bn&
zrkm}_jT-Od{adf)vr?h?`;h3UM+iZYkg){qmM7zvpos7ige(&oe-kMm%u%-7nkznD
z!!z-I0A4CHdIxO?TXCr#JYKOmgK8K%#RCVb)y?c6Yhi8l?qp$MJVld896(WEwiL58
jr)dLiZ|<NDUCg_Ker>wW*`)CFqT+NUg-j$RJ@5Vv)Y>nC

diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp
index 0d60df6f..9e31467a 100644
--- a/Tactical/SoldierTooltips.cpp
+++ b/Tactical/SoldierTooltips.cpp
@@ -49,8 +49,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 		if ( gusSelectedSoldier != NOBODY )
 			iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10;
 
-		// WANNE NEW
-		//if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
+		if ( gGameExternalOptions.fEnableDynamicSoldierTooltips )
 		{
 			for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ )
 			{