From 32f6cb949ef793b072a2920ac924d53c2d76c8af Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 7 Sep 2006 17:54:20 +0000 Subject: [PATCH] bugfix: Not all Face-Items (Goggles, NVGs, ...) are dropped, when "Drop all items" is selected git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@511 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 93184 -> 95744 bytes Strategic/Queen Command.cpp | 4 ++-- Tactical/Inventory Choosing.cpp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/JA2.suo b/JA2.suo index 633fff6c2bfff6561db6dea1fbd63d3c1352697f..292794c332766b2531d3665fc085c6a8b535facb 100644 GIT binary patch delta 3818 zcmbVPU2GiH6+UOYw%3m1e+PSG%p?%UNfWbc2Q~lf5+~T(jbpFfkUCE2#<3kYYwy+$ zR$|=P{5%jOz+_}Dyg(WO5+V;y7Rjpm8%9a8h2*>R39>^vuALHUyH2>63)ri&+4)WzM(yOzsUX+GDfxjde+ z7Ot18^R4We`gX7(7T~t*J1v~CFBQ7!AoZZv;X%Cxn`yTuJV}ZWWRM#6~EzdPujM z(emMHAun3s5-YZ_W@?gl(taIBeU5v^;DSjwbi2d)|HrAIqofxo!VnQSPGb86a3|?; zt%K+mP#?DQ!y6l1&lx&0z?7+|r@8MiFU(fFA*6nGh|kw_f^hnAjbQI3g@$oO@OE5z zJNR&uuc>*9Y>Wd90?r2Ao`$XpK-V$&WDsyd6B1Zs0{dvK0|ze8gi~*K@NJ!=Wy^9@ zE49|n0|x_VK_nl~NE(m%p>9(V@a`k>VIgT~toE^kEajYXumh#YH-=gE4Y{wy& zZLzJA?Vsj`aQ1X9(bbv0E}c-zL&BhHwx+*o-jdJD8q;G9+`t{M-Ba1gD3fO355z zM<_5W)f=5Wvca(g)lBBtrD4{h_o%GZPB4A?o2bj$v?(cecd$?ueLt2MR<3*<+><#S zMcDUGFY89=$r;{_pa&n@>3P_jkzgpyvS9_;y6~~YIZ9Af+GfZ3A#3KOYh^D8vJJ!- zk>J*5I)UvNijprIx?el3YMG`&gX(wf+@-fPy$7fsv%ziGaQQ!h;b&6jE+;uupV=^K zC0Rllr*o#$PyuJd&q}qQGS}_2zA)>o=;m%K z@>Pw!+}~0J?OUjeQX-kt~JD*<-jb(V2|NGngVwTYpBkZ{7W_6#=GsqJ{aV2>(&j=6wx$TM$XwFtcZdG<>P1Z zgRKz^`xwxqMvs7RL*UvzI;r2I=sAPZ!>-#0BpY?@y*M_S8k=>*l!ha?PU@UHgP61n omx*i(W1+nmE!9+fSurSIm7;Jv?!%~?rr43 zgg!bASrn8(-Ed55g{)6G&uDWku~nyy-40@S_91W?kDC zKhd}94_tL#hYKEcz_T#u$MGa`=oRjw7Kam`MkdrUp($8tLCG6vv9@IuDyd)GYjmxFU9bZH+}Wb3$Cr;VZ(=?48wk z#(otB((;IWOqBfzVo;Dn?QC|9#T5gh}l zmNTCPT5bS8HIghySp!<7QF!jAxZNCXb^&!w&Cgke;5YCG~J z3sfX}xwkCESDDQxn)`UglSLtR2Kj@uBURakX-Ck1;@= 1 && sSectorX <= 16 ); - Assert( sSectorY >= 1 && sSectorY <= 16 ); + //Assert( sSectorX >= 1 && sSectorX <= 16 ); + //Assert( sSectorY >= 1 && sSectorY <= 16 ); pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ]; ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites); diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 988b27eb..0274e21d 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -2139,13 +2139,17 @@ else if ( gGameSettings.fOptions[TOPTION_DROP_ALL] ) { + // WANNE - "Drop all" should mean "Drop all" + /* if ( Item[ pp->Inv[ i ].usItem ].usItemClass == IC_FACE ) { if( Random(100) < ubOtherDropRate ) // way too many gas masks, nvg and extended ears getting dropped! pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; } else - pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; + */ + + pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; } else {