From fe6d9e8a131c70dee6bb1c7acd18cd323ded4d24 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 30 Jun 2013 16:08:04 +0000 Subject: [PATCH] - Fixed MERC Buy Equipment flag not properly set by reverting & fixing buggy code optimizations in r6075 (by Buggler) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6176 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/mercs Files.cpp | Bin 142272 -> 142816 bytes Laptop/mercs.cpp | 8 ++++++++ 2 files changed, 8 insertions(+) diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index f4571d4421529567b362c1c63471e7b57b9e6bba..f5da7eaa1edde001d5c85f402a9beae34a8595ef 100644 GIT binary patch delta 866 zcmbV~QAiX~6o$_khGiVqMO+^&H=L-%l3ccy3WUWVNR~>89+Ds(mQAC{y=xLh5uwW# zv7~m%6A=s6Lp@dlO~DcxK@mO(YQZjquZ1i<81z=O zY0szPwMn=FBann)7y?7~#+$-jaGrNb=!VPQc@J1%!c}j5jB6M99f9NCJ^>x}WPD7e z?@OptY>%QvdiduQB)EKupQ_klI9I_O<%-GQw8C!afLhQg@&TLe_U?ul%?Z>f7eGI~ zG_i$lr0^ph5m-kj1x6_&@W82#60oG3L? z!NkxSvAjd^QJ3H@3K{O_w7_;66?n*F{|BASdfZQMGw7otYdLBfTagNW^vm*l-LAV| zR_vRfKTXk{Hbvi6b!=VxW#7Vf+Ij{9WDVhp6CK9#UMhU!mizOl(${C$K&J%mqqBLw z!HK7ger=+$cE6QJeCFCJLzYfi*V>$_XtLi@Bh|5P*jkzlVo(~EO1XzTs2|g;?cS2L zHJS@5jjpVtrEw?H^`BgvP!-h)J;D5K_LIlI`FYCOe6yFe)P}p{thuOb6<`>`ApXgz z!I`Wk)PR9XMh(vKAg>c}!At6kKJ1mNw*(cpVL-l{&)$0zkgx7WX>}SO$n1EO79V4b Iic9GK1Ae{god5s; delta 400 zcmZY4y-UMj5C-t~UP1{$i_{KMMJhNZ5~WBHDRt1n&kPQ_Xb}++#Ud_(l}>FC(ddO< zwKnR1AOzI0gOuV>{KUb*&f=ibRq?GI-JUzR=lE4#`Gx@MX$6fDF9wZ>YweFmNl$|Zt*TTn zF|r_G`PGN-WrHg7VzA9MD&(P|URhN6F;#4kXinoH3OXWXG#){v=y#(}SBI2chAF&A z_%LR*VBD{?PO=F$%f{FM8)wrZ8EjB&3^vLJsXGhJ6g-0n4Xr?!e&)oV_$u7fZ4zXv z#GoC6yCq7UfR`p6=t2D diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index cceb23b0..9b89d8ee 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -215,6 +215,8 @@ BOOLEAN gfMercSiteScreenIsReDrawn=FALSE; BOOLEAN gfJustHiredAMercMerc=FALSE; +BOOLEAN fMercHireOverPlayerLimitMerc=FALSE; + BOOLEAN gfRedrawMercSite=FALSE; BOOLEAN gfFirstTimeIntoMERCSiteSinceEnteringLaptop=FALSE; @@ -512,6 +514,12 @@ BOOLEAN EnterMercs() //Display a popup msg box telling the user when and where the merc will arrive after hire if( gfJustHiredAMercMerc == TRUE ) DisplayPopUpBoxExplainingMercArrivalLocationAndTime(); + //Display a popup msg box for max hire limit reached + else if( fMercHireOverPlayerLimitMerc == TRUE ) + { + DoLapTopMessageBox( MSG_BOX_LAPTOP_DEFAULT, MercInfo[ MERC_FILES_HIRE_TO_MANY_PEOPLE_WARNING ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL); + fMercHireOverPlayerLimitMerc = FALSE; + } //if NOT entering from a subsite if( gubArrivedFromMercSubSite == MERC_CAME_FROM_OTHER_PAGE )