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

Merged from revision: 7329

Browse Source 
- 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
This commit is contained in:
Wanne
2014-07-12 10:10:13 +00:00
parent 3aa6e6e200
commit 0a16af6fe2
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.cpp
+1 -1
View File
@@ -1693,7 +1693,7 @@ BOOLEAN ShadeMapElem( INT16 sMapX, INT16 sMapY, INT32 iColor )
void InitializeMilitiaPopup(void) void InitializeMilitiaPopup(void)
{ {
UINT16 xVal = 330; UINT16 xVal = 330 + xResOffset;
UINT16 yVal = 25; UINT16 yVal = 25;
if (iResolution >= _640x480 && iResolution < _800x600) if (iResolution >= _640x480 && iResolution < _800x600)
Strategic/Map Screen Interface.cpp
+32 -32
View File
@@ -237,8 +237,6 @@ extern MOUSE_REGION gCharInfoHandRegion;
extern MOUSE_REGION gCharInfoFaceRegion; extern MOUSE_REGION gCharInfoFaceRegion;
MOUSE_REGION gMapStatusBarsRegion; MOUSE_REGION gMapStatusBarsRegion;
SGPPoint MovePosition={450, 100 };
// which lines are selected? .. for assigning groups of mercs to the same thing // which lines are selected? .. for assigning groups of mercs to the same thing
BOOLEAN fSelectedListOfMercsForMapScreen[ CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS ]; BOOLEAN fSelectedListOfMercsForMapScreen[ CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS ];
BOOLEAN fResetTimerForFirstEntryIntoMapScreen = FALSE; BOOLEAN fResetTimerForFirstEntryIntoMapScreen = FALSE;
@@ -3809,6 +3807,7 @@ void SetUpMovingListsForSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ )
void CreatePopUpBoxForMovementBox( void ) void CreatePopUpBoxForMovementBox( void )
{ {
SGPPoint MovePosition = {450 + xResOffset, 100};
SGPPoint Position; SGPPoint Position;
SGPRect Dimensions; SGPRect Dimensions;
@@ -5336,52 +5335,53 @@ void CreateDestroyUpdatePanelButtons(INT32 iX, INT32 iY, BOOLEAN fFourWideMode )
/* /*
void CreateUpdateBox( void ) void CreateUpdateBox( void )
{ {
SGPPoint MovePosition = {450 + xResOffset, 100};
// create basic box // 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 // which buffer will box render to
SetBoxBuffer(ghUpdateBox, FRAME_BUFFER); SetBoxBuffer(ghUpdateBox, FRAME_BUFFER);
// border type? // border type?
SetBorderType(ghUpdateBox,guiPOPUPBORDERS); SetBorderType(ghUpdateBox,guiPOPUPBORDERS);
// background texture // background texture
SetBackGroundSurface(ghUpdateBox, guiPOPUPTEX); SetBackGroundSurface(ghUpdateBox, guiPOPUPTEX);
// margin sizes // margin sizes
SetMargins( ghUpdateBox, 6, 6, 4, 4 ); SetMargins( ghUpdateBox, 6, 6, 4, 4 );
// space between lines // space between lines
SetLineSpace(ghUpdateBox, 2); SetLineSpace(ghUpdateBox, 2);
// set current box to this one // set current box to this one
SetCurrentBox( ghUpdateBox ); SetCurrentBox( ghUpdateBox );
// add strings // add strings
CreateUpdateBoxStrings( ); CreateUpdateBoxStrings( );
// set font type // set font type
SetBoxFont(ghUpdateBox, MAP_SCREEN_FONT); SetBoxFont(ghUpdateBox, MAP_SCREEN_FONT);
// set highlight color // set highlight color
SetBoxHighLight(ghUpdateBox, FONT_WHITE); SetBoxHighLight(ghUpdateBox, FONT_WHITE);
// unhighlighted color // unhighlighted color
SetBoxForeground(ghUpdateBox, FONT_LTGREEN); SetBoxForeground(ghUpdateBox, FONT_LTGREEN);
// background color // background color
SetBoxBackground(ghUpdateBox, FONT_BLACK); SetBoxBackground(ghUpdateBox, FONT_BLACK);
// shaded color..for darkened text // shaded color..for darkened text
SetBoxShade( ghUpdateBox, FONT_BLACK ); SetBoxShade( ghUpdateBox, FONT_BLACK );
// resize box to text // resize box to text
ResizeBoxToText( ghUpdateBox ); ResizeBoxToText( ghUpdateBox );
// create screen mask // create screen mask
CreateScreenMaskForMoveBox( ); CreateScreenMaskForMoveBox( );
ShowBox( ghUpdateBox ); ShowBox( ghUpdateBox );
return; return;
} }