Fix: M.E.R.C. accounting displayed too many mercs per page (page 2 and following)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-19 14:21:04 +00:00
parent f5dfddb0fc
commit 49cba321b5
+4 -3
View File
@@ -523,16 +523,17 @@ void DisplayHiredMercs()
usMercIDEnd = usMercIDStart + MAX_NUMBER_MERCS_ON_PAGE; usMercIDEnd = usMercIDStart + MAX_NUMBER_MERCS_ON_PAGE;
} }
// Flugente: neither do I, so screw this
// WANNE.LARRY: I don't understand why this is needed??? I did not change anything on this yet. // WANNE.LARRY: I don't understand why this is needed??? I did not change anything on this yet.
// At least second page // At least second page
// This approach is needed, because auf LARRY_ROACHBURN // This approach is needed, because auf LARRY_ROACHBURN
if (usMercIDStart > 0) /*if (usMercIDStart > 0)
{ {
usMercIDStart++; usMercIDStart++;
} }*/
// Loop through all the mercs // Loop through all the mercs
for(i=usMercIDStart; i <= (NUMBER_OF_MERCS - 1) ; i++) for(i=usMercIDStart; i < usMercIDEnd/*(NUMBER_OF_MERCS - 1)*/ ; ++i)
{ {
// We have no more free rows on the current page // We have no more free rows on the current page
if (usCurrentRow == usMercIDEnd - 1) if (usCurrentRow == usMercIDEnd - 1)