From ccc6bea3bed3bc97c68cf138555168b37f104f9d Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 6 May 2013 20:40:49 +0000
Subject: [PATCH] - Added page numbers in MERC files (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/AimMembers.cpp  |   6 +++---
 Laptop/mercs Files.cpp | Bin 142000 -> 142920 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
index ccf71a75..1c35cb4d 100644
--- a/Laptop/AimMembers.cpp
+++ b/Laptop/AimMembers.cpp
@@ -182,8 +182,8 @@
 #define		NEXT_BR_X				NEXT_X + BOTTOM_BUTTON_START_WIDTH
 #define		NEXT_BR_Y				NEXT_BOX_Y + BOTTOM_BUTTON_START_HEIGHT
 
-#define		PAGE_X					iScreenWidthOffset + 582
-#define		PAGE_Y					PREVIOUS_Y + 4
+#define		AIM_PAGE_X					iScreenWidthOffset + 582
+#define		AIM_PAGE_Y					PREVIOUS_Y + 4
 
 #define		AIM_MERC_INFO_X			iScreenWidthOffset + 124
 #define		AIM_MERC_INFO_Y			iScreenHeightOffset + 223 + LAPTOP_SCREEN_WEB_DELTA_Y
@@ -2349,7 +2349,7 @@ void DisplayMercStats()
 
 	//Buggler: Display current AIM index & total AIM members at the bottom of the screen
 	swprintf( sPage, L"%d / %d", gbCurrentIndex + 1, MAX_NUMBER_MERCS );
-	DrawTextToScreen(sPage, PAGE_X, PAGE_Y, 0, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED);
+	DrawTextToScreen(sPage, AIM_PAGE_X, AIM_PAGE_Y, 0, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED);
 }
 
 UINT8	GetStatColor( INT8 bStat )
diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index 826f3f0058dcace45cbccd73be6e9e6c0c24e6c8..96355017bdb742ebfed2ee4533d2629939b21117 100644
GIT binary patch
delta 361
zcmdmRmE*)6jtwa?lfMZmOujRjWAX)FvB`6E`6j;;mti!WEU2ss7G;tJiRv($Fc?k#
zsI0!ZLB@}R*?_@(^F<ZUzx)9Vi45rssSME!W()=lvD+Dy7;kG%-^a=*!t272$xzHt
zz>ot}QaSx%3!`woFM}&X5Q8&=0#GWCAqA+f0?1Ya;u3~@AWj4-R$xG=$_1*(Wk>>&
zML?qzfbu0^wHZJW1)w-c4@hS&keAPph9p<akPOt53WRwKybN3noIw5M(|>y~@~bKU
znJ{PT0JZoqC^4u49izaY55ypr5`)h4h1HD8?Aky9Lk6A66Aw6ZL)Z!onhe&{4V4)+
hc~MN6d~vey<d7di;2<;EEHOR6g;8m{pEqODeE<z-RagK3

delta 55
zcmV-70LcHy+z7DM2(V-vllBfAli(r@lVBzWliCd^v!ERm2m>(yFq1J^C$ruqBK@~0
NBLTuGw{%Yd)ZS~;6{7$E