From 2169585abbce480b69adf8bfe94327b6fef19b47 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 28 Sep 2006 15:23:45 +0000 Subject: [PATCH] - bugfix: Removed the serious bug that was added in exe build 568 - feature: Re-enabled auto save (USE_AUTO_SAVE in ja2_options.ini) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@576 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 6 ++---- GameVersion.cpp | 4 ++-- JA2.suo | Bin 197632 -> 197632 bytes TileEngine/worldman.cpp | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 32a0731ed..63c474ed4 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -366,7 +366,7 @@ void LoadGameExternalOptions() gGameExternalOptions.ubBreathGainReductionPerRainIntensity = iniReader.ReadFloat("JA2 Rain Settings","BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY",25); // Thunder settings - gGameExternalOptions.gfAllowLightning = iniReader.ReadBoolean("JA2 Thunder Settings","ALLOW_LIGHTNING",0); + gGameExternalOptions.gfAllowLightning = iniReader.ReadBoolean("JA2 Thunder Settings","ALLOW_LIGHTNING",TRUE); gGameExternalOptions.guiMinLightningInterval = iniReader.ReadInteger("JA2 Thunder Settings","MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS",5); gGameExternalOptions.guiMaxLightningInterval = iniReader.ReadInteger("JA2 Thunder Settings","MAX_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS",15); gGameExternalOptions.guiMinDLInterval = iniReader.ReadInteger("JA2 Thunder Settings","MIN_INTERVAL_BETWEEN_LIGHTNING_AND_THUNDERCLAPS_IN_SECONDS",1); @@ -472,11 +472,9 @@ void LoadGameExternalOptions() // WANNE: Drop Items gGameExternalOptions.ubEnemiesItemDrop = iniReader.ReadInteger("JA2 Gameplay Settings","ENEMIES_ITEM_DROP", 0); - // WANNE: Auto save: I did not set USE_AUTO_SAVE in the ja2_options.ini, because - // the game always crashes after a "normal" savegame is loaded after loading an autosave + // WANNE: Auto save: Attention: The game always crashes after a "normal" savegame is loaded after loading an autosave // So for now USE_AUTO_SAVE is always false. // The game crashes when removing mouse region that are not set - // After we fix that bug, we can make the entry USE_AUTO_SAVE in the ja2_options.ini gGameExternalOptions.gfUseAutoSave = iniReader.ReadBoolean("JA2 Gameplay Settings","USE_AUTO_SAVE",FALSE); // Militia settings diff --git a/GameVersion.cpp b/GameVersion.cpp index 9be15a91b..c8442896a 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.568" }; + INT16 zVersionLabel[256] = { L"Release v1.13.575" }; #endif -INT8 czVersionNumber[16] = { "Build 06.09.26" }; +INT8 czVersionNumber[16] = { "Build 06.09.28" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.suo b/JA2.suo index 50a5ed8c8f004ab539167f78e950c80359a439cd..b4e5faa162f17003e40a65ff8a96bf073dcebb81 100644 GIT binary patch delta 2487 zcmcgsYfMyE5I%GFP46!2?y@Y1xKK(dD6g0nEH(xoZ3)8qs`wVg29e@w*B269ZBhte zL{8ZONg88Js;OydugUsPqiC9%HpX9Vq88hvq1B|Mp!HGN&bhn5%36~C=}qRIbLPx^ z=bJfm#@{0QTjailk|~8THW~_r9DIp1Qx`|88Ol!SDOlXi7cJ9%xds|iF~8EN?F6kb zRIK{*QVx*PMY5bNX4}{VPatqDsg<1eCVl`wZ0CowLQWL+C7|)=&nM6=l z8S@dFM}8@ynb7*|9$Bm$(YDev;1BH;yx*SBeGWg^`2$A+y*;REherRLgz zM%EI|_~@v(@7qd#rEFg3^?q4Yjx~By8M!Xc;Ya#QyWFscF1JaX6abh@^L=8D1Lq+f zS04fk@3{Jo#m}A*w<820NTMu(%hXD%Hj+>H?9DUbBU~cEDy;~CpV?djqhD1|2lO|? zV)V=cEAQB@#eG`HrYO=eMGMJzNelDwv<@<`MhCYreHP?ngC0uov=&m(y%uuCvPi_9 z3H3xOCr3xe(O0AX6WJZjcR9gm!qn&SS|CwY<&K_@bL-MOqb&<3k;e>d2ylP@ip(+b6a_j|zX2w$VHFo?^d zuL5}Lt#WAMcY6}hucyMPJW33yNF4Ed)rL?{rSSoEiw3j~!dhN<(`IN2Hxf$GB^){d z3-CZUnA2XCnA$7}wQu`8>6`j_QuIl4fcpo_@j*8<+841s)GiyS<+z!L?IwJ$ijFV(H2LSBiz$H44!i54fCTo)aNTESW+aF2~g;V1u}0Bi?I;2FgiUn847_ z5s)we*Kv^Tsj(*pl}@MyJk$*)_srPsi31t)sKDkWYL^!sd>gCAv@MW?7dce%zCUxv z$t0@@D-E=Q%bpO68l*6b!R?IQi9T=Pcpw%HJskDU@(T(@8IJdj#Hk@%&*vyii%Pc( z;?rDHyZ*;otxj$Wce12d*r4HeSOa4Q$uBUt(hgOTOPC(J9i5aCk(A%U^*H;vRHRJp zSfplCSI#Qg@^Ja@?gG1gMywaM4Z^SZKiAK?a0$9&=|o5WR=6Z|gHV?;UIS^dK6v0B he2m`%=tYOI;m%ITvuC})F6O;8@92f#j$Y|_?LVcUo-zOc delta 3908 zcmcgvZBSHI7(VaaWtWx9vg|Ipe8qy0EBJv8B7Rg7IHH5P1d$UuC?5fZLVygC<1XkV z<22=Xi}NGLkg2pWr*xfGt1)a+XS5n~n*LQ-&g73~tO+Sa-JWw<0ojE?G0&an-gDk_ z&ii%VbIyC+9kRPa{v=m2SQuk>d_G^ivPwz_i9>6O=M`yyjLz5InBMT~S<-;CbeE@9 zyO*?m#F)pVJ1(V#focM3SPrXZ8`)-7&MMIs4C+}SYXYqS??P7RxfWWa31>!sFJ$?6 zK{zGr1m}Le(ki#=cB6W=%yUyVl0mSJ1(*_Pv>1#MWAT96QkELGY6qsG(WXQxmyD?? zC4y}}gw;b>9o~$U$ap=6W(})lje?+kwXvRv&dN3B+L3I@wq1x5=74T9vU zh$w}|@u&-4LmDf6W~XfRQ--Nc7N?SHO_$;%rQfnz4i6k)b(2-OZe6Y9bj?$mqMWjJ z^cYWHlq|UjhDv}2&;lWV4$uRkfB~2SgaI-T4hRQD045+3Fas9A3Pb@@foXsZhz4SS zSU@bgz=(3Ru8q25jNOZ*Zio5Uk`|-%Rfwl`<(&<5UDRxhcAGzKsC`!}$HLB)x&?5p*j8c0&eHY}6x09$-FtsD5wt?+(Zpt7l@2w#- zcMxi#k1rwmK)#KM?O^aBz-5VSv{y+fOEBy}TLIqUt0a1!jw$b#C8T&k@BqhwkyP|<@Q3G%bB2Da< z79bn-O^7`~D`9rF0+Cn=il`SdC!#Zl6?uJHBI1&cUgBmw&FL&B2fxrtHr}I$r0?`( zQ#PDQa=9`1S+Fc+#h6%#h%aUHSQc2VXLBH;4E?o;{YE@1ux%?Ks%1p46H3&n3JmU( zI*ehgmL{mCRtV>(_tQr2hETey2^G6}Xsx_WGVL*NZ4BkpT5mxNeH_7mu+kNtd5}!r zzNsW@cvrEM#p9yM#HaLtxHgpz&2&AeH94@Q85TCc;wpUYY$lKfIDqjSp9Aj+Kdyq8 za$Int6UR(8+$o$o8E4vA>ivjTCA;ol^k~Zm4}wfKpQYm&RH6nkQi(WdLVGSCd=k_z zu3!=Q(8FwO&uFk6ctIJpdELd7qznHY=a(qryOH^N-|06nFW9_*S)<29T3U;mw(_#OFkHH5F%(0^bx1VcV z@k7_&q+B1&b_V~7JIytLyLVE;M_Z2sMHTFqTRq;T?-!hhOD7*U(Xz?h=E?! z#Ge!|q%yj|>_*3}dYUzy@cf}82M&Jz=MJ)mJ;BzApA3;aabGkQ4CWPe)Y(BcOPs`@ zids4r`wU%6dL*w@LBm=HJxRx!Q!ML;Pc zrG8O9ZR1GO=JRXKl*cbFqAY%L2Nm&yuTprTeS8Kh0~sKRox@|>z#x1lMOYF88Fs&F~a8Z#K*^< z?+j|LnzP#lgJQnEnauH{S81f)nX2AVrEIyH;%!2bw;5YRB(zQ3bd^eZV;fnc?k?u= zREgQS(@lqYZ!Bq}5rYVyy9r`0=D&!)!Og6)vl%SDKSZ-b7O;gZlmGQD{kAJ_A9?fk INhhlQ1N=o=G5`Po diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index 6e2d978bf..cf857b142 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -3386,8 +3386,7 @@ UINT8 WhoIsThere2( INT16 sGridNo, INT8 bLevel ) // person must either have their pSoldier->sGridNo here or be non-passable if ( (pStructure->fFlags & STRUCTURE_PERSON) && ( !(pStructure->fFlags & STRUCTURE_PASSABLE) || MercPtrs[ pStructure->usStructureID ]->sGridNo == sGridNo) ) { - // WANNE NEW: CTH Fix - //if ( ( bLevel == 0 && pStructure->sCubeOffset == 0 ) || (bLevel > 0 && pStructure->sCubeOffset > 0) ) + if ( ( bLevel == 0 && pStructure->sCubeOffset == 0 ) || (bLevel > 0 && pStructure->sCubeOffset > 0) ) { // found a person, on the right level! // structure ID and merc ID are identical for merc structures