From f205c1f6205c613b5657bc8fb22aea837df01906 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 3 Sep 2006 19:03:10 +0000
Subject: [PATCH] bugfix: Jeep & Eldorado have the same animation like the
 Hummer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                        | Bin 84480 -> 93184 bytes
 Tactical/Animation Control.cpp |  12 ++++++------
 Tactical/Map Information.cpp   |   2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 052fcd3b9a94e056ab33582fbc2eff9298533c56..633fff6c2bfff6561db6dea1fbd63d3c1352697f 100644
GIT binary patch
delta 4643
zcmeHLO>7%g5T04D|7v45e~oL2bo0}uDN0BhCu$%9n*;)BT7mj=2wdFQZG%h`rKOZ$
zY7<oz0tr!G%Occ65Znk-VJig*i6)X04*V7&Q3(l!8#fLJ4v`x3y=RivO4uq=U2({B
zzRm3H`t8iT@6F6Qd(oM_;k=U40}Jmp9(wcpd3F%d%!D<rf5i?avU*)tUD{N)wdnV7
z&_@j2OTc-6MOmQ2dsrii1DZS&(ZI{PZwrxlO;m{=1G_4H0ZceRaT=vlG=d|MPt*oO
z-9A6WLr@M=icU&(ISvPL=a5nkK}t!roZxXv;66FQm{eJb;M=-u3Zi?nSgbg!?O|)Y
z^1P#oVaQTGpLgKD4mbf9;08Q^7uW<WSsePAKMS8})n?q*c>n2mP?KtWH4o27Bk{rP
zRx31hB=pYQlVTvZi^=@L#q|i!bAspkL@pQRWob*{VzU_gVUIX_Gawd>8Y?k>xy$-J
z7h>^NvOy%~Dmg8`cxjR!Qc|=3CLT6{hkXc`evQ*!`TUP?wsaxBO<Xx*@Y1L82ieTF
zbIYZxTzAWcGjb|EIDJj$SvGetM_8%MXq3y%PG+MF(@>ZWAY?BhXhW1VA9ZugJL4s~
z4tUh!&BEEA0JV7Dd3g6VuvJ}?6S#pgc@{);=suthz%b(h?lA|w9GV{V@ZV+JIsHtS
zf2p6&Mmg&-qdok&ndsxoRo{LbDgWckPkxoe`OZUh1E^H<`=LSP=zewf7oM938swSb
z#9cuEe`+kxLcP=qGPIfBxHw{_na{ne^BbnF^Mo`NBPAna8nx^<CtX~F8Oh2w#khlB
zh1j;6sG80>F7hTkF27A9d4n9UKfD;2>|PAOAaYA;Vm!^lcw&Il=5M`RA){IYIUeLb
z73R!7#cG3|q7!sfQS$|8B%w#3X+g|K@k!(J%Cg-QqYmn!PHLvds2y?_qzF8UP#dH!
zXglFyGp@BmlGk_R(*wkmRB)m_(jlj)rfZJ*f+vQ(Cx`7kc_ef9ZIoeNF|O9mIF0tR
zopt4z7@|2$x5w5%JY}TgC5-Zl2iql6>g-%V+FHK{J&Gl#us27L=Ss<zVy4vFdt$K2
z{y9*crhdh^7CNnXEUkQ=6#MsPPS7zVl{k(`l1q^U{fDtgN#yYsI$k=;7f97upnQWy
za<j^@*5>VB|B~DyRjGU^Ce?O(5AKkDWNJ^Tx|jrs3?vDecJ2kCR;QmG_MYswUyIeA
zjDbsXgC|S4F^bos(cXgr7Na|5DVW{NRj9=V#0wFAHgf>m<2dY0U`M3XE;v>~n+x@8
zC9&?*%=g{wt6W{Wy4k$$=aZsU*SnmmYlDSy+?JMW>@$J?j+vk@BTJv`%SxKQVDo=e
z?23(&t=gfx(pD64W20oR(RAFq47*XX*XXzH`@oHoy}mbwjgtMpE7>CY09p*OH`ny<
gdnSH(2p`>t?n1u6%ig+luav4?Fc<usC_W7S1C8HG2mk;8

delta 605
zcmXw1O=uHA6n<Z_`PsN^HcgdSX<XwEQl(ULX`$G({*Z(sN-ETPX>2@*p$Tab8l^@N
zkJ5IOcM*w*HxJb<<Rs*hN)Lh*4}u=Nc=sS4itReH#DRJ9e!h9{&HJYDHPCn#STAel
zFYCkaFP}EyC!+QPr>=d3-*sK*LU1GK`#a|B7-2+-02!AnpoEB-as7Kg(NDSk$`ToK
zNh=(Xp@(9>*fs}_7fcD9q#{*mkt$LW6$~k^N%J<9X+b%J6-}Hf^hk9|BImr&oYcxH
zs1jVHl0>TnHRW<j(G@MYCwmEz*oiOuG;->_Py7x}xNzKqOGCbifK$)kEn0i>5&yST
z-S=<n2~q3JifTvWwJcI^5`d_E9u~{Hrubneozmuu5%KiaF&+hacuGTxw}C-!q@}1#
z!xr<MATMf|<e`*ASRo|6Y#wwYi^s;UEc8e=stU8=!~MW(WxXpdfY-CQ%tju=>W-Xt
z`S~i+t+s|XI2A`P+ecvV%RG{*w(a!@;??swBUbKcY~>K)ObD5M9tR{RL&P_(qwkPz
zG)HwqF%(iGCLh_jM`=1s<7)#MzG-5DXLKZ5GhzIRVWf4n58sYPnz{lLHTBl)7;Hqg
sx{j@`qjmZm8ezU-;UuQ{RX=ivb2RS}GAP-qdaO3OKSP}{9>0XjKiUST;Q#;t

diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp
index b6918964..54219f27 100644
--- a/Tactical/Animation Control.cpp	
+++ b/Tactical/Animation Control.cpp	
@@ -2989,9 +2989,9 @@ void	InitAnimationSurfacesPerBodytype( )
 	gubAnimSurfaceCorpseID[ TANK_NE ][ STANDING ]																= TANK2_DEAD;
 	
 	// ELDORADO
-	gubAnimSurfaceIndex[ ELDORADO ][ STANDING ]																	= HUMVEE_BASIC;
-	gubAnimSurfaceIndex[ ELDORADO ][ WALKING ]																	= HUMVEE_BASIC;
-	gubAnimSurfaceIndex[ ELDORADO ][ VEHICLE_DIE ]															= HUMVEE_DIE;
+	gubAnimSurfaceIndex[ ELDORADO ][ STANDING ]																	= ELDORADO_BASIC;
+	gubAnimSurfaceIndex[ ELDORADO ][ WALKING ]																	= ELDORADO_BASIC;
+	gubAnimSurfaceIndex[ ELDORADO ][ VEHICLE_DIE ]															= ELDORADO_DIE;
  
 	// ICECREAMTRUCK
 	gubAnimSurfaceIndex[ ICECREAMTRUCK ][ STANDING ]														= ICECREAMTRUCK_BASIC;
@@ -3000,9 +3000,9 @@ void	InitAnimationSurfacesPerBodytype( )
 	gubAnimSurfaceCorpseID[ ICECREAMTRUCK ][ STANDING ]											  	= ICECREAM_DEAD;
 
 	// JEEP
-	gubAnimSurfaceIndex[ JEEP ][ STANDING ]																			= HUMVEE_BASIC;
-	gubAnimSurfaceIndex[ JEEP ][ WALKING ]																			= HUMVEE_BASIC;
-	gubAnimSurfaceIndex[ JEEP ][ VEHICLE_DIE ]																	= HUMVEE_DIE;
+	gubAnimSurfaceIndex[ JEEP ][ STANDING ]																			= JEEP_BASIC;
+	gubAnimSurfaceIndex[ JEEP ][ WALKING ]																			= JEEP_BASIC;
+	gubAnimSurfaceIndex[ JEEP ][ VEHICLE_DIE ]																	= JEEP_DIE;
 }
 
 BOOLEAN LoadAnimationStateInstructions( )
diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp
index 7cd983a0..a57777d0 100644
--- a/Tactical/Map Information.cpp	
+++ b/Tactical/Map Information.cpp	
@@ -606,7 +606,7 @@ void ValidateAndUpdateMapVersionIfNecessary()
 	else if( gMapInformation.ubMapVersion > MINOR_MAP_VERSION )
 	{
 		//we may have a problem...
-		AssertMsg( 0, "Map version is greater than the current version (old ja2.exe?)" );
+		//AssertMsg( 0, "Map version is greater than the current version (old ja2.exe?)" );
 	}
 	AutoCalculateItemNoOverwriteStatus() ;
 }