From ac117f7143f134c8a7aa424f3d1c32a884aa61f7 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 12 Nov 2006 17:36:50 +0000 Subject: [PATCH] - bugfix: CTD after talking to Darren in San Mona (in the boxing club) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@630 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Boxing.cpp | 13 +++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/JA2.suo b/JA2.suo index 94cf2ade6ccdd58239846ce698bca6f3066878ee..127fb8e8494b22a9d9413aaabe359c80509ec5ca 100644 GIT binary patch delta 1871 zcmb7FZ%mbC6n}p2d%2)o?!CYTZ-9V!HG{2F+X57nbZ%g<)R;rktPgF@@u9gTo#%pJZhh$8&V8TrJLfsi zdC&Qs=lUBh{zl8`DwE~Kp<%!I5_BO%S75hkttljym-A`PNkj*R!^-stSQ!|feB}Bt zmsvR{=(54mVE&MoMQwqHmN3|a0EB2~>0~L8k=E!L)r{7&2&KtP>u%Gp9ACaKW8^h! z>bw&wwpVNwHKI;b^REymEc~;P)$O8E>{NiX+ni}9qIg-zp4)<^ZM>>fMit-{QOe#b zK&^rTrM6;Ddp55lSXAaJZ8;X@vxH9qQ(#@R&!QB^6Q1T+O^8q-A4Yp*PqaJ4&Nh?W z?YJy+A{NWK7@sBbsW5@D7?);>;%zd)>2z6nVPmngM6x{M1ETruV2PR313u^1I1^Xz z*6xP}8a$;9D3a)1Eqi)m>GV0cC|)(Mbxzrb|cn}Fq4tJ6mNQst^+91$|DsqR*!lwp)4CJq}ybn(-cT;y362CON+X@vOyj+Xp!!QlGAeGO40NY2xM8FlH&oy3 zG?oqrZN83zpevrG?rtQ~=AUtsYWlSK%2dWVD^$yctXbg2Ui!{~81iKxs`)EesrWoz zV+J|s)bkUu3Z;8^1+DxEtu$=bW`if?`s7lSD{lltG~laHRmh|MjQiGAFp zTu~-U#4b9B_+ly+8+h&I$ZPnPDPT=q zSAtu#QRK1J$66L^`E1YU1{O1_{BqbcS){S#vHf+%AMXgp%lKD7jyLr@l`Z4y-pk_; zt7Q)QxY4z=e-v5AQ#0wycpib_INTxsC>Q0y1#J~QiboFJJ`ayRpnpc`7cfuD26car zetPQ#BusamxcHeZm*K>$iS{#Bey60{%;Ty{2&ck9Ce0?Y-^HKQ)(R*6(K*Q%>KkHe zwO>IlsNy%w;M;(ilAvp16)BE|KQTGe1VFs<`it_0u!p=ik))W_Ht41GKcY1xpFb@} zId7qL1K_(mm=j#&A4WT!*`qnIfxdVH(JGC?37^CXA4kx~R?d8@;xbk8*zzCAbS&!o oVQOCf7d0y|RYT+65HPX}cS-EWGKnV@Ou8PKt;@7`KMY{emrl@30 zS<=4nby*u`+8^`px_t~*UQJ}taF{~j9HUmtrpt89H7n^o7jVsWw)ec}Jl}iX|M#nF z(CQkrQ|ndj&hCd>%v~@EAuCX28#l)yB?OJ5w}F-sY{qSt6O=0-kl zXbn8jB4C36gjmVQCMH#nwmKqTpDe^0CZD|Nnbz&@j!t4yV_3h4XeO}8<-5=}I)W<{u z!?7MkeJB%@;Brlo2OBH2GetASFgcif z*RqrYDHR(yq*76>Z|a?`@A${654jTq6_rrMTAP3vrun2 z`b0=VNIsXcY|xFrGq56$79}cn%2|LWYHC3}HF*>_xuZ~L+~0`{ie*XU=sU@s#_3%M zhb4CmlRQjfpMaXKD1O?Pp=c0vWe-MZ&O*g*T-yVui7J<~iH28r`=cJWjhlP1NTnHT z`M&B67OHE+1kk?qe9YO8!HIOa6>jphBEeK63TW3X#E&PxB5WhKdnJv0fvNO+E8dq` z9A6aKipdgI!B6jQR;8d!V9^}^F%Ra?SzAh&yK%a zaCKa6z%h?KSkHl#@;_-c2ksSX$UdT!Q`ZT$r5m_T@t2@c@d*?*_n2bn$xhs-mff&R zXt{LSLKjaXNy&xYaxISrzQLi1S>h!&Epq&Wx&QzG diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp index 9c2f2b2d..914be127 100644 --- a/Tactical/Boxing.cpp +++ b/Tactical/Boxing.cpp @@ -300,10 +300,15 @@ BOOLEAN CheckOnBoxers( void ) for( uiLoop = 0; uiLoop < NUM_BOXERS; uiLoop++ ) { ubID = WhoIsThere2( gsBoxerGridNo[ uiLoop ], 0 ); - if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT ) - { - // no weapon so this guy is a boxer - gubBoxerID[ uiLoop ] = ubID; + + // WANNE: Safty check! + if (ubID < TOTAL_SOLDIERS) + { + if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT ) + { + // no weapon so this guy is a boxer + gubBoxerID[ uiLoop ] = ubID; + } } } }