From 49cba321b572bdef14aced4e8dc110ef55243b70 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 19 Jan 2014 14:21:04 +0000 Subject: [PATCH] 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 --- Laptop/mercs Account.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index bc62cfe8..dcdc64a9 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -523,16 +523,17 @@ void DisplayHiredMercs() 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. // At least second page // This approach is needed, because auf LARRY_ROACHBURN - if (usMercIDStart > 0) + /*if (usMercIDStart > 0) { usMercIDStart++; - } + }*/ // 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 if (usCurrentRow == usMercIDEnd - 1)