From 0a16af6fe2ec2c9ea7e3d8ab75a396c9b2f3a2d4 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 12 Jul 2014 10:10:13 +0000
Subject: [PATCH] Merged from revision: 7329 - Fixed Movement box and Militia
 Popup box x-coordinates in non-standard resolutions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Map Screen Interface Map.cpp |  2 +-
 Strategic/Map Screen Interface.cpp     | 64 +++++++++++++-------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp
index d0039372..76f81709 100644
--- a/Strategic/Map Screen Interface Map.cpp	
+++ b/Strategic/Map Screen Interface Map.cpp	
@@ -1693,7 +1693,7 @@ BOOLEAN ShadeMapElem( INT16 sMapX, INT16 sMapY, INT32 iColor )
 
 void InitializeMilitiaPopup(void)
 {
-	UINT16 xVal = 330;
+	UINT16 xVal = 330 + xResOffset;
 	UINT16 yVal = 25;
 
 	if (iResolution >= _640x480 && iResolution < _800x600)
diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp
index 926ab278..e1431f8b 100644
--- a/Strategic/Map Screen Interface.cpp	
+++ b/Strategic/Map Screen Interface.cpp	
@@ -237,8 +237,6 @@ extern MOUSE_REGION gCharInfoHandRegion;
 extern MOUSE_REGION gCharInfoFaceRegion;
 MOUSE_REGION	gMapStatusBarsRegion;
 
-SGPPoint MovePosition={450, 100 };
-
 // which lines are selected? .. for assigning groups of mercs to the same thing
 BOOLEAN fSelectedListOfMercsForMapScreen[ CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS ];
 BOOLEAN fResetTimerForFirstEntryIntoMapScreen = FALSE;
@@ -3809,6 +3807,7 @@ void SetUpMovingListsForSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ )
 
 void CreatePopUpBoxForMovementBox( void )
 {
+	SGPPoint MovePosition = {450 + xResOffset, 100};
 	SGPPoint Position;
 	SGPRect Dimensions;
 
@@ -5336,52 +5335,53 @@ void CreateDestroyUpdatePanelButtons(INT32 iX, INT32 iY, BOOLEAN fFourWideMode )
 /*
 void CreateUpdateBox( void )
 {
+	SGPPoint MovePosition = {450 + xResOffset, 100};
 	// create basic box
- CreatePopUpBox(&ghUpdateBox, AssignmentDimensions, MovePosition, (POPUP_BOX_FLAG_CLIP_TEXT|POPUP_BOX_FLAG_RESIZE ));
+	CreatePopUpBox(&ghUpdateBox, AssignmentDimensions, MovePosition, (POPUP_BOX_FLAG_CLIP_TEXT|POPUP_BOX_FLAG_RESIZE ));
 
- // which buffer will box render to
- SetBoxBuffer(ghUpdateBox, FRAME_BUFFER);
+	// which buffer will box render to
+	SetBoxBuffer(ghUpdateBox, FRAME_BUFFER);
 
- // border type?
- SetBorderType(ghUpdateBox,guiPOPUPBORDERS);
+	// border type?
+	SetBorderType(ghUpdateBox,guiPOPUPBORDERS);
 
- // background texture
- SetBackGroundSurface(ghUpdateBox, guiPOPUPTEX);
+	// background texture
+	SetBackGroundSurface(ghUpdateBox, guiPOPUPTEX);
 
- // margin sizes
- SetMargins( ghUpdateBox, 6, 6, 4, 4 );
+	// margin sizes
+	SetMargins( ghUpdateBox, 6, 6, 4, 4 );
 
- // space between lines
- SetLineSpace(ghUpdateBox, 2);
+	// space between lines
+	SetLineSpace(ghUpdateBox, 2);
 
- // set current box to this one
- SetCurrentBox( ghUpdateBox );
+	// set current box to this one
+	SetCurrentBox( ghUpdateBox );
 
- // add strings
- CreateUpdateBoxStrings( );
+	// add strings
+	CreateUpdateBoxStrings( );
 
- // set font type
- SetBoxFont(ghUpdateBox, MAP_SCREEN_FONT);
+	// set font type
+	SetBoxFont(ghUpdateBox, MAP_SCREEN_FONT);
 
- // set highlight color
- SetBoxHighLight(ghUpdateBox, FONT_WHITE);
+	// set highlight color
+	SetBoxHighLight(ghUpdateBox, FONT_WHITE);
 
- // unhighlighted color
- SetBoxForeground(ghUpdateBox, FONT_LTGREEN);
+	// unhighlighted color
+	SetBoxForeground(ghUpdateBox, FONT_LTGREEN);
 
- // background color
- SetBoxBackground(ghUpdateBox, FONT_BLACK);
+	// background color
+	SetBoxBackground(ghUpdateBox, FONT_BLACK);
 
- // shaded color..for darkened text
- SetBoxShade( ghUpdateBox, FONT_BLACK );
+	// shaded color..for darkened text
+	SetBoxShade( ghUpdateBox, FONT_BLACK );
 
- // resize box to text
- ResizeBoxToText( ghUpdateBox );
+	// resize box to text
+	ResizeBoxToText( ghUpdateBox );
 
- // create screen mask
- CreateScreenMaskForMoveBox( );
+	// create screen mask
+	CreateScreenMaskForMoveBox( );
 
- ShowBox( ghUpdateBox );
+	ShowBox( ghUpdateBox );
 
 	return;
 }