1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed MERC Buy Equipment flag not properly set by reverting & fixing buggy code optimizations in r6075 (by Buggler)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-30 16:08:04 +00:00
parent 952e40a427
commit fe6d9e8a13
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs Files.cpp
BIN
View File
Binary file not shown.
Laptop/mercs.cpp
+8
View File
@@ -215,6 +215,8 @@ BOOLEAN gfMercSiteScreenIsReDrawn=FALSE;
BOOLEAN gfJustHiredAMercMerc=FALSE; BOOLEAN gfJustHiredAMercMerc=FALSE;
BOOLEAN fMercHireOverPlayerLimitMerc=FALSE;
BOOLEAN gfRedrawMercSite=FALSE; BOOLEAN gfRedrawMercSite=FALSE;
BOOLEAN gfFirstTimeIntoMERCSiteSinceEnteringLaptop=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 //Display a popup msg box telling the user when and where the merc will arrive after hire
if( gfJustHiredAMercMerc == TRUE ) if( gfJustHiredAMercMerc == TRUE )
DisplayPopUpBoxExplainingMercArrivalLocationAndTime(); 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 NOT entering from a subsite
if( gubArrivedFromMercSubSite == MERC_CAME_FROM_OTHER_PAGE ) if( gubArrivedFromMercSubSite == MERC_CAME_FROM_OTHER_PAGE )