From 99b30d0c182d5a2d4ef4a1e2336b33f260b0542d Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 21 Jan 2007 20:35:43 +0000 Subject: [PATCH] - bugfix: If queen retakes mine sector, player still gets income (money) from the mine although the "Daily Income" string on Strategic Screen is shown correctly. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@674 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Strategic/Strategic Mines.cpp | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/JA2.suo b/JA2.suo index a598e2ff271a8dd1e9791d531b9d1d938993ff9a..c28b44248f482010c7dff974cfc2113cbf34113e 100644 GIT binary patch delta 1823 zcmc&!c}!Gi5TD=Mx3~`;D=LVh$O>w$!J~+^F}B{tqc&^BqY+{djL~w5Yhx?XZLBSg zHqdU9Ni6UG;o`i#l{K5D1IXc3E$6Xs7k>nQDKtYE*fqAYWVag{3f%nY~ zTIW77>TF2^gu$?i&L*cCAjm=Jv2XBGlSd%qO$#duAU(rqF+N)dAps&^ov!`gHx@+4``Nq52#kWDUfx_%)+zxEc zPQvBDx7nk)-T`yqQ?Wb|C@+QX4^OGWC~m5Q$9hvorGvkS!D6n7$87dTVJg2Cfg@be z8>_5UZrs6s6RR|CaB8M?CJHGAM~%b*>p(JgfSY5WvmS>xu+5qmhqp~jdl9CCJwtKE zYH(o#_}Bq0S0(Fh)sMnkd3Pd(rCRvI$x^`xoMKRd6(4JcmJCV_{0*TuUnFHKCX{|AO`0 zQiTL7p$Rjy`1%$GV#I03XON;hI$||an?gMgo^Mq9{=23*#EVOI@Qy^p@%BeZ=f*1ZgrhU&dli#WCrL}I)l1c%74iNd zsf*Lki&$`2In-ZJ+9T?fCjKnq(ql?ocTvPs$5q)+>qVS&5^I47o0+AWOI-dVws6a3 zu`Q~#Th=JW9XutKOsPd*>-KGo1NvEmf5#l4f2gD_cQ6v1(=48n{1T6usSV?UC*&1M zufxEAkk^twRoc|6LjBW22|zrrZj}BeJeI}bNl&y$j=m-oGM`%hQ*l?uowzXHnRsEb(28*jnj=$nXlX!J6dRpT^!$3ZvpDU0$co0fCM31rGGj-{^I z3=Xj_WMOTxchd0CTv{ms|K^@(yYrg!Xttdl;>>$mkZqTYq!3$%&6YHcifFmy_R(5f z^3Z%L?9}DhDORw*3YmQO5h5`p6gxdsi8of3EaDCphj*1aw0o)XX+oSQ^d6c)@5+C^ zr18*9=|%y)WB23l$YG(#^bqyL;gaiRXBVW@9Qf*_60-a{-O zYeT9rM9yOcLm3Z{9q_nyqa=)|R1l{wrLoaTR3aez^wdRU7(@>Hv|YY$UkO6C9wI~t zG-cc0iWhz_exPlniC0=# zL~De-pJ2uFb&%=#I;W{@ssCwPB7<1g6*WsnlOxRQM4Krw|9DnPx-8123`!?t?Hlg@ gU#g(>GTgB=ji%EWkg9^UG%e-hly+Dt?b;dVU%F8~DF6Tf delta 1640 zcmY*YeNa?Y6u-Z>%esrZ50($Xb#*sCh;gWpG}I|Y%MVnV)ydRB1_`KCN)T)Y^Mje1 z(V3hCH$5|1%1r*@2npkoPo;FFWma)fNFf6)DhjKKurX!SpmX0^=AAk3-TONq_nh-P zw_>NYVyCsf$Y^t?+^E{~To48!M24^2xY!7zui3oKV1vrg@Pp-DYMyA4Hs1>GX6rWP zNWJf_RfQ#J7owdd)oWK{O@oRMFnCpUlrKYVh%o)c4(n(5?#5=q`+Uq4Z&|#@%EpgG z_1%i!rTE@W+=8lN<1xqFn!O&3^Q~#_HCl~q8uh?jCg3Y;@xbb2B>Mm8tqW!8mTpF_ zu?%@j@?GfnR^?B?b^6SJr<{K?e2?Y6RC7K5iY$%nXOW?07|~>)z+~Lkswd+W(3+`O zN&c}|L~Rz#rJv1cI&Q@}MT?00%$bT!MOz zVxMf%GOGTO`!_HNiS+gryiB`;uu;lMxU}^1CJ-Ll@3rxP0%sY&(~jjpd>CJU8Jj>20mg@~aC9Vu@pn2oK4&1E z_uezi8yz9QZ4d=|x(OoFP=`o4(~u_PX+j7s`&Pn1GlHD*?~RC}kAiUV#JEHFhN^22 zBULYv>m*l`c%D_Wq^iS~CGx~t@uu+b|1~PUf*ji2f)r{DqK9S&m_^SEFiGcpMCke8 zMOx#>ca+wEakT#;mPrR2ZE1yze0}UyJ)Vd1Y8`94&pc=#Muc5c<)y8**ZIm)Q6@Hs zjiQ|DZy-CIb5R>7rc&D=YAl(YR2l0xP->9%`W;u>`Huaq=%Ti*h^C^Q$|y-vAuYMg z3g)Nl@lp<2#C=*T3fb8$ie(7#DxZrOadXIW#tO+3Kz3xZu~gC9I5M2xOuZ*jkMx9X zIl)|tIu8pKbn-pSR2K~pk{{Mb=e}kI_iQ80f#D4KFCYV>^`P3~lX6yiyP4yixA?$>N|^7pxR!H)pEYX3gEG@{pA3h zpqc>Z_CX&zC0xZcP~tD_cWDr{w7nT-a&@7c4*kk%tqV^8lccZHpa>7SFCkeA)nY2V zPSs520UV|iwQwH)6Mlt41DI|};hCGxVv?_p+&AH&g1_*w_p5mmDXRm!D0QKdBnM$N zS?LRQfnWwQLBTJ_#pT|#fU8;}w!_PDP oq{V+EB`ZR{0lDh4hYjae4;yeS*$+|{C}}&=hM=VlDHkLD0RS}{mjD0& diff --git a/Strategic/Strategic Mines.cpp b/Strategic/Strategic Mines.cpp index ebcc5ad5..1784279f 100644 --- a/Strategic/Strategic Mines.cpp +++ b/Strategic/Strategic Mines.cpp @@ -624,10 +624,13 @@ INT32 MineAMine( INT8 bMineIndex ) { // we didn't want mines to run out without player ever even going to them, so now the queen doesn't reduce the // amount remaining until the mine has produced for the player first (so she'd have to capture it). + + // WANNE: We do not want to give money to the player, when the queen has captured the mine! if ( gMineStatus[ bMineIndex ].fMineHasProducedForPlayer ) { // don't actually give her money, just take production away - iAmtExtracted = ExtractOreFromMine( bMineIndex , GetCurrentWorkRateOfMineForEnemy( bMineIndex ) ); + //iAmtExtracted = ExtractOreFromMine( bMineIndex , GetCurrentWorkRateOfMineForEnemy( bMineIndex ) ); + iAmtExtracted = 0; } }