From 344eb9498c55ac9e0fecd12f5ce89e6a497cab0e Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 27 Mar 2007 17:29:49 +0000
Subject: [PATCH] - Separated the ammo types from the interface from the file
 infobox.sti. This is needed, because different interfaces should not depend
 on the ammo types. Ammo types should ship with the MOD and not with the
 interfacec! The ammo types are still in the infobox.sti. The interface is in
 the new file infobox_interface.sti The file infobox.sti still contains the
 interface graphic, but does not use it anymore. Older builds will use the
 interface graphic. But we should never delete the interface graphic from
 infobox.sti, otherwise the ammo graphics offset are wrong!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@800 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                      | Bin 197632 -> 197632 bytes
 Tactical/Interface Items.cpp |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/JA2.suo b/JA2.suo
index 7ccb30ec9f7f44f515181d156a49cf8bba3b9fa4..6a35062b0a99bd9ccc04cf7c8d13eeab7ccecce3 100644
GIT binary patch
delta 1709
zcmeHH-A`Oa6hFV&1@?;z%PvqG3JVlmi6zydLDG~D+oBZ%rLBoVL$Q#y_G8x-6jnpQ
z#>hiWpaV`HkSNhU7+M?GxELSAbScIs;s-%Z6HGS72Te94L~CQ$Gj}5&P5cj>o8R1f
z&iv+_Gv}PSgTt=DVb}G&!tNoWyUAp7n|xXnr4_K`h`cE7z<9SZXJ9Ni4-2aX--v{*
zH-U^uefk9fn^GAlio|VW7SVu6*fk6|rNt<=J2QzMWaLS=;gNO5jP+0+ksOk_(w$XN
zCJi>$M4c3*9t!ZxYc8ISuy~5j&`Vk&o3pk+M*6c}wWcRnaUxs(<rxswkYR5a-pH!g
zX*uW?M1rA1xAHrUk<M^3Yz#ZY!O-h2erGZaMiwKR;br77JPggrjl8#|1Eax~sjbFT
zjhOQ1e7w8Q5SKC{;R8qdy=LJ1sEec2frrdEhgNdspErI%yDXk-l(ASINd6SNAwvt*
za^P=6F8c~2T{kBllds1bRIn8ftKZ|;BS+@aF{8Jv>vWEJ>%Q^Jc;Zum3E=K%XQ`Y$
z?$aMd<IAXFN}suDWDH&vSVDm|l-5U&Q%&>>E5^qm6g-eBk&grF*axCqZGA_$K=*1-
zPQaxmr-WAp^YOI`UJ?6M%SZe*`=O|aUYx{Krn{8`s;9I31n4mJQ&81T<AT}?gv>*h
zsvm)JbquJIBd4v7c4l?baZb+Li>S6e2O^Ct*N}&8x)<zzwz!MoH6>lw+iTK!KHR98
z1I_%yL1c0AqRAwd3`Uif(iT}ASH+9)c+7Tbr;bzXwv&Z=dQuL}<*P0$+STkdCUJ)I
zRT^!bK?$NI^YGi$NEQ6*S}qe3uW=T~K7rTKYiFB0dhIIvD(cR6a~HO8Yc|vK^a6F8
zhuT4VsF&qNp3iMg3^R^WC7s}&=;TCobB}Q6F@ki6)1f=X$MDlDZ0RI(Le#-}A63u;
z8#qi!4em#Yidtuoi2)9PhibcuM%n7GyyPELburv=_^odV_K{2$savZkRG%lfd^;8p
zvha#pTt!)QegWIDPAoQwQO`G<v?VER$G0fhz%5M~W$v_U{vJJiY4d5#<#uybOh5*G
zP3p5aezU*K*P@G$9#Dy89NkPWOSw25$NL*xl&6gBhV<=kQqL~oqME!ca@6f*99Fe)
zq}!q}4|u;O7Vr&k*+Bibcqadu>_;Bm6rew4dm75UgzwfWog(kNmn=v(o*viRl9sR9
zlNRn<%Fur$9&F_2TWGv5jiA-KwwrtvYG1#qFJlO==lcJm;J=Hq)-}!szDzy*1n8VP
bXdpjT{D%^JJD>UinQtzvAiA(3cDnxocMSM@

delta 2239
zcmds&e@t6d6vxkbEk6pSjJ80BWfX7-C<Z7-7;K{mOqXp@;t<V@Fqq;t1<Q;M2tQn+
z#1X@CVK+uJgv9+ZhLTh*YGSJ6M>H;327@eSn_Cv6#$|*_Tr^U@uSK9VqJR5dKE3zd
zcg}t1o?q?g(sy*}M@ki)m53I-Uawi~R+2&@@RaC!N%?~fBlQQfu2)U621^}px|+2U
z%;_#i=rM&uqzvOE*NyOAjq(|}n)O}Gp+aLw)?L#R-4{g^Ct?gHQEV91-i{*@og!Am
zL}!}q25h#AYN(NpPy>F6?4ml_Vzfh#_G0mQI!sOKvg>Gci#9Y&A<~44-%V}G84}Ir
zW;VGN%#oUQ)no-P)lrKv1cWX<hhx-%2oMSMAPN{jG}r)QfDxF08N`A(5DzS1BS-*u
z0V_xZn?Mq<DU?FVn52MIa5vZt(!f1HH7djPnB^HBOfU>)8VA!AF_)ls>5C2<l)(^J
z^Ul3T{k|xpIviQ`h12JY&iPnz=j;!nc-$jyjFp^Zwh8C?e9`u&L40r9<f@zKFX-FP
zl@KVAqs$M>j*Ci~Ow+O%OE$#nRdID}hwSNPvmCn2R;;ktI-V-4hB@sMh5I?`M||lg
z@H1FEQS*eX)^eWcIi!`ZY1!zTd^^TYw@1speOxWs#6r%+^G;d)KE9RkuChUDP296;
zt-hc2a{i8DmW}cJjch!nl*>my#LRPA$#i$W$AeKKEy|!V63Ojn_?Wo<cATsn=hxM9
zFv+$l-k1YRVNnRNI@AF~gFKo~8A<8&!q4iudUX{l)`23$DsL@t?5PhpPJH=GncRAt
zTV>}3Znk<fANzF>mmr<vzw&7}Pw*o;Y0Khp*_a0>7Jtsq_Fdy7d3B0AR`e0mwfgRs
zY0l;q5rjNQWb$Hw2r?o_#5Bw4oUv?Zda#J95~fxKDP)nhSss$nm-vWGp5`r@oLsx~
z40FD&9%4^{M77@Ty&ux~AYN6&b#5rnc<YPdD}RrwXO}cw-i%I0p)P%cXd4S#`7YUa
znY(32BeF*~&6POklKYYOY9mmuuEGk-Kv9K7b^nad<8u3NtTUl3f<)l$8F_Pxotft}
zW&WU`aMp^goRz3@*^akl_A8v}vm;|!8zr}%c9oo)=Sf-p6&I_D74qf`NBGQZ4@e;Y
z308kMkC9}k_LbfD;FNnTt7WcG3pps4%BhSVq&)oQP!^T==61|-aF<dxW)9yw2WHv0
z9YC}#8rxf`h<2mko2V9>sJ-q0=G&;19-=L@j~>VK3uue`@a)9g-yE9$sV2~*R?H1P
zl95};4s#v!0B)EevuF7oaXvE6=bI;yMR@@=hK9G^e*gLS;?Uye#C6Xq&PJyCBfFeo
z0lp7D%t!8#OI*MwNBt>Lk&=@eU^|-hTHD<X-|-0hqHjb0Ui*4=WCzsU3t87d`{^JY
zUn>`<`017GNk;EqPyhd3J+^<V9<}bi4lAXX@n=>myD#u_wt(;iwBn`yp*9Cyxi8UQ
i^eY`eM_SeM<q0G2P<ygL)-15|jmdd-PtGd^F@FJh_!Xc4

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 67d876e1..86bd467d 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -2422,6 +2422,8 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
 		FilenameForBPP("INTERFACE\\infobox.sti", (STR)ubString);
 		 sForeColour = ITEMDESC_AMMO_FORE;
 
+		// TODO: WANNE: Make own sti for the ammo types and an own for the interface
+		// For now, they are together in interface\infobox.sti
 		giItemDescAmmoButtonImages	= LoadButtonImage(ubString,AmmoTypes[pObject->ubGunAmmoType].grayed,AmmoTypes[pObject->ubGunAmmoType].offNormal,-1,AmmoTypes[pObject->ubGunAmmoType].onNormal,-1 );
 
 		//switch( pObject->ubGunAmmoType )
@@ -2566,7 +2568,7 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
 
 	// Load graphic
 	VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
-	strcpy( VObjectDesc.ImageFile, "INTERFACE\\infobox.sti" );
+	strcpy( VObjectDesc.ImageFile, "INTERFACE\\infobox_interface.sti" );
 	CHECKF( AddVideoObject( &VObjectDesc, &guiItemDescBox) );