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

Merged from revision: 7344

Browse Source 
Fixes (by Buggler)
- Centered strategic screen in non-standard resolutions
- Fixed message log disappearing when clicking map border buttons
- Minor fix for increased MAX_BUILDINGS limit 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-07-19 13:48:27 +00:00
parent 615c561dc1
commit f086611d21
14 changed files with 275 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+7 -7
View File
@@ -1518,7 +1518,7 @@ void send_donegui ( UINT8 ubResult )
info.ready_stage = 3;//done placing mercs info.ready_stage = 3;//done placing mercs
info.status=1; info.status=1;
SGPRect CenterRect = { 100 + xResOffset, 100, SCREEN_WIDTH - 100 - xResOffset, 300 }; SGPRect CenterRect = { 100 + xResOffset, 100 + yResOffset, SCREEN_WIDTH - 100 - xResOffset, 300 + yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE, MPClientMessage[12], guiCurrentScreen, MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT, send_donegui, &CenterRect ); DoMessageBox( MSG_BOX_BASIC_STYLE, MPClientMessage[12], guiCurrentScreen, MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT, send_donegui, &CenterRect );
if(numready==cMaxClients && is_server)//all done if(numready==cMaxClients && is_server)//all done
@@ -1702,7 +1702,7 @@ void start_battle ( void )
// Go to "ready" state! // Go to "ready" state!
if (numPlayersValid && clientsFinishedDownloading && teamsValid) if (numPlayersValid && clientsFinishedDownloading && teamsValid)
{ {
SGPRect CenterRect = { 100 + xResOffset, 100, SCREEN_WIDTH - 100 - xResOffset, 300 }; SGPRect CenterRect = { 100 + xResOffset, 100 + yResOffset, SCREEN_WIDTH - 100 - xResOffset, 300 + yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE, MPClientMessage[35], guiCurrentScreen, MSG_BOX_FLAG_YESNO | MSG_BOX_FLAG_USE_CENTERING_RECT, allowlaptop_callback, &CenterRect ); DoMessageBox( MSG_BOX_BASIC_STYLE, MPClientMessage[35], guiCurrentScreen, MSG_BOX_FLAG_YESNO | MSG_BOX_FLAG_USE_CENTERING_RECT, allowlaptop_callback, &CenterRect );
} }
} }
@@ -2274,7 +2274,7 @@ void requestSETID(RPCParameters *rpcParameters)
{ {
serverAddr = rpcParameters->sender; serverAddr = rpcParameters->sender;
SGPRect CenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT }; SGPRect CenteringRect= {0 + xResOffset, 0 + yResOffset, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT - yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE , MPClientMessage[64] , guiCurrentScreen, MSG_BOX_FLAG_YESNO | MSG_BOX_FLAG_USE_CENTERING_RECT, allowDownloadCallback, &CenteringRect ); DoMessageBox( MSG_BOX_BASIC_STYLE , MPClientMessage[64] , guiCurrentScreen, MSG_BOX_FLAG_YESNO | MSG_BOX_FLAG_USE_CENTERING_RECT, allowDownloadCallback, &CenteringRect );
} }
} }
@@ -2593,7 +2593,7 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve
// because of wrong resolution or other stuff // because of wrong resolution or other stuff
if ( UsingNewInventorySystem() == true && !IsNIVModeValid(true) ) if ( UsingNewInventorySystem() == true && !IsNIVModeValid(true) )
{ {
SGPRect CenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH-1 - 2 * xResOffset, SCREEN_HEIGHT-1 }; SGPRect CenteringRect= {0 + xResOffset, 0 + yResOffset, SCREEN_WIDTH-1 - 2 * xResOffset, SCREEN_HEIGHT-1 - 2 * yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE , MPClientMessage[69] , guiCurrentScreen, MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT, InvalidClientSettingsOkBoxCallback, &CenteringRect ); DoMessageBox( MSG_BOX_BASIC_STYLE , MPClientMessage[69] , guiCurrentScreen, MSG_BOX_FLAG_OK | MSG_BOX_FLAG_USE_CENTERING_RECT, InvalidClientSettingsOkBoxCallback, &CenteringRect );
} }
else else
@@ -4279,7 +4279,7 @@ void kick_player (void)
else else
swprintf(Cmsg, MPClientMessage[74], client_names[1],client_names[2],client_names[3]); swprintf(Cmsg, MPClientMessage[74], client_names[1],client_names[2],client_names[3]);
SGPRect CenterRect = { 100 + xResOffset, 100, SCREEN_WIDTH - xResOffset, 300 }; SGPRect CenterRect = { 100 + xResOffset, 100 + yResOffset, SCREEN_WIDTH - xResOffset, 300 + yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE, Cmsg, guiCurrentScreen, MSG_BOX_FLAG_FOUR_NUMBERED_BUTTONS | MSG_BOX_FLAG_USE_CENTERING_RECT, kick_callback, &CenterRect ); DoMessageBox( MSG_BOX_BASIC_STYLE, Cmsg, guiCurrentScreen, MSG_BOX_FLAG_FOUR_NUMBERED_BUTTONS | MSG_BOX_FLAG_USE_CENTERING_RECT, kick_callback, &CenterRect );
} }
@@ -4357,7 +4357,7 @@ void overide_turn (void)
else else
swprintf(Cmsg, MPClientMessage[30], client_names[1],client_names[2],client_names[3]); swprintf(Cmsg, MPClientMessage[30], client_names[1],client_names[2],client_names[3]);
SGPRect CenterRect = { 100 + xResOffset, 100, SCREEN_WIDTH - 100 - xResOffset, 300 }; SGPRect CenterRect = { 100 + xResOffset, 100 + yResOffset, SCREEN_WIDTH - 100 - xResOffset, 300 + yResOffset };
DoMessageBox( MSG_BOX_BASIC_STYLE, Cmsg, guiCurrentScreen, MSG_BOX_FLAG_FOUR_NUMBERED_BUTTONS | MSG_BOX_FLAG_USE_CENTERING_RECT | MSG_BOX_FLAG_OK, turn_callback, &CenterRect ); DoMessageBox( MSG_BOX_BASIC_STYLE, Cmsg, guiCurrentScreen, MSG_BOX_FLAG_FOUR_NUMBERED_BUTTONS | MSG_BOX_FLAG_USE_CENTERING_RECT | MSG_BOX_FLAG_OK, turn_callback, &CenterRect );
} }
@@ -4597,7 +4597,7 @@ void HandleClientConnectionLost()
// connection lost, let user know via popup then quit to main menu // connection lost, let user know via popup then quit to main menu
iDisconnectedScreen = guiCurrentScreen; iDisconnectedScreen = guiCurrentScreen;
SGPRect CenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT }; SGPRect CenteringRect= {0 + xResOffset, 0 + yResOffset, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT - yResOffset };
if (wcscmp(gszDisconnectReason,L"")==0) if (wcscmp(gszDisconnectReason,L"")==0)
{ {
Strategic/Assignments.cpp
+1
View File
@@ -13014,6 +13014,7 @@ void CreateContractBox( SOLDIERTYPE *pCharacter )
CHAR16 sDollarString[ 50 ]; CHAR16 sDollarString[ 50 ];
ContractPosition.iX = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + OrigContractPosition.iX; ContractPosition.iX = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + OrigContractPosition.iX;
ContractPosition.iY = yResOffset + OrigContractPosition.iY;
if( giBoxY != 0 ) if( giBoxY != 0 )
{ {
Strategic/Auto Resolve.cpp
+1 -1
View File
@@ -546,7 +546,7 @@ void DoTransitionFromPreBattleInterfaceToAutoResolve()
uiStartTime = GetJA2Clock(); uiStartTime = GetJA2Clock();
sStartLeft = 59 + xResOffset; sStartLeft = 59 + xResOffset;
sStartTop = 69; sStartTop = 69 + yResOffset;
sEndLeft = SrcRect.iLeft + gpAR->sWidth / 2; sEndLeft = SrcRect.iLeft + gpAR->sWidth / 2;
sEndTop = SrcRect.iTop + gpAR->sHeight / 2; sEndTop = SrcRect.iTop + gpAR->sHeight / 2;
Strategic/Map Screen Interface Border.cpp
+29 -12
View File
@@ -112,7 +112,7 @@ void DisplayCurrentLevelMarker( void );
extern void CancelMapUIMessage( void ); extern void CancelMapUIMessage( void );
extern BOOLEAN fMapScreenBottomDirty;
// callbacks // callbacks
void BtnTownCallback(GUI_BUTTON *btn,INT32 reason); void BtnTownCallback(GUI_BUTTON *btn,INT32 reason);
@@ -197,14 +197,14 @@ void RenderMapBorder( void )
// HEADROCK HAM 4: Load different map border depending on whether we want to display the mobile militia button or not. // HEADROCK HAM 4: Load different map border depending on whether we want to display the mobile militia button or not.
if (gGameExternalOptions.gfAllowMilitiaGroups) if (gGameExternalOptions.gfAllowMilitiaGroups)
{ {
BltVideoObject( guiSAVEBUFFER , hHandle, 1, xResOffset + MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL ); BltVideoObject( guiSAVEBUFFER , hHandle, 1, xResOffset + MAP_BORDER_X, yResOffset + MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
} }
else else
{ {
BltVideoObject( guiSAVEBUFFER , hHandle, 0, xResOffset + MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL ); BltVideoObject( guiSAVEBUFFER , hHandle, 0, xResOffset + MAP_BORDER_X, yResOffset + MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
} }
RestoreExternBackgroundRect( xResOffset + MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset, SCREEN_HEIGHT ); RestoreExternBackgroundRect( xResOffset + MAP_BORDER_X, yResOffset + MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset, SCREEN_HEIGHT - 121 - 2 * yResOffset);
// show the level marker // show the level marker
DisplayCurrentLevelMarker( ); DisplayCurrentLevelMarker( );
@@ -575,6 +575,9 @@ void ToggleShowTownsMode( void )
} }
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
@@ -616,6 +619,9 @@ void ToggleShowMinesMode( void )
} }
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
@@ -681,6 +687,9 @@ void ToggleShowMilitiaMode( void )
} }
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
@@ -696,6 +705,7 @@ void ToggleShowTeamsMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
else else
{ // turn show teams ON { // turn show teams ON
@@ -725,6 +735,7 @@ void ToggleAirspaceMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
else else
{ // turn airspace ON { // turn airspace ON
@@ -745,6 +756,7 @@ void ToggleItemsFilter( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
else else
{ {
@@ -766,6 +778,7 @@ void ToggleMobileFilter( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
else else
{ {
@@ -895,6 +908,7 @@ void TurnOnShowTeamsMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
} }
@@ -976,6 +990,7 @@ void TurnOnAirSpaceMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
} }
@@ -1040,6 +1055,7 @@ void TurnOnItemFilterMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
} }
@@ -1116,6 +1132,7 @@ void TurnOnMobileFilterMode( void )
fMapPanelDirty = TRUE; fMapPanelDirty = TRUE;
fTeamPanelDirty = TRUE; fTeamPanelDirty = TRUE;
fCharacterInfoPanelDirty = TRUE; fCharacterInfoPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
} }
} }
@@ -1326,22 +1343,22 @@ void InitMapBorderButtonCoordinates()
UINT32 buttonOffset = 155; // 160 UINT32 buttonOffset = 155; // 160
MAP_BORDER_TOWN_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 152; MAP_BORDER_TOWN_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 152;
MAP_BORDER_TOWN_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_TOWN_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_MINE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 109; MAP_BORDER_MINE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 109;
MAP_BORDER_MINE_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_MINE_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_TEAMS_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 66; MAP_BORDER_TEAMS_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 66;
MAP_BORDER_TEAMS_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_TEAMS_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_AIRSPACE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 20; MAP_BORDER_AIRSPACE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 20;
MAP_BORDER_AIRSPACE_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_AIRSPACE_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_ITEM_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 63; MAP_BORDER_ITEM_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 63;
MAP_BORDER_ITEM_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_ITEM_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_MILITIA_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 23; MAP_BORDER_MILITIA_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) - 23;
MAP_BORDER_MILITIA_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_MILITIA_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_BORDER_MOBILE_BTN_X = xResSize; MAP_BORDER_MOBILE_BTN_X = xResSize;
MAP_BORDER_MOBILE_BTN_Y = 0; MAP_BORDER_MOBILE_BTN_Y = 0;
MAP_LEVEL_MARKER_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 114; MAP_LEVEL_MARKER_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 114;
MAP_LEVEL_MARKER_Y = (yResSize - buttonOffset); MAP_LEVEL_MARKER_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
MAP_LEVEL_MARKER_DELTA = 8; MAP_LEVEL_MARKER_DELTA = 8;
MAP_LEVEL_MARKER_WIDTH = 55; MAP_LEVEL_MARKER_WIDTH = 55;
@@ -1349,7 +1366,7 @@ void InitMapBorderButtonCoordinates()
{ {
// Mobile button appears next to Militia button. // Mobile button appears next to Militia button.
MAP_BORDER_MOBILE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 16; MAP_BORDER_MOBILE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 16;
MAP_BORDER_MOBILE_BTN_Y = (yResSize - buttonOffset); MAP_BORDER_MOBILE_BTN_Y = (SCREEN_HEIGHT - yResOffset - buttonOffset);
// Airspace, Items, ZLevel buttons all moved to the right (+22px, +22px, +10px). // Airspace, Items, ZLevel buttons all moved to the right (+22px, +22px, +10px).
MAP_BORDER_AIRSPACE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 42; MAP_BORDER_AIRSPACE_BTN_X = xResOffset + MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset) / 2) + 42;
Strategic/Map Screen Interface Map Inventory.cpp
+38 -38
View File
@@ -390,7 +390,7 @@ BOOLEAN LoadInventoryPoolGraphic( void )
MAP_INV_SLOT_COLS = 8; MAP_INV_SLOT_COLS = 8;
MAP_INVENTORY_POOL_SLOT_COUNT = 40; MAP_INVENTORY_POOL_SLOT_COUNT = 40;
MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 51; MAP_INVENTORY_POOL_SLOT_START_Y = 51 + yResOffset;
sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory.sti" ); sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory.sti" );
} }
else if (iResolution < _1024x768) else if (iResolution < _1024x768)
@@ -398,7 +398,7 @@ BOOLEAN LoadInventoryPoolGraphic( void )
MAP_INV_SLOT_COLS = 11; MAP_INV_SLOT_COLS = 11;
MAP_INVENTORY_POOL_SLOT_COUNT = 77; MAP_INVENTORY_POOL_SLOT_COUNT = 77;
MAP_INVENTORY_POOL_SLOT_START_X = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + 278 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + 278 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 62; MAP_INVENTORY_POOL_SLOT_START_Y = 62 + yResOffset;
sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_800x600.sti" ); sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_800x600.sti" );
} }
else else
@@ -406,7 +406,7 @@ BOOLEAN LoadInventoryPoolGraphic( void )
MAP_INV_SLOT_COLS = 17; MAP_INV_SLOT_COLS = 17;
MAP_INVENTORY_POOL_SLOT_COUNT = MAP_INVENTORY_POOL_MAX_SLOTS; MAP_INVENTORY_POOL_SLOT_COUNT = MAP_INVENTORY_POOL_MAX_SLOTS;
MAP_INVENTORY_POOL_SLOT_START_X = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + 282 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = (SCREEN_WIDTH - INTERFACE_WIDTH)/2 + 282 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 50; MAP_INVENTORY_POOL_SLOT_START_Y = 50 + yResOffset;
sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_1024x768.sti" ); sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_1024x768.sti" );
} }
@@ -460,7 +460,7 @@ void BlitInventoryPoolGraphic( void )
// blit inventory pool graphic to the screen // blit inventory pool graphic to the screen
GetVideoObject(&hHandle, guiMapInventoryPoolBackground); GetVideoObject(&hHandle, guiMapInventoryPoolBackground);
BltVideoObject( guiSAVEBUFFER , hHandle, 0,(SCREEN_WIDTH - INTERFACE_WIDTH)/2 + INVEN_POOL_X, INVEN_POOL_Y , VO_BLT_SRCTRANSPARENCY,NULL ); BltVideoObject( guiSAVEBUFFER , hHandle, 0,(SCREEN_WIDTH - INTERFACE_WIDTH)/2 + INVEN_POOL_X, yResOffset + INVEN_POOL_Y , VO_BLT_SRCTRANSPARENCY,NULL );
// HEADROCK HAM 5: Draw inventory slots // HEADROCK HAM 5: Draw inventory slots
BlitInventoryPoolSlotGraphics(); BlitInventoryPoolSlotGraphics();
@@ -493,7 +493,7 @@ void BlitInventoryPoolGraphic( void )
HandleButtonStatesWhileMapInventoryActive( ); HandleButtonStatesWhileMapInventoryActive( );
// Invalidate // Invalidate
RestoreExternBackgroundRect(xResOffset + MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset, SCREEN_HEIGHT - 121 - 2 * yResOffset); RestoreExternBackgroundRect(xResOffset + MAP_BORDER_X, yResOffset + MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X - 2 * xResOffset, SCREEN_HEIGHT - 121 - 2 * yResOffset);
return; return;
} }
@@ -1343,7 +1343,7 @@ void MapInvenPoolSlots(MOUSE_REGION * pRegion, INT32 iReason )
} }
else if(fValidPointer) else if(fValidPointer)
{ {
InitSectorStackPopup( MercPtrs[gCharactersList[bSelectedInfoChar].usSolID], twItem, iCounter, (SCREEN_WIDTH - INTERFACE_WIDTH)/2, -10, 261, ( SCREEN_HEIGHT - PLAYER_INFO_Y ) ); InitSectorStackPopup( MercPtrs[gCharactersList[bSelectedInfoChar].usSolID], twItem, iCounter, (SCREEN_WIDTH - INTERFACE_WIDTH)/2, yResOffset - 10, 261, ( SCREEN_HEIGHT - PLAYER_INFO_Y ) );
fTeamPanelDirty=TRUE; fTeamPanelDirty=TRUE;
fInterfacePanelDirty = DIRTYLEVEL2; fInterfacePanelDirty = DIRTYLEVEL2;
} }
@@ -1678,13 +1678,13 @@ void MapInvenPoolSlots(MOUSE_REGION * pRegion, INT32 iReason )
void CreateMapInventoryButtons( void ) void CreateMapInventoryButtons( void )
{ {
guiMapInvenArrowButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" , 10, 1, -1, 3, -1 ); guiMapInvenArrowButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" , 10, 1, -1, 3, -1 );
guiMapInvenArrowButton[ 0 ] = QuickCreateButton( guiMapInvenArrowButtonImage[ 0 ], (MAP_INV_X_OFFSET + 559), (SCREEN_HEIGHT - 144 - 2 * yResOffset), guiMapInvenArrowButton[ 0 ] = QuickCreateButton( guiMapInvenArrowButtonImage[ 0 ], (MAP_INV_X_OFFSET + 559), (SCREEN_HEIGHT - 144 - yResOffset),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolNextBtn ); (GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolNextBtn );
guiMapInvenArrowButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,9, 0, -1, 2, -1 ); guiMapInvenArrowButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,9, 0, -1, 2, -1 );
guiMapInvenArrowButton[ 1 ] = QuickCreateButton( guiMapInvenArrowButtonImage[ 1 ], (MAP_INV_X_OFFSET + 487), (SCREEN_HEIGHT - 144 - 2 * yResOffset), guiMapInvenArrowButton[ 1 ] = QuickCreateButton( guiMapInvenArrowButtonImage[ 1 ], (MAP_INV_X_OFFSET + 487), (SCREEN_HEIGHT - 144 - yResOffset),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolPrevBtn ); (GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolPrevBtn );
@@ -1698,7 +1698,7 @@ void CreateMapInventoryButtons( void )
if (iResolution >= _800x600 ) if (iResolution >= _800x600 )
{ {
guiMapInvenZoomButtonImage = LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 0, 0, -1, 1, -1 ); guiMapInvenZoomButtonImage = LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 0, 0, -1, 1, -1 );
guiMapInvenZoomButton = QuickCreateButton( guiMapInvenZoomButtonImage, INVEN_POOL_X+10 + xResOffset, INVEN_POOL_Y+10, guiMapInvenZoomButton = QuickCreateButton( guiMapInvenZoomButtonImage, INVEN_POOL_X+10 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolZoomBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolZoomBtn );
@@ -1712,7 +1712,7 @@ void CreateMapInventoryButtons( void )
// HEADROCK HAM 5: Stack and Merge button // HEADROCK HAM 5: Stack and Merge button
guiMapInvenSortButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 16, 14, -1, 15, -1 ); guiMapInvenSortButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 16, 14, -1, 15, -1 );
guiMapInvenSortButton[ 0 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 0 ], INVEN_POOL_X+50 + xResOffset, INVEN_POOL_Y+10, guiMapInvenSortButton[ 0 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 0 ], INVEN_POOL_X+50 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolStackAndMergeBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolStackAndMergeBtn );
@@ -1720,7 +1720,7 @@ void CreateMapInventoryButtons( void )
// HEADROCK HAM 5: Sort Ammo Button // HEADROCK HAM 5: Sort Ammo Button
guiMapInvenSortButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 4, 2, -1, 3, -1 ); guiMapInvenSortButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 4, 2, -1, 3, -1 );
guiMapInvenSortButton[ 1 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 1 ], INVEN_POOL_X+80 + xResOffset, INVEN_POOL_Y+10, guiMapInvenSortButton[ 1 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 1 ], INVEN_POOL_X+80 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolSortAmmoBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolSortAmmoBtn );
@@ -1728,7 +1728,7 @@ void CreateMapInventoryButtons( void )
// HEADROCK HAM 5: Sort Attachments Button // HEADROCK HAM 5: Sort Attachments Button
guiMapInvenSortButtonImage[ 2 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 10, 8, -1, 9, -1 ); guiMapInvenSortButtonImage[ 2 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 10, 8, -1, 9, -1 );
guiMapInvenSortButton[ 2 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 2 ], INVEN_POOL_X+110 + xResOffset, INVEN_POOL_Y+10, guiMapInvenSortButton[ 2 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 2 ], INVEN_POOL_X+110 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolSortAttachmentsBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolSortAttachmentsBtn );
@@ -1736,7 +1736,7 @@ void CreateMapInventoryButtons( void )
// HEADROCK HAM 5: Sort Attachments Button // HEADROCK HAM 5: Sort Attachments Button
guiMapInvenSortButtonImage[ 3 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 13, 11, -1, 12, -1 ); guiMapInvenSortButtonImage[ 3 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 13, 11, -1, 12, -1 );
guiMapInvenSortButton[ 3 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 3 ], INVEN_POOL_X+140 + xResOffset, INVEN_POOL_Y+10, guiMapInvenSortButton[ 3 ] = QuickCreateButton( guiMapInvenSortButtonImage[ 3 ], INVEN_POOL_X+140 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolEjectAmmoBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolEjectAmmoBtn );
@@ -1744,7 +1744,7 @@ void CreateMapInventoryButtons( void )
// HEADROCK HAM 5: Filter Toggle Button // HEADROCK HAM 5: Filter Toggle Button
guiMapInvenFilterButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 7, 5, -1, 6, -1 ); guiMapInvenFilterButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 7, 5, -1, 6, -1 );
guiMapInvenFilterButton[ 0 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 0 ], INVEN_POOL_X+185 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 0 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 0 ], INVEN_POOL_X+185 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1755,7 +1755,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 0 ] ]->UserData[3] = 0; ButtonList[ guiMapInvenFilterButton[ 0 ] ]->UserData[3] = 0;
guiMapInvenFilterButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 20, 20, -1, 21, -1 ); guiMapInvenFilterButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 20, 20, -1, 21, -1 );
guiMapInvenFilterButton[ 1 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 1 ], INVEN_POOL_X+214 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 1 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 1 ], INVEN_POOL_X+214 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1766,7 +1766,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 1 ] ]->UserData[3] = IC_MAPFILTER_GUN; ButtonList[ guiMapInvenFilterButton[ 1 ] ]->UserData[3] = IC_MAPFILTER_GUN;
guiMapInvenFilterButtonImage[ 2 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 22, 22, -1, 23, -1 ); guiMapInvenFilterButtonImage[ 2 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 22, 22, -1, 23, -1 );
guiMapInvenFilterButton[ 2 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 2 ], INVEN_POOL_X+214 + xResOffset, INVEN_POOL_Y+24, guiMapInvenFilterButton[ 2 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 2 ], INVEN_POOL_X+214 + xResOffset, INVEN_POOL_Y + 24 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1777,7 +1777,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 2 ] ]->UserData[3] = IC_MAPFILTER_AMMO; ButtonList[ guiMapInvenFilterButton[ 2 ] ]->UserData[3] = IC_MAPFILTER_AMMO;
guiMapInvenFilterButtonImage[ 3 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 24, 24, -1, 25, -1 ); guiMapInvenFilterButtonImage[ 3 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 24, 24, -1, 25, -1 );
guiMapInvenFilterButton[ 3 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 3 ], INVEN_POOL_X+243 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 3 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 3 ], INVEN_POOL_X+243 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1788,7 +1788,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 3 ] ]->UserData[3] = IC_MAPFILTER_EXPLOSV; ButtonList[ guiMapInvenFilterButton[ 3 ] ]->UserData[3] = IC_MAPFILTER_EXPLOSV;
guiMapInvenFilterButtonImage[ 4 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 26, 26, -1, 27, -1 ); guiMapInvenFilterButtonImage[ 4 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 26, 26, -1, 27, -1 );
guiMapInvenFilterButton[ 4 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 4 ], INVEN_POOL_X+243 + xResOffset, INVEN_POOL_Y+24, guiMapInvenFilterButton[ 4 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 4 ], INVEN_POOL_X+243 + xResOffset, INVEN_POOL_Y + 24 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1799,7 +1799,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 4 ] ]->UserData[3] = IC_MAPFILTER_MELEE; ButtonList[ guiMapInvenFilterButton[ 4 ] ]->UserData[3] = IC_MAPFILTER_MELEE;
guiMapInvenFilterButtonImage[ 5 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 28, 28, -1, 29, -1 ); guiMapInvenFilterButtonImage[ 5 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 28, 28, -1, 29, -1 );
guiMapInvenFilterButton[ 5 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 5 ], INVEN_POOL_X+272 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 5 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 5 ], INVEN_POOL_X+272 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1810,7 +1810,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 5 ] ]->UserData[3] = IC_MAPFILTER_ARMOR; ButtonList[ guiMapInvenFilterButton[ 5 ] ]->UserData[3] = IC_MAPFILTER_ARMOR;
guiMapInvenFilterButtonImage[ 6 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 30, 30, -1, 31, -1 ); guiMapInvenFilterButtonImage[ 6 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 30, 30, -1, 31, -1 );
guiMapInvenFilterButton[ 6 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 6 ], INVEN_POOL_X+272 + xResOffset, INVEN_POOL_Y+24, guiMapInvenFilterButton[ 6 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 6 ], INVEN_POOL_X+272 + xResOffset, INVEN_POOL_Y + 24 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1821,7 +1821,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 6 ] ]->UserData[3] = IC_MAPFILTER_LBE; ButtonList[ guiMapInvenFilterButton[ 6 ] ]->UserData[3] = IC_MAPFILTER_LBE;
guiMapInvenFilterButtonImage[ 7 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 32, 32, -1, 33, -1 ); guiMapInvenFilterButtonImage[ 7 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 32, 32, -1, 33, -1 );
guiMapInvenFilterButton[ 7 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 7 ], INVEN_POOL_X+301 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 7 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 7 ], INVEN_POOL_X+301 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1832,7 +1832,7 @@ void CreateMapInventoryButtons( void )
ButtonList[ guiMapInvenFilterButton[ 7 ] ]->UserData[3] = IC_MAPFILTER_KIT; ButtonList[ guiMapInvenFilterButton[ 7 ] ]->UserData[3] = IC_MAPFILTER_KIT;
guiMapInvenFilterButtonImage[ 8 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 34, 34, -1, 35, -1 ); guiMapInvenFilterButtonImage[ 8 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 34, 34, -1, 35, -1 );
guiMapInvenFilterButton[ 8 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 8 ], INVEN_POOL_X+301 + xResOffset, INVEN_POOL_Y+24, guiMapInvenFilterButton[ 8 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 8 ], INVEN_POOL_X+301 + xResOffset, INVEN_POOL_Y + 24 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -1844,7 +1844,7 @@ void CreateMapInventoryButtons( void )
// Flugente: toggle button for move item display // Flugente: toggle button for move item display
guiMapInvenFilterButtonImage[ 9 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 36, 36, -1, 37, -1 ); guiMapInvenFilterButtonImage[ 9 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 36, 36, -1, 37, -1 );
guiMapInvenFilterButton[ 9 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 9 ], INVEN_POOL_X+336 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 9 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 9 ], INVEN_POOL_X+336 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtnMoveItemDisplay ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtnMoveItemDisplay );
@@ -1858,7 +1858,7 @@ void CreateMapInventoryButtons( void )
/* /*
guiMapInvenFilterButtonImage[ 9 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 19, 17, -1, 18, -1 ); guiMapInvenFilterButtonImage[ 9 ]= LoadButtonImage( "INTERFACE\\sector_inventory_buttons.sti" , 19, 17, -1, 18, -1 );
guiMapInvenFilterButton[ 9 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 9 ], INVEN_POOL_X+340 + xResOffset, INVEN_POOL_Y+10, guiMapInvenFilterButton[ 9 ] = QuickCreateButton( guiMapInvenFilterButtonImage[ 9 ], INVEN_POOL_X+340 + xResOffset, INVEN_POOL_Y + 10 + yResOffset,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn ); NULL, (GUI_CALLBACK)MapInventoryPoolFilterBtn );
@@ -2882,7 +2882,7 @@ void DisplayPagesForMapInventoryPool( void )
swprintf( sString, L"%d / %d", iCurrentInventoryPoolPage + 1, iLastInventoryPoolPage + 1 ); swprintf( sString, L"%d / %d", iCurrentInventoryPoolPage + 1, iLastInventoryPoolPage + 1 );
// grab centered coords // grab centered coords
FindFontCenterCoordinates(MAP_INVENTORY_POOL_PAGE_X, MAP_INVENTORY_POOL_PAGE_Y - 2 * yResOffset, MAP_INVENTORY_POOL_PAGE_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY); FindFontCenterCoordinates(MAP_INVENTORY_POOL_PAGE_X, MAP_INVENTORY_POOL_PAGE_Y - yResOffset, MAP_INVENTORY_POOL_PAGE_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY);
mprintf( sX, sY, sString ); mprintf( sX, sY, sString );
@@ -2944,7 +2944,7 @@ void DrawNumberOfIventoryPoolItems( void )
SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
// grab centered coords // grab centered coords
FindFontCenterCoordinates(MAP_INVENTORY_POOL_NUMBER_X, MAP_INVENTORY_POOL_PAGE_Y - 2 * yResOffset, MAP_INVENTORY_POOL_NUMBER_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY); FindFontCenterCoordinates(MAP_INVENTORY_POOL_NUMBER_X, MAP_INVENTORY_POOL_PAGE_Y - yResOffset, MAP_INVENTORY_POOL_NUMBER_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY);
mprintf( sX, sY, sString ); mprintf( sX, sY, sString );
@@ -2958,7 +2958,7 @@ void CreateMapInventoryPoolDoneButton( void )
{ {
// create done button // create done button
guiMapInvenDoneButtonImage= LoadButtonImage( "INTERFACE\\done_button.sti" , -1, 0, -1, 1, -1 ); guiMapInvenDoneButtonImage= LoadButtonImage( "INTERFACE\\done_button.sti" , -1, 0, -1, 1, -1 );
guiMapInvenDoneButton = QuickCreateButton( guiMapInvenDoneButtonImage, MAP_INV_X_OFFSET + 587 , (yResSize - 147), guiMapInvenDoneButton = QuickCreateButton( guiMapInvenDoneButtonImage, MAP_INV_X_OFFSET + 587 , (yResSize - 147 + yResOffset),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolDoneBtn ); (GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolDoneBtn );
@@ -2997,7 +2997,7 @@ void DisplayCurrentSector( void )
SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
// grab centered coords // grab centered coords
FindFontCenterCoordinates(MAP_INVENTORY_POOL_LOC_X, MAP_INVENTORY_POOL_PAGE_Y - 2 * yResOffset, MAP_INVENTORY_POOL_LOC_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY); FindFontCenterCoordinates(MAP_INVENTORY_POOL_LOC_X, MAP_INVENTORY_POOL_PAGE_Y - yResOffset, MAP_INVENTORY_POOL_LOC_WIDTH ,MAP_INVENTORY_POOL_PAGE_HEIGHT ,sString , MAP_SCREEN_FONT, &sX, &sY);
mprintf( sX, sY, sString ); mprintf( sX, sY, sString );
@@ -3157,12 +3157,12 @@ void DrawTextOnMapInventoryBackground( void )
SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
//Calculate the height of the string, as it needs to be vertically centered. //Calculate the height of the string, as it needs to be vertically centered.
usStringHeight = DisplayWrappedString(MAP_INV_X_OFFSET + 268, (SCREEN_HEIGHT - 138 - 2 * yResOffset), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT ); usStringHeight = DisplayWrappedString(MAP_INV_X_OFFSET + 268, (SCREEN_HEIGHT - 138 - yResOffset), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
DisplayWrappedString(MAP_INV_X_OFFSET + 268, (UINT16)((SCREEN_HEIGHT - 138 - 2 * yResOffset) - (usStringHeight / 2) ), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED ); DisplayWrappedString(MAP_INV_X_OFFSET + 268, (UINT16)((SCREEN_HEIGHT - 138 - yResOffset) - (usStringHeight / 2) ), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );
//Calculate the height of the string, as it needs to be vertically centered. //Calculate the height of the string, as it needs to be vertically centered.
usStringHeight = DisplayWrappedString( MAP_INV_X_OFFSET + 369, (SCREEN_HEIGHT - 138 - 2 * yResOffset), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT ); usStringHeight = DisplayWrappedString( MAP_INV_X_OFFSET + 369, (SCREEN_HEIGHT - 138 - yResOffset), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
DisplayWrappedString(MAP_INV_X_OFFSET + 369, (UINT16)((SCREEN_HEIGHT - 138 - 2 * yResOffset) - (usStringHeight / 2) ), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED ); DisplayWrappedString(MAP_INV_X_OFFSET + 369, (UINT16)((SCREEN_HEIGHT - 138 - yResOffset) - (usStringHeight / 2) ), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );
// item filter buttons included in 640x480 // item filter buttons included in 640x480
/*if (iResolution < _800x600) /*if (iResolution < _800x600)
@@ -4196,19 +4196,19 @@ void ResetMapInventoryOffsets( void )
{ {
MAP_INV_SLOT_COLS = 8; MAP_INV_SLOT_COLS = 8;
MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 51; MAP_INVENTORY_POOL_SLOT_START_Y = 51 + yResOffset;
} }
else if (iResolution >= _800x600 && iResolution < _1024x768) else if (iResolution >= _800x600 && iResolution < _1024x768)
{ {
MAP_INV_SLOT_COLS = 11; MAP_INV_SLOT_COLS = 11;
MAP_INVENTORY_POOL_SLOT_START_X = 278 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 278 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 62; MAP_INVENTORY_POOL_SLOT_START_Y = 62 + yResOffset;
} }
else if (iResolution >= _1024x768) else if (iResolution >= _1024x768)
{ {
MAP_INV_SLOT_COLS = 17; MAP_INV_SLOT_COLS = 17;
MAP_INVENTORY_POOL_SLOT_START_X = 282 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 282 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 50; MAP_INVENTORY_POOL_SLOT_START_Y = 50 + yResOffset;
} }
MAP_INVENTORY_POOL_SLOT_COUNT = GetInventorySlotCount( FALSE ); MAP_INVENTORY_POOL_SLOT_COUNT = GetInventorySlotCount( FALSE );
@@ -4236,19 +4236,19 @@ void ResetMapInventoryOffsets( void )
{ {
MAP_INV_SLOT_COLS = 3; MAP_INV_SLOT_COLS = 3;
MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 269 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 51; MAP_INVENTORY_POOL_SLOT_START_Y = 51 + yResOffset;
} }
else if (iResolution >= _800x600 && iResolution < _1024x768) else if (iResolution >= _800x600 && iResolution < _1024x768)
{ {
MAP_INV_SLOT_COLS = 5; MAP_INV_SLOT_COLS = 5;
MAP_INVENTORY_POOL_SLOT_START_X = 278 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 278 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 62; MAP_INVENTORY_POOL_SLOT_START_Y = 62 + yResOffset;
} }
else if (iResolution >= _1024x768) else if (iResolution >= _1024x768)
{ {
MAP_INV_SLOT_COLS = 8; MAP_INV_SLOT_COLS = 8;
MAP_INVENTORY_POOL_SLOT_START_X = 282 + xResOffset; MAP_INVENTORY_POOL_SLOT_START_X = 282 + xResOffset;
MAP_INVENTORY_POOL_SLOT_START_Y = 50; MAP_INVENTORY_POOL_SLOT_START_Y = 50 + yResOffset;
} }
MAP_INVENTORY_POOL_SLOT_COUNT = GetInventorySlotCount( TRUE ); MAP_INVENTORY_POOL_SLOT_COUNT = GetInventorySlotCount( TRUE );
Strategic/Map Screen Interface Map.cpp
+5 -5
View File
@@ -1402,7 +1402,7 @@ void ShowUncertainNumberEnemiesInSector( INT16 sSectorX, INT16 sSectorY )
// check if we are zoomed in...need to offset in case for scrolling purposes // check if we are zoomed in...need to offset in case for scrolling purposes
sXPosition = ( INT16 )( iconOffsetX + ( MAP_VIEW_START_X + ( sSectorX * MAP_GRID_X + 1 ) ) - 1 ); sXPosition = ( INT16 )( iconOffsetX + ( MAP_VIEW_START_X + ( sSectorX * MAP_GRID_X + 1 ) ) - 1 );
sYPosition = ( INT16 )( ( ( iconOffsetY + ( sSectorY * MAP_GRID_Y ) + 1 ) ) ); sYPosition = ( INT16 )( ( ( iconOffsetY + ( yResOffset + sSectorY * MAP_GRID_Y ) + 1 ) ) );
sYPosition -= 2; sYPosition -= 2;
// small question mark // small question mark
@@ -1442,8 +1442,8 @@ void ShowVIPSymbol( INT16 sSectorX, INT16 sSectorY )
GetVideoObject( &hIconHandle, guiCHARICONS ); GetVideoObject( &hIconHandle, guiCHARICONS );
// check if we are zoomed in...need to offset in case for scrolling purposes // check if we are zoomed in...need to offset in case for scrolling purposes
sXPosition = (INT16)(iconOffsetX + (MAP_VIEW_START_X + (sSectorX * MAP_GRID_X + 1)) - 1); sXPosition = (INT16)(iconOffsetX + ( MAP_VIEW_START_X + (sSectorX * MAP_GRID_X + 1)) - 1);
sYPosition = (INT16)(((iconOffsetY + (sSectorY * MAP_GRID_Y) + 1))); sYPosition = (INT16)(((iconOffsetY + ( yResOffset + sSectorY * MAP_GRID_Y ) + 1)));
sYPosition -= 2; sYPosition -= 2;
// small VIP symbol // small VIP symbol
@@ -1792,7 +1792,7 @@ BOOLEAN ShadeMapElem( INT16 sMapX, INT16 sMapY, INT32 iColor )
void InitializeMilitiaPopup(void) void InitializeMilitiaPopup(void)
{ {
UINT16 xVal = 330 + xResOffset; UINT16 xVal = 330 + xResOffset;
UINT16 yVal = 25; UINT16 yVal = 25 + yResOffset;
if (iResolution >= _640x480 && iResolution < _800x600) if (iResolution >= _640x480 && iResolution < _800x600)
{ {
@@ -3031,7 +3031,7 @@ BOOLEAN TraceCharAnimatedRoute( PathStPtr pPath, BOOLEAN fCheckFlag, BOOLEAN fFo
usArrowHeight = hMapHandle->pETRLEObject[ uiArrowNumToDraw ].usHeight; usArrowHeight = hMapHandle->pETRLEObject[ uiArrowNumToDraw ].usHeight;
BltVideoObject(FRAME_BUFFER, hMapHandle, uiArrowNumToDraw, iArrowX, iArrowY, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject(FRAME_BUFFER, hMapHandle, uiArrowNumToDraw, iArrowX, iArrowY, VO_BLT_SRCTRANSPARENCY, NULL );
InvalidateRegion( iArrowX + xResOffset, iArrowY, iArrowX + usArrowWidth, iArrowY + usArrowHeight ); InvalidateRegion( iArrowX + xResOffset, iArrowY + yResOffset, iArrowX + usArrowWidth, iArrowY + usArrowHeight );
//ARM who knows what it should return here? //ARM who knows what it should return here?
return FALSE; return FALSE;
Strategic/Map Screen Interface.cpp
+8 -7
View File
@@ -1307,7 +1307,7 @@ INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExit
INT32 DoMapMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback ) INT32 DoMapMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback )
{ {
SGPRect CenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH - xResOffset, INV_INTERFACE_START_Y }; SGPRect CenteringRect= {0 + xResOffset, 0 + yResOffset, SCREEN_WIDTH - xResOffset, INV_INTERFACE_START_Y };
// reset the highlighted line // reset the highlighted line
giHighLine = -1; giHighLine = -1;
@@ -1970,7 +1970,7 @@ void HandleGroupAboutToArrive( void )
void CreateMapStatusBarsRegion( void ) void CreateMapStatusBarsRegion( void )
{ {
MSYS_DefineRegion( &gMapStatusBarsRegion, BAR_INFO_X + xResOffset - 3, BAR_INFO_Y - 42,(INT16)( BAR_INFO_X + xResOffset + 17), (INT16)(BAR_INFO_Y ), MSYS_PRIORITY_HIGH + 5, MSYS_DefineRegion( &gMapStatusBarsRegion, BAR_INFO_X + xResOffset - 3, BAR_INFO_Y + yResOffset - 42,(INT16)( BAR_INFO_X + xResOffset + 17), (INT16)(BAR_INFO_Y + yResOffset), MSYS_PRIORITY_HIGH + 5,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
return; return;
@@ -3807,7 +3807,7 @@ void SetUpMovingListsForSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ )
void CreatePopUpBoxForMovementBox( void ) void CreatePopUpBoxForMovementBox( void )
{ {
SGPPoint MovePosition = {450 + xResOffset, 100}; SGPPoint MovePosition = {450 + xResOffset, 100 + yResOffset};
SGPPoint Position; SGPPoint Position;
SGPRect Dimensions; SGPRect Dimensions;
@@ -5335,7 +5335,8 @@ void CreateDestroyUpdatePanelButtons(INT32 iX, INT32 iY, BOOLEAN fFourWideMode )
/* /*
void CreateUpdateBox( void ) void CreateUpdateBox( void )
{ {
SGPPoint MovePosition = {450 + xResOffset, 100}; SGPPoint MovePosition = {450 + xResOffset, 100 + yResOffset};
// 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 ));
@@ -5750,13 +5751,13 @@ void CreateDestroyInsuranceMouseRegionForMercs( BOOLEAN fCreate )
if( ( fCreated == FALSE ) && ( fCreate == TRUE ) ) if( ( fCreated == FALSE ) && ( fCreate == TRUE ) )
{ {
MSYS_DefineRegion( &gContractIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y, CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + CHAR_ICON_HEIGHT, MSYS_DefineRegion( &gContractIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + yResOffset, CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + yResOffset + CHAR_ICON_HEIGHT,
MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
MSYS_DefineRegion( &gInsuranceIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING, CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING + CHAR_ICON_HEIGHT, MSYS_DefineRegion( &gInsuranceIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING + yResOffset, CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING + yResOffset + CHAR_ICON_HEIGHT,
MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
MSYS_DefineRegion( &gDepositIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ), CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ) + CHAR_ICON_HEIGHT, MSYS_DefineRegion( &gDepositIconRegion, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ) + yResOffset, CHAR_ICON_X + xResOffset + CHAR_ICON_WIDTH, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ) + yResOffset + CHAR_ICON_HEIGHT,
MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); MSYS_PRIORITY_HIGH - 1, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
fCreated = TRUE; fCreated = TRUE;
Strategic/Map Screen Interface.h
+3 -3
View File
@@ -56,9 +56,9 @@ extern UINT8 maxNumberOfMercVisibleInStrategyList;
#define MAP_SCREEN_FONT BLOCKFONT2 #define MAP_SCREEN_FONT BLOCKFONT2
// characterlist regions // characterlist regions
#define Y_START 135 //146 #define Y_START yResOffset + 135 //146
#define MAP_START_KEYRING_Y 107 #define MAP_START_KEYRING_Y yResOffset + 107
#define Y_SIZE GetFontHeight(MAP_SCREEN_FONT) #define Y_SIZE GetFontHeight(MAP_SCREEN_FONT)
//lal //lal
// militia control menu // militia control menu
Strategic/Merc Contract.cpp
+1 -1
View File
@@ -1159,7 +1159,7 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
CHAR16 zShortTownIDString[ 50 ], zShortDropOffString[ 50 ], zDropOffString[ 50 ]; CHAR16 zShortTownIDString[ 50 ], zShortDropOffString[ 50 ], zDropOffString[ 50 ];
// use YES/NO Pop up box, settup for particular screen // use YES/NO Pop up box, settup for particular screen
SGPRect pCenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT}; SGPRect pCenteringRect= {0 + xResOffset, 0 + yResOffset, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT - yResOffset};
//GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, zTownIDString, TRUE ); //GetSectorIDString( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ, zTownIDString, TRUE );
Strategic/PreBattle Interface.cpp
+40 -40
View File
@@ -451,7 +451,7 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
} }
//Define the blanket region to cover all of the other regions used underneath the panel. //Define the blanket region to cover all of the other regions used underneath the panel.
MSYS_DefineRegion( &PBInterfaceBlanket, 0 + xResOffset, 0, 261 + xResOffset, 359, MSYS_PRIORITY_HIGHEST - 5, 0, 0, 0 ); MSYS_DefineRegion( &PBInterfaceBlanket, 0 + xResOffset, 0 + yResOffset, 261 + xResOffset, 359 + yResOffset, MSYS_PRIORITY_HIGHEST - 5, 0, 0, 0 );
//Create the panel //Create the panel
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE; VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
@@ -465,9 +465,9 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
AssertMsg( 0, "Failed to load interface\\PreBattleButton.sti" ); AssertMsg( 0, "Failed to load interface\\PreBattleButton.sti" );
iPBButtonImage[1] = UseLoadedButtonImage( iPBButtonImage[ 0 ], -1, 0, -1, 1, -1 ); iPBButtonImage[1] = UseLoadedButtonImage( iPBButtonImage[ 0 ], -1, 0, -1, 1, -1 );
iPBButtonImage[2] = UseLoadedButtonImage( iPBButtonImage[ 0 ], -1, 0, -1, 1, -1 ); iPBButtonImage[2] = UseLoadedButtonImage( iPBButtonImage[ 0 ], -1, 0, -1, 1, -1 );
iPBButton[0] = QuickCreateButton( iPBButtonImage[0], 27 + xResOffset, 54, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, AutoResolveBattleCallback ); iPBButton[0] = QuickCreateButton( iPBButtonImage[0], 27 + xResOffset, 54 + yResOffset, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, AutoResolveBattleCallback );
iPBButton[1] = QuickCreateButton( iPBButtonImage[1], 98 + xResOffset, 54, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, GoToSectorCallback ); iPBButton[1] = QuickCreateButton( iPBButtonImage[1], 98 + xResOffset, 54 + yResOffset, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, GoToSectorCallback );
iPBButton[2] = QuickCreateButton( iPBButtonImage[2], 169 + xResOffset, 54, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, RetreatMercsCallback ); iPBButton[2] = QuickCreateButton( iPBButtonImage[2], 169 + xResOffset, 54 + yResOffset, BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGHEST - 2, DEFAULT_MOVE_CALLBACK, RetreatMercsCallback );
SpecifyGeneralButtonTextAttributes( iPBButton[0], gpStrategicString[ STR_PB_AUTORESOLVE_BTN ], BLOCKFONT, FONT_BEIGE, 141 ); SpecifyGeneralButtonTextAttributes( iPBButton[0], gpStrategicString[ STR_PB_AUTORESOLVE_BTN ], BLOCKFONT, FONT_BEIGE, 141 );
SpecifyGeneralButtonTextAttributes( iPBButton[1], gpStrategicString[ STR_PB_GOTOSECTOR_BTN ], BLOCKFONT, FONT_BEIGE, 141 ); SpecifyGeneralButtonTextAttributes( iPBButton[1], gpStrategicString[ STR_PB_GOTOSECTOR_BTN ], BLOCKFONT, FONT_BEIGE, 141 );
@@ -912,9 +912,9 @@ void DoTransitionFromMapscreenToPreBattleInterface()
PauseTime( FALSE ); PauseTime( FALSE );
PBIRect.iLeft = 0 + xResOffset; PBIRect.iLeft = 0 + xResOffset;
PBIRect.iTop = 0; PBIRect.iTop = 0 + yResOffset;
PBIRect.iRight = 261 + xResOffset; PBIRect.iRight = 261 + xResOffset;
PBIRect.iBottom = 359; PBIRect.iBottom = 359 + yResOffset;
iWidth = 261; iWidth = 261;
iHeight = 359; iHeight = 359;
@@ -926,7 +926,7 @@ void DoTransitionFromMapscreenToPreBattleInterface()
sStartLeft += MAP_GRID_X / 2; sStartLeft += MAP_GRID_X / 2;
sStartTop += MAP_GRID_Y / 2; sStartTop += MAP_GRID_Y / 2;
sEndLeft = 131 + xResOffset; sEndLeft = 131 + xResOffset;
sEndTop = 180; sEndTop = 180 + yResOffset;
//save the mapscreen buffer //save the mapscreen buffer
BlitBufferToBuffer( FRAME_BUFFER, guiEXTRABUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT ); BlitBufferToBuffer( FRAME_BUFFER, guiEXTRABUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
@@ -948,13 +948,13 @@ void DoTransitionFromMapscreenToPreBattleInterface()
gfEnterAutoResolveMode = TRUE; gfEnterAutoResolveMode = TRUE;
} }
BlitBufferToBuffer( guiSAVEBUFFER, FRAME_BUFFER, 27 + xResOffset, 54, 209, 32 ); BlitBufferToBuffer( guiSAVEBUFFER, FRAME_BUFFER, 27 + xResOffset, 54 + yResOffset, 209, 32 );
RenderButtons(); RenderButtons();
BlitBufferToBuffer( FRAME_BUFFER, guiSAVEBUFFER, 27 + xResOffset, 54, 209, 32 ); BlitBufferToBuffer( FRAME_BUFFER, guiSAVEBUFFER, 27 + xResOffset, 54 + yResOffset, 209, 32 );
gfRenderPBInterface = TRUE; gfRenderPBInterface = TRUE;
//hide the prebattle interface //hide the prebattle interface
BlitBufferToBuffer( guiEXTRABUFFER, FRAME_BUFFER, 0 + xResOffset, 0, 261 + xResOffset, 359 ); BlitBufferToBuffer( guiEXTRABUFFER, FRAME_BUFFER, 0 + xResOffset, 0 + yResOffset, 261 + xResOffset, 359 + yResOffset );
PlayJA2SampleFromFile( "SOUNDS\\Laptop power up (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN ); PlayJA2SampleFromFile( "SOUNDS\\Laptop power up (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN );
InvalidateScreen(); InvalidateScreen();
RefreshScreen( NULL ); RefreshScreen( NULL );
@@ -1037,7 +1037,7 @@ void KillPreBattleInterface()
//Enable the options button when the auto resolve screen comes up //Enable the options button when the auto resolve screen comes up
EnableDisAbleMapScreenOptionsButton( TRUE ); EnableDisAbleMapScreenOptionsButton( TRUE );
ColorFillVideoSurfaceArea( guiSAVEBUFFER, 0, 0, 261 + xResOffset, 359, 0 ); ColorFillVideoSurfaceArea( guiSAVEBUFFER, 0, 0, 261 + xResOffset, 359 + yResOffset, 0 );
EnableTeamInfoPanels(); EnableTeamInfoPanels();
if( ButtonList[ giMapContractButton ] ) if( ButtonList[ giMapContractButton ] )
@@ -1110,8 +1110,8 @@ void RenderPBHeader( INT32 *piX, INT32 *piWidth)
} }
width = StringPixLength( str, FONT10ARIALBOLD ); width = StringPixLength( str, FONT10ARIALBOLD );
x = 130 - width / 2; x = 130 - width / 2;
mprintf( x + xResOffset, 4, str ); mprintf( x + xResOffset, 4 + yResOffset, str );
InvalidateRegion( 0, 0, 231 + xResOffset, 12 ); InvalidateRegion( 0, 0, 231 + xResOffset, 12 + yResOffset );
*piX = x; *piX = x;
*piWidth = width; *piWidth = width;
} }
@@ -1170,22 +1170,22 @@ void RenderPreBattleInterface()
gfRenderPBInterface = FALSE; gfRenderPBInterface = FALSE;
GetVideoObject( &hVObject, uiInterfaceImages ); GetVideoObject( &hVObject, uiInterfaceImages );
//main panel //main panel
BltVideoObject( guiSAVEBUFFER, hVObject, MAINPANEL, xResOffset, 0, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, MAINPANEL, xResOffset, yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
//main title //main title
RenderPBHeader( &x, &width ); RenderPBHeader( &x, &width );
//now draw the title bars up to the text. //now draw the title bars up to the text.
for( i = x - 12; i > 20; i -= 10 ) for( i = x - 12; i > 20; i -= 10 )
{ {
BltVideoObject( guiSAVEBUFFER, hVObject, TITLE_BAR_PIECE, i + xResOffset, 6, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, TITLE_BAR_PIECE, i + xResOffset, 6 + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
for( i = x + width + 2; i < 231; i += 10 ) for( i = x + width + 2; i < 231; i += 10 )
{ {
BltVideoObject( guiSAVEBUFFER, hVObject, TITLE_BAR_PIECE, i + xResOffset, 6, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, TITLE_BAR_PIECE, i + xResOffset, 6 + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
y = BOTTOM_Y - ACTUAL_HEIGHT - ROW_HEIGHT * max( guiNumUninvolved, 1 ); y = BOTTOM_Y - ACTUAL_HEIGHT - ROW_HEIGHT * max( guiNumUninvolved, 1 );
BltVideoObject( guiSAVEBUFFER, hVObject, UNINVOLVED_HEADER, 8 + xResOffset, y, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, UNINVOLVED_HEADER, 8 + xResOffset, y + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
SetFont( BLOCKFONT ); SetFont( BLOCKFONT );
SetFontForeground( FONT_BEIGE ); SetFontForeground( FONT_BEIGE );
@@ -1196,7 +1196,7 @@ void RenderPreBattleInterface()
SetFont( BLOCKFONTNARROW ); SetFont( BLOCKFONTNARROW );
width = StringPixLength( str, BLOCKFONTNARROW ); width = StringPixLength( str, BLOCKFONTNARROW );
} }
mprintf( 65 - width + xResOffset , 17, str ); mprintf( 65 - width + xResOffset , 17 + yResOffset, str );
SetFont( BLOCKFONT ); SetFont( BLOCKFONT );
if( gubEnemyEncounterCode != CREATURE_ATTACK_CODE ) if( gubEnemyEncounterCode != CREATURE_ATTACK_CODE )
@@ -1217,7 +1217,7 @@ void RenderPreBattleInterface()
SetFont( BLOCKFONTNARROW ); SetFont( BLOCKFONTNARROW );
width = StringPixLength( str, BLOCKFONTNARROW ); width = StringPixLength( str, BLOCKFONTNARROW );
} }
mprintf( 54 + xResOffset - width , 38, str ); mprintf( 54 + xResOffset - width , 38 + yResOffset, str );
SetFont( BLOCKFONT ); SetFont( BLOCKFONT );
swprintf( str, gpStrategicString[ STR_PB_MERCS ] ); swprintf( str, gpStrategicString[ STR_PB_MERCS ] );
@@ -1227,7 +1227,7 @@ void RenderPreBattleInterface()
SetFont( BLOCKFONTNARROW ); SetFont( BLOCKFONTNARROW );
width = StringPixLength( str, BLOCKFONTNARROW ); width = StringPixLength( str, BLOCKFONTNARROW );
} }
mprintf( 139 + xResOffset - width , 38, str ); mprintf( 139 + xResOffset - width , 38 + yResOffset, str );
SetFont( BLOCKFONT ); SetFont( BLOCKFONT );
swprintf( str, gpStrategicString[ STR_PB_MILITIA ] ); swprintf( str, gpStrategicString[ STR_PB_MILITIA ] );
@@ -1237,20 +1237,20 @@ void RenderPreBattleInterface()
SetFont( BLOCKFONTNARROW ); SetFont( BLOCKFONTNARROW );
width = StringPixLength( str, BLOCKFONTNARROW ); width = StringPixLength( str, BLOCKFONTNARROW );
} }
mprintf( 224 + xResOffset - width , 38, str ); mprintf( 224 + xResOffset - width , 38 + yResOffset, str );
//Draw the bottom columns //Draw the bottom columns
for( i = 0; i < (INT32)max( guiNumUninvolved, 1 ); i++ ) for( i = 0; i < (INT32)max( guiNumUninvolved, 1 ); i++ )
{ {
y = BOTTOM_Y - ROW_HEIGHT * (i+1) + 1; y = BOTTOM_Y - ROW_HEIGHT * (i+1) + 1;
BltVideoObject( guiSAVEBUFFER, hVObject, BOTTOM_COLUMN, 161 + xResOffset, y, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, BOTTOM_COLUMN, 161 + xResOffset, y + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
// WDS - make number of mercenaries, etc. be configurable // WDS - make number of mercenaries, etc. be configurable
for( i = 0; i < (INT32)(/*21*/3+ OUR_TEAM_SIZE_NO_VEHICLE - max( guiNumUninvolved, 1 )); i++ ) for( i = 0; i < (INT32)(/*21*/3+ OUR_TEAM_SIZE_NO_VEHICLE - max( guiNumUninvolved, 1 )); i++ )
{ {
y = TOP_Y + ROW_HEIGHT * i; y = TOP_Y + ROW_HEIGHT * i;
BltVideoObject( guiSAVEBUFFER, hVObject, TOP_COLUMN, 186 + xResOffset, y, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hVObject, TOP_COLUMN, 186 + xResOffset, y + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
//location //location
@@ -1259,7 +1259,7 @@ void RenderPreBattleInterface()
SetFontShadow( FONT_NEARBLACK ); SetFontShadow( FONT_NEARBLACK );
GetSectorIDString( gubPBSectorX, gubPBSectorY, gubPBSectorZ, pSectorName, TRUE ); GetSectorIDString( gubPBSectorX, gubPBSectorY, gubPBSectorZ, pSectorName, TRUE );
mprintf( 70 + xResOffset, 17, L"%s %s", gpStrategicString[ STR_PB_SECTOR ], pSectorName ); mprintf( 70 + xResOffset, 17 + yResOffset, L"%s %s", gpStrategicString[ STR_PB_SECTOR ], pSectorName );
//enemy //enemy
SetFont( FONT14ARIAL ); SetFont( FONT14ARIAL );
@@ -1281,15 +1281,15 @@ void RenderPreBattleInterface()
} }
x = 57 + (27 - StringPixLength( str, FONT14ARIAL )) / 2; x = 57 + (27 - StringPixLength( str, FONT14ARIAL )) / 2;
y = 36; y = 36;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//player //player
swprintf( str, L"%d", guiNumInvolved ); swprintf( str, L"%d", guiNumInvolved );
x = 142 + (27 - StringPixLength( str, FONT14ARIAL )) / 2; x = 142 + (27 - StringPixLength( str, FONT14ARIAL )) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//militia //militia
swprintf( str, L"%d", CountAllMilitiaInSector( gubPBSectorX, gubPBSectorY ) ); swprintf( str, L"%d", CountAllMilitiaInSector( gubPBSectorX, gubPBSectorY ) );
x = 227 + (27 - StringPixLength( str, FONT14ARIAL )) / 2; x = 227 + (27 - StringPixLength( str, FONT14ARIAL )) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
SetFontShadow( FONT_NEARBLACK ); SetFontShadow( FONT_NEARBLACK );
SetFont( BLOCKFONT2 ); SetFont( BLOCKFONT2 );
@@ -1312,25 +1312,25 @@ void RenderPreBattleInterface()
//NAME //NAME
wcscpy( str, MercPtrs[ i ]->name ); wcscpy( str, MercPtrs[ i ]->name );
x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2; x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset , y, str ); mprintf( x + xResOffset , y + yResOffset, str );
//ASSIGN //ASSIGN
GetMapscreenMercAssignmentString( MercPtrs[ i ], str ); GetMapscreenMercAssignmentString( MercPtrs[ i ], str );
x = 72 + (54-StringPixLength( str, BLOCKFONT2)) / 2; x = 72 + (54-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//COND //COND
GetSoldierConditionInfo( MercPtrs[ i ], str, &ubHPPercent, &ubBPPercent ); GetSoldierConditionInfo( MercPtrs[ i ], str, &ubHPPercent, &ubBPPercent );
x = 129 + (58-StringPixLength( str, BLOCKFONT2)) / 2; x = 129 + (58-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//HP //HP
swprintf( str, L"%d%%", ubHPPercent ); swprintf( str, L"%d%%", ubHPPercent );
x = 189 + (25-StringPixLength( str, BLOCKFONT2)) / 2; x = 189 + (25-StringPixLength( str, BLOCKFONT2)) / 2;
wcscat( str, sSpecialCharacters[0] ); wcscat( str, sSpecialCharacters[0] );
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//BP //BP
swprintf( str, L"%d%%", ubBPPercent ); swprintf( str, L"%d%%", ubBPPercent );
x = 217 + (25-StringPixLength( str, BLOCKFONT2)) / 2; x = 217 + (25-StringPixLength( str, BLOCKFONT2)) / 2;
wcscat( str, sSpecialCharacters[0] ); wcscat( str, sSpecialCharacters[0] );
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
line++; line++;
y += ROW_HEIGHT; y += ROW_HEIGHT;
@@ -1346,7 +1346,7 @@ void RenderPreBattleInterface()
wcscpy( str, gpStrategicString[ STR_PB_NONE ] ); wcscpy( str, gpStrategicString[ STR_PB_NONE ] );
x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2; x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2;
y = BOTTOM_Y - ROW_HEIGHT + 2; y = BOTTOM_Y - ROW_HEIGHT + 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
} }
else else
{ {
@@ -1366,26 +1366,26 @@ void RenderPreBattleInterface()
//NAME //NAME
wcscpy( str, MercPtrs[ i ]->name ); wcscpy( str, MercPtrs[ i ]->name );
x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2; x = 17 + (52-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//ASSIGN //ASSIGN
GetMapscreenMercAssignmentString( MercPtrs[ i ], str ); GetMapscreenMercAssignmentString( MercPtrs[ i ], str );
x = 72 + (54-StringPixLength( str, BLOCKFONT2)) / 2; x = 72 + (54-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//LOC //LOC
GetMapscreenMercLocationString( MercPtrs[ i ], str ); GetMapscreenMercLocationString( MercPtrs[ i ], str );
x = 128 + (33-StringPixLength( str, BLOCKFONT2)) / 2; x = 128 + (33-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
//DEST //DEST
GetMapscreenMercDestinationString( MercPtrs[ i ], str ); GetMapscreenMercDestinationString( MercPtrs[ i ], str );
if( wcslen( str ) > 0 ) if( wcslen( str ) > 0 )
{ {
x = 164 + (41-StringPixLength( str, BLOCKFONT2)) / 2; x = 164 + (41-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
} }
//DEP //DEP
GetMapscreenMercDepartureString( MercPtrs[ i ], str, &ubJunk ); GetMapscreenMercDepartureString( MercPtrs[ i ], str, &ubJunk );
x = 208 + (34-StringPixLength( str, BLOCKFONT2)) / 2; x = 208 + (34-StringPixLength( str, BLOCKFONT2)) / 2;
mprintf( x + xResOffset, y, str ); mprintf( x + xResOffset, y + yResOffset, str );
line++; line++;
y += ROW_HEIGHT; y += ROW_HEIGHT;
} }
@@ -1397,9 +1397,9 @@ void RenderPreBattleInterface()
MarkAllBoxesAsAltered( ); MarkAllBoxesAsAltered( );
if( !guiNumUninvolved || gfZoomDone == FALSE ) if( !guiNumUninvolved || gfZoomDone == FALSE )
RestoreExternBackgroundRect( 0 + xResOffset, 0, 261 + xResOffset, 359 ); RestoreExternBackgroundRect( 0 + xResOffset, 0 + yResOffset, 261 + xResOffset, 359 + yResOffset );
else else
RestoreExternBackgroundRect( 0 + xResOffset, 0, 261 + xResOffset, y ); RestoreExternBackgroundRect( 0 + xResOffset, 0 + yResOffset, 261 + xResOffset, y + yResOffset );
// restore font destinanation buffer to the frame buffer // restore font destinanation buffer to the frame buffer
SetFontDestBuffer( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
Strategic/mapscreen.cpp
+135 -135
View File
@@ -1120,8 +1120,8 @@ void BeginDeleteAllCallBack( UINT8 bExitValue )
// CHRISL: New functions to handle initialization of inventory coordinates // CHRISL: New functions to handle initialization of inventory coordinates
BOOLEAN InitializeInvPanelCoordsOld() BOOLEAN InitializeInvPanelCoordsOld()
{ {
PLAYER_INFO_Y = 107; PLAYER_INFO_Y = yResOffset + 107;
TOWN_INFO_Y = 1; TOWN_INFO_Y = yResOffset + 1;
PLAYER_INFO_X = xResOffset + 0; PLAYER_INFO_X = xResOffset + 0;
@@ -1205,22 +1205,22 @@ BOOLEAN InitializeInvPanelCoordsOld()
INV_BTN_X = PLAYER_INFO_X + 217; INV_BTN_X = PLAYER_INFO_X + 217;
INV_BTN_Y = PLAYER_INFO_Y + 210; INV_BTN_Y = PLAYER_INFO_Y + 210;
INV_BDROP_Y = 0; // Not used in old inventory INV_BDROP_Y = 0; // Not used in old inventory
MAP_ARMOR_LABEL_Y = 180; MAP_ARMOR_LABEL_Y = yResOffset + 180;
MAP_ARMOR_Y = 189; MAP_ARMOR_Y = yResOffset + 189;
MAP_ARMOR_PERCENT_Y = 190; MAP_ARMOR_PERCENT_Y = yResOffset + 190;
MAP_WEIGHT_LABEL_Y = 256; MAP_WEIGHT_LABEL_Y = yResOffset + 256;
MAP_WEIGHT_Y = 266; MAP_WEIGHT_Y = yResOffset + 266;
MAP_WEIGHT_PERCENT_Y = 266; MAP_WEIGHT_PERCENT_Y = yResOffset + 266;
MAP_CAMMO_LABEL_Y = 283; MAP_CAMMO_LABEL_Y = yResOffset + 283;
MAP_CAMMO_Y = 292; MAP_CAMMO_Y = yResOffset + 292;
MAP_CAMMO_PERCENT_Y = 293; MAP_CAMMO_PERCENT_Y = yResOffset + 293;
MAP_PERCENT_WIDTH = 20; MAP_PERCENT_WIDTH = 20;
MAP_PERCENT_HEIGHT = 10; MAP_PERCENT_HEIGHT = 10;
MAP_INV_STATS_TITLE_FONT_COLOR = 6; MAP_INV_STATS_TITLE_FONT_COLOR = 6;
MAP_INV_STATS_TEXT_FONT_COLOR = 5; MAP_INV_STATS_TEXT_FONT_COLOR = 5;
PLAYER_INFO_FACE_START_Y = 17; PLAYER_INFO_FACE_START_Y = yResOffset + 17;
PLAYER_INFO_FACE_END_Y = 76; PLAYER_INFO_FACE_END_Y = yResOffset + 76;
INV_BODY_Y = 116; INV_BODY_Y = yResOffset + 116;
if (iResolution >= _640x480 && iResolution < _800x600) if (iResolution >= _640x480 && iResolution < _800x600)
{ {
@@ -1257,7 +1257,7 @@ BOOLEAN InitializeInvPanelCoordsOld()
} }
// contract // contract
CONTRACT_Y = 50; CONTRACT_Y = yResOffset + 50;
// trash can // trash can
TRASH_CAN_Y = 211 + PLAYER_INFO_Y; TRASH_CAN_Y = 211 + PLAYER_INFO_Y;
@@ -1265,7 +1265,7 @@ BOOLEAN InitializeInvPanelCoordsOld()
TRASH_CAN_HEIGHT = 239 - 217; TRASH_CAN_HEIGHT = 239 - 217;
// keyring // keyring
MAP_KEYRING_Y = 271; MAP_KEYRING_Y = yResOffset + 271;
//Text offsets //Text offsets
Y_OFFSET = 2; Y_OFFSET = 2;
@@ -1277,7 +1277,7 @@ BOOLEAN InitializeInvPanelCoordsOld()
TRAIN_HEIG = 47; TRAIN_HEIG = 47;
STRING_X_OFFSET = 10; STRING_X_OFFSET = 10;
STRING_Y_OFFSET = 5; STRING_Y_OFFSET = 5;
POP_UP_BOX_Y = 0; POP_UP_BOX_Y = yResOffset + 0;
POP_UP_BOX_WIDTH = 60; POP_UP_BOX_WIDTH = 60;
POP_UP_BOX_HEIGHT = 100; POP_UP_BOX_HEIGHT = 100;
MOUSE_PTR_Y_OFFSET = 3; MOUSE_PTR_Y_OFFSET = 3;
@@ -1285,15 +1285,15 @@ BOOLEAN InitializeInvPanelCoordsOld()
TRAIN_TEXT_Y_OFFSET = 4; TRAIN_TEXT_Y_OFFSET = 4;
// char stat positions // char stat positions
STR_Y = 42; STR_Y = yResOffset + 42;
DEX_X = STR_X; DEX_X = STR_X;
DEX_Y = 32; DEX_Y = yResOffset + 32;
AGL_X = STR_X; AGL_X = STR_X;
AGL_Y = 22; AGL_Y = yResOffset + 22;
LDR_X = STR_X; LDR_X = STR_X;
LDR_Y = 52; LDR_Y = yResOffset + 52;
WIS_X = STR_X; WIS_X = STR_X;
WIS_Y = 62; WIS_Y = yResOffset + 62;
LVL_Y = AGL_Y; LVL_Y = AGL_Y;
MRK_X = LVL_X; MRK_X = LVL_X;
MRK_Y = DEX_Y; MRK_Y = DEX_Y;
@@ -1307,39 +1307,39 @@ BOOLEAN InitializeInvPanelCoordsOld()
STAT_WID = 15; STAT_WID = 15;
STAT_HEI = GetFontHeight(CHAR_FONT); STAT_HEI = GetFontHeight(CHAR_FONT);
PIC_NAME_Y = (66 + 3); PIC_NAME_Y = yResOffset + 66 + 3;
PIC_NAME_HEI = 75 - PIC_NAME_Y; PIC_NAME_HEI = yResOffset + 75 - PIC_NAME_Y;
CHAR_NAME_Y = (2 + 3); CHAR_NAME_Y = yResOffset + 2 + 3;
CHAR_NAME_HEI = 11 - CHAR_NAME_Y; CHAR_NAME_HEI = yResOffset + 11 - CHAR_NAME_Y;
CHAR_LOC_Y = 84; CHAR_LOC_Y = yResOffset + 84;
CHAR_LOC_WID = 16; CHAR_LOC_WID = 16;
CHAR_LOC_HEI = 9; CHAR_LOC_HEI = 9;
CHAR_TIME_REMAINING_Y = 65; CHAR_TIME_REMAINING_Y = yResOffset + 65;
CHAR_TIME_REMAINING_HEI = GetFontHeight(CHAR_FONT); CHAR_TIME_REMAINING_HEI = GetFontHeight(CHAR_FONT);
CHAR_SALARY_X = CHAR_TIME_REMAINING_X; CHAR_SALARY_X = CHAR_TIME_REMAINING_X;
CHAR_SALARY_Y = 79; CHAR_SALARY_Y = yResOffset + 79;
CHAR_SALARY_WID = CHAR_TIME_REMAINING_WID - 8; CHAR_SALARY_WID = CHAR_TIME_REMAINING_WID - 8;
CHAR_SALARY_HEI = CHAR_TIME_REMAINING_HEI; CHAR_SALARY_HEI = CHAR_TIME_REMAINING_HEI;
CHAR_MEDICAL_X = CHAR_TIME_REMAINING_X; CHAR_MEDICAL_X = CHAR_TIME_REMAINING_X;
CHAR_MEDICAL_Y = 93; CHAR_MEDICAL_Y = yResOffset + 93;
CHAR_MEDICAL_WID = CHAR_TIME_REMAINING_WID - 8; CHAR_MEDICAL_WID = CHAR_TIME_REMAINING_WID - 8;
CHAR_MEDICAL_HEI = CHAR_TIME_REMAINING_HEI; CHAR_MEDICAL_HEI = CHAR_TIME_REMAINING_HEI;
CHAR_ASSIGN1_Y = 18; CHAR_ASSIGN1_Y = yResOffset + 18;
CHAR_ASSIGN2_Y = 31; CHAR_ASSIGN2_Y = yResOffset + 31;
CHAR_ASSIGN_WID = 257 - 178; CHAR_ASSIGN_WID = 257 - 178;
CHAR_ASSIGN_HEI = 39 - 29; CHAR_ASSIGN_HEI = 39 - 29;
CHAR_MORALE_HEI = 101 - CHAR_MORALE_Y; CHAR_MORALE_HEI = yResOffset + 101 - CHAR_MORALE_Y;
CHAR_HP_Y = 77 + 3; CHAR_HP_Y = yResOffset + 77 + 3;
CHAR_HP_HEI = 90 - CHAR_HP_Y; CHAR_HP_HEI = yResOffset + 90 - CHAR_HP_Y;
CHAR_MORALE_Y = 91 + 3; CHAR_MORALE_Y = yResOffset + 91 + 3;
CROSS_Y = 83; CROSS_Y = yResOffset + 83;
CROSS_HEIGHT = 20; CROSS_HEIGHT = 20;
CROSS_WIDTH = 20; CROSS_WIDTH = 20;
CHAR_PAY_Y = 80+4; CHAR_PAY_Y = yResOffset + 80 + 4;
CHAR_PAY_HEI = GetFontHeight(CHAR_FONT); CHAR_PAY_HEI = GetFontHeight(CHAR_FONT);
CHAR_PAY_WID = CROSS_X-CHAR_PAY_X; CHAR_PAY_WID = CROSS_X-CHAR_PAY_X;
SOLDIER_PIC_Y = 20; SOLDIER_PIC_Y = yResOffset + 20;
SOLDIER_HAND_Y = 81; SOLDIER_HAND_Y = yResOffset + 81;
gSCamoXY.sX = INV_BODY_X; gSCamoXY.sX = INV_BODY_X;
gSCamoXY.sY = INV_BODY_Y; // X, Y Location of Map screen's Camouflage region gSCamoXY.sY = INV_BODY_Y; // X, Y Location of Map screen's Camouflage region
@@ -1351,8 +1351,8 @@ BOOLEAN InitializeInvPanelCoordsOld()
} }
BOOLEAN InitializeInvPanelCoordsNew() BOOLEAN InitializeInvPanelCoordsNew()
{ {
PLAYER_INFO_Y = 107; PLAYER_INFO_Y = yResOffset + 107;
TOWN_INFO_Y = 1; TOWN_INFO_Y = yResOffset + 1;
PLAYER_INFO_X = xResOffset + 0; PLAYER_INFO_X = xResOffset + 0;
TOWN_INFO_X = xResOffset + 0; TOWN_INFO_X = xResOffset + 0;
@@ -1522,17 +1522,17 @@ BOOLEAN InitializeInvPanelCoordsNew()
INV_BDROP_X = PLAYER_INFO_X + 220; INV_BDROP_X = PLAYER_INFO_X + 220;
INV_BDROP_Y = PLAYER_INFO_Y + 441; INV_BDROP_Y = PLAYER_INFO_Y + 441;
MAP_ARMOR_LABEL_Y = 177; MAP_ARMOR_LABEL_Y = yResOffset + 177;
MAP_ARMOR_Y = 187; MAP_ARMOR_Y = yResOffset + 187;
MAP_ARMOR_PERCENT_Y = 188; MAP_ARMOR_PERCENT_Y = yResOffset + 188;
MAP_WEIGHT_LABEL_Y = 209; MAP_WEIGHT_LABEL_Y = yResOffset + 209;
MAP_WEIGHT_Y = 219; MAP_WEIGHT_Y = yResOffset + 219;
MAP_WEIGHT_PERCENT_Y = 219; MAP_WEIGHT_PERCENT_Y = yResOffset + 219;
MAP_CAMMO_LABEL_Y = 209; MAP_CAMMO_LABEL_Y = yResOffset + 209;
MAP_CAMMO_Y = 219; MAP_CAMMO_Y = yResOffset + 219;
MAP_CAMMO_PERCENT_Y = 219; MAP_CAMMO_PERCENT_Y = yResOffset + 219;
MAP_PERCENT_WIDTH = 20; MAP_PERCENT_WIDTH = 20;
MAP_PERCENT_HEIGHT = 10; MAP_PERCENT_HEIGHT = 10;
@@ -1540,8 +1540,8 @@ BOOLEAN InitializeInvPanelCoordsNew()
MAP_INV_STATS_TITLE_FONT_COLOR = 6; MAP_INV_STATS_TITLE_FONT_COLOR = 6;
MAP_INV_STATS_TEXT_FONT_COLOR = 5; MAP_INV_STATS_TEXT_FONT_COLOR = 5;
PLAYER_INFO_FACE_START_Y = 17; PLAYER_INFO_FACE_START_Y = yResOffset + 17;
PLAYER_INFO_FACE_END_Y = 76; PLAYER_INFO_FACE_END_Y = yResOffset + 76;
INV_BODY_Y = 8 + PLAYER_INFO_Y; INV_BODY_Y = 8 + PLAYER_INFO_Y;
NAME_WIDTH = 51; NAME_WIDTH = 51;
@@ -1553,7 +1553,7 @@ BOOLEAN InitializeInvPanelCoordsNew()
TIME_REMAINING_WIDTH = 28; TIME_REMAINING_WIDTH = 28;
// contract // contract
CONTRACT_Y = 50; CONTRACT_Y = yResOffset + 50;
// trash can // trash can
TRASH_CAN_Y = 59 + PLAYER_INFO_Y; TRASH_CAN_Y = 59 + PLAYER_INFO_Y;
@@ -1561,7 +1561,7 @@ BOOLEAN InitializeInvPanelCoordsNew()
TRASH_CAN_HEIGHT = 239 - 217; TRASH_CAN_HEIGHT = 239 - 217;
// keyring // keyring
MAP_KEYRING_Y = 126; MAP_KEYRING_Y = yResOffset + 126;
//Text offsets //Text offsets
Y_OFFSET = 2; Y_OFFSET = 2;
@@ -1573,7 +1573,7 @@ BOOLEAN InitializeInvPanelCoordsNew()
TRAIN_HEIG = 47; TRAIN_HEIG = 47;
STRING_X_OFFSET = 10; STRING_X_OFFSET = 10;
STRING_Y_OFFSET = 5; STRING_Y_OFFSET = 5;
POP_UP_BOX_Y = 0; POP_UP_BOX_Y = yResOffset + 0;
POP_UP_BOX_WIDTH = 60; POP_UP_BOX_WIDTH = 60;
POP_UP_BOX_HEIGHT = 100; POP_UP_BOX_HEIGHT = 100;
MOUSE_PTR_Y_OFFSET = 3; MOUSE_PTR_Y_OFFSET = 3;
@@ -1581,15 +1581,15 @@ BOOLEAN InitializeInvPanelCoordsNew()
TRAIN_TEXT_Y_OFFSET = 4; TRAIN_TEXT_Y_OFFSET = 4;
// char stat positions // char stat positions
STR_Y = 42; STR_Y = yResOffset + 42;
DEX_X = STR_X; DEX_X = STR_X;
DEX_Y = 32; DEX_Y = yResOffset + 32;
AGL_X = STR_X; AGL_X = STR_X;
AGL_Y = 22; AGL_Y = yResOffset + 22;
LDR_X = STR_X; LDR_X = STR_X;
LDR_Y = 52; LDR_Y = yResOffset + 52;
WIS_X = STR_X; WIS_X = STR_X;
WIS_Y = 62; WIS_Y = yResOffset + 62;
LVL_Y = AGL_Y; LVL_Y = AGL_Y;
MRK_X = LVL_X; MRK_X = LVL_X;
MRK_Y = DEX_Y; MRK_Y = DEX_Y;
@@ -1603,46 +1603,46 @@ BOOLEAN InitializeInvPanelCoordsNew()
STAT_WID = 15; STAT_WID = 15;
STAT_HEI = GetFontHeight(CHAR_FONT); STAT_HEI = GetFontHeight(CHAR_FONT);
PIC_NAME_Y = (66 + 3); PIC_NAME_Y = yResOffset + 66 + 3;
PIC_NAME_WID = 52; PIC_NAME_WID = 52;
PIC_NAME_HEI = 75 - PIC_NAME_Y; PIC_NAME_HEI = yResOffset + 75 - PIC_NAME_Y;
CHAR_NAME_Y = (2 + 3); CHAR_NAME_Y = yResOffset + 2 + 3;
CHAR_NAME_WID = 150; CHAR_NAME_WID = 150;
CHAR_NAME_HEI = 11 - CHAR_NAME_Y; CHAR_NAME_HEI = yResOffset + 11 - CHAR_NAME_Y;
CHAR_LOC_Y = 84; CHAR_LOC_Y = yResOffset + 84;
CHAR_LOC_WID = 16; CHAR_LOC_WID = 16;
CHAR_LOC_HEI = 9; CHAR_LOC_HEI = 9;
CHAR_TIME_REMAINING_Y = 65; CHAR_TIME_REMAINING_Y = yResOffset + 65;
CHAR_TIME_REMAINING_WID = 51; CHAR_TIME_REMAINING_WID = 51;
CHAR_TIME_REMAINING_HEI = GetFontHeight(CHAR_FONT); CHAR_TIME_REMAINING_HEI = GetFontHeight(CHAR_FONT);
CHAR_SALARY_X = CHAR_TIME_REMAINING_X; CHAR_SALARY_X = CHAR_TIME_REMAINING_X;
CHAR_SALARY_Y = 79; CHAR_SALARY_Y = yResOffset + 79;
CHAR_SALARY_WID = CHAR_TIME_REMAINING_WID - 8; CHAR_SALARY_WID = CHAR_TIME_REMAINING_WID - 8;
CHAR_SALARY_HEI = CHAR_TIME_REMAINING_HEI; CHAR_SALARY_HEI = CHAR_TIME_REMAINING_HEI;
CHAR_MEDICAL_X = CHAR_TIME_REMAINING_X; CHAR_MEDICAL_X = CHAR_TIME_REMAINING_X;
CHAR_MEDICAL_Y = 93; CHAR_MEDICAL_Y = yResOffset + 93;
CHAR_MEDICAL_WID = CHAR_TIME_REMAINING_WID - 8; CHAR_MEDICAL_WID = CHAR_TIME_REMAINING_WID - 8;
CHAR_MEDICAL_HEI = CHAR_TIME_REMAINING_HEI; CHAR_MEDICAL_HEI = CHAR_TIME_REMAINING_HEI;
CHAR_ASSIGN1_Y = 18; CHAR_ASSIGN1_Y = yResOffset + 18;
CHAR_ASSIGN2_Y = 31; CHAR_ASSIGN2_Y = yResOffset + 31;
CHAR_ASSIGN_WID = 257 - 178; CHAR_ASSIGN_WID = 257 - 178;
CHAR_ASSIGN_HEI = 39 - 29; CHAR_ASSIGN_HEI = 39 - 29;
CHAR_HP_Y = 77 + 3; CHAR_HP_Y = yResOffset + 77 + 3;
CHAR_HP_WID = 42; CHAR_HP_WID = 42;
CHAR_HP_HEI = 90 - CHAR_HP_Y; CHAR_HP_HEI = yResOffset + 90 - CHAR_HP_Y;
CHAR_MORALE_Y = 91 + 3; CHAR_MORALE_Y = yResOffset + 91 + 3;
CHAR_MORALE_WID = 42; CHAR_MORALE_WID = 42;
CHAR_MORALE_HEI = 101 - CHAR_MORALE_Y; CHAR_MORALE_HEI = yResOffset + 101 - CHAR_MORALE_Y;
CROSS_Y = 83; CROSS_Y = yResOffset + 83;
CROSS_HEIGHT = 20; CROSS_HEIGHT = 20;
CROSS_WIDTH = 20; CROSS_WIDTH = 20;
CHAR_PAY_Y = 80+4; CHAR_PAY_Y = yResOffset + 80 + 4;
CHAR_PAY_HEI = GetFontHeight(CHAR_FONT); CHAR_PAY_HEI = GetFontHeight(CHAR_FONT);
CHAR_PAY_WID = CROSS_X-CHAR_PAY_X; CHAR_PAY_WID = CROSS_X-CHAR_PAY_X;
SOLDIER_PIC_Y = 20; SOLDIER_PIC_Y = yResOffset + 20;
SOLDIER_HAND_Y = 81; SOLDIER_HAND_Y = yResOffset + 81;
gSCamoXY.sX = INV_BODY_X; gSCamoXY.sX = INV_BODY_X;
gSCamoXY.sY = INV_BODY_Y; // X, Y Location of Map screen's Camouflage region gSCamoXY.sY = INV_BODY_Y; // X, Y Location of Map screen's Camouflage region
@@ -1658,26 +1658,26 @@ void InitializeMPCoordinates()
//OJW - MP interface changes //OJW - MP interface changes
if (iResolution >= _640x480 && iResolution < _800x600) if (iResolution >= _640x480 && iResolution < _800x600)
{ {
MP_BTN_Y = 268; MP_BTN_Y = 268 + yResOffset;
} }
else if (iResolution < _1024x768) else if (iResolution < _1024x768)
{ {
MP_BTN_Y = 386; MP_BTN_Y = 386 + yResOffset;
} }
else else
{ {
MP_BTN_Y = 554; MP_BTN_Y = 554 + yResOffset;
} }
MP_ROWSTART_Y = MP_BTN_Y + 21; MP_ROWSTART_Y = MP_BTN_Y + 21;
MP_PLAYER_X = 5 + xResOffset; MP_PLAYER_X = 5 + xResOffset;
MP_PLAYER_W = 75; MP_PLAYER_W = 75 + yResOffset;
MP_TEAM_X = 84 + xResOffset; MP_TEAM_X = 84 + xResOffset;
MP_TEAM_W = 40; MP_TEAM_W = 40 + yResOffset;
MP_COMPASS_X = 130 + xResOffset; MP_COMPASS_X = 130 + xResOffset;
MP_COMPASS_W = 19; MP_COMPASS_W = 19 + yResOffset;
MP_GAMEINFO_X = 154 + xResOffset; MP_GAMEINFO_X = 154 + xResOffset;
MP_GAMEINFO_W = 81; MP_GAMEINFO_W = 81 + yResOffset;
// End of MP interface changes // End of MP interface changes
} }
@@ -1951,7 +1951,7 @@ void GlowFace( void )
if( fOldFaceGlow == TRUE ) if( fOldFaceGlow == TRUE )
{ {
RestoreExternBackgroundRect( xResOffset + 9, 18, 52, ( UINT16 )( 46 ) ); RestoreExternBackgroundRect( xResOffset + 9, yResOffset + 18, 52, ( UINT16 )( 46 ) );
} }
fOldFaceGlow = FALSE; fOldFaceGlow = FALSE;
@@ -1981,13 +1981,13 @@ void GlowFace( void )
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
RectangleDraw( TRUE, xResOffset + 9, 18, xResOffset + 60, 63 , usColor, pDestBuf ); RectangleDraw( TRUE, xResOffset + 9, yResOffset + 18, xResOffset + 60, yResOffset + 63 , usColor, pDestBuf );
InvalidateRegion( xResOffset + 9, 18, xResOffset + 61, 64 ); InvalidateRegion( xResOffset + 9, yResOffset + 18, xResOffset + 61, yResOffset + 64 );
UnLockVideoSurface( FRAME_BUFFER ); UnLockVideoSurface( FRAME_BUFFER );
// restore background // restore background
if((iColorNum==0)||(iColorNum==1)) if((iColorNum==0)||(iColorNum==1))
RestoreExternBackgroundRect( xResOffset + 9, 18, 61 - 9 , ( UINT16 )( 64 - 18 ) ); RestoreExternBackgroundRect( xResOffset + 9, yResOffset + 18, 61 - 9 , ( UINT16 )( 64 - 18 ) );
} }
@@ -2038,7 +2038,7 @@ void GlowItem( void )
// restore background // restore background
if((iColorNum==0)||(iColorNum==1)) if((iColorNum==0)||(iColorNum==1))
{ {
RestoreExternBackgroundRect( xResOffset + 3, 80, (65 - 3 ), ( UINT16 )( 105 - 80 ) ); RestoreExternBackgroundRect( xResOffset + 3, yResOffset + 80, (65 - 3 ), ( UINT16 )( 105 - 80 ) );
RenderHandPosItem(); RenderHandPosItem();
} }
@@ -2046,8 +2046,8 @@ void GlowItem( void )
usColor=Get16BPPColor( FROMRGB( GlowColorsA[iColorNum].ubRed, GlowColorsA[iColorNum].ubGreen, GlowColorsA[iColorNum].ubBlue ) ); usColor=Get16BPPColor( FROMRGB( GlowColorsA[iColorNum].ubRed, GlowColorsA[iColorNum].ubGreen, GlowColorsA[iColorNum].ubBlue ) );
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
RectangleDraw( TRUE, xResOffset + 3, 80, xResOffset + 64, 104 , usColor, pDestBuf ); RectangleDraw( TRUE, xResOffset + 3, yResOffset + 80, xResOffset + 64, yResOffset + 104 , usColor, pDestBuf );
InvalidateRegion( xResOffset + 3, 80, xResOffset + 65, 105 ); InvalidateRegion( xResOffset + 3, yResOffset + 80, xResOffset + 65, yResOffset + 105 );
UnLockVideoSurface( FRAME_BUFFER ); UnLockVideoSurface( FRAME_BUFFER );
} }
@@ -2197,21 +2197,21 @@ void RenderIconsForUpperLeftCornerPiece( INT8 bCharNumber )
if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
{ {
// finite contract length icon // finite contract length icon
BltVideoObject( guiSAVEBUFFER, hHandle, 0, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hHandle, 0, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
// if merc has life insurance // if merc has life insurance
if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].usLifeInsurance > 0 ) if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].usLifeInsurance > 0 )
{ {
// draw life insurance icon // draw life insurance icon
BltVideoObject( guiSAVEBUFFER, hHandle, 2, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hHandle, 2, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + CHAR_ICON_SPACING + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
// if merc has a medical deposit // if merc has a medical deposit
if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].usMedicalDeposit > 0 ) if( Menptr[ gCharactersList[ bCharNumber ].usSolID ].usMedicalDeposit > 0 )
{ {
// draw medical deposit icon // draw medical deposit icon
BltVideoObject( guiSAVEBUFFER, hHandle, 1, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ), VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObject( guiSAVEBUFFER, hHandle, 1, CHAR_ICON_X + xResOffset, CHAR_ICON_CONTRACT_Y + ( 2 * CHAR_ICON_SPACING ) + yResOffset, VO_BLT_SRCTRANSPARENCY, NULL );
} }
} }
@@ -2288,20 +2288,20 @@ void DrawCharBars( void )
} }
// current health // current health
DrawLifeUIBarEx( pSoldier, BAR_INFO_X + xResOffset, BAR_INFO_Y,3,42, TRUE, FRAME_BUFFER ); DrawLifeUIBarEx( pSoldier, BAR_INFO_X + xResOffset, BAR_INFO_Y + yResOffset,3,42, TRUE, FRAME_BUFFER );
// robot doesn't have energy/fuel // robot doesn't have energy/fuel
if ( !AM_A_ROBOT( pSoldier ) ) if ( !AM_A_ROBOT( pSoldier ) )
{ {
// current energy/fuel // current energy/fuel
DrawBreathUIBarEx( pSoldier, BAR_INFO_X + xResOffset + 6, BAR_INFO_Y,3,42, TRUE, FRAME_BUFFER ); DrawBreathUIBarEx( pSoldier, BAR_INFO_X + xResOffset + 6, BAR_INFO_Y + yResOffset,3,42, TRUE, FRAME_BUFFER );
} }
// vehicles and robot don't have morale // vehicles and robot don't have morale
if ( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && !AM_A_ROBOT( pSoldier ) ) if ( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && !AM_A_ROBOT( pSoldier ) )
{ {
// draw morale bar // draw morale bar
DrawMoraleUIBarEx( pSoldier, BAR_INFO_X + xResOffset + 12, BAR_INFO_Y,3,42, TRUE, FRAME_BUFFER ); DrawMoraleUIBarEx( pSoldier, BAR_INFO_X + xResOffset + 12, BAR_INFO_Y + yResOffset,3,42, TRUE, FRAME_BUFFER );
} }
} }
@@ -4619,8 +4619,8 @@ UINT32 MapScreenHandle(void)
// Helicopter ETA box // Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset); MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset) - yResOffset; MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset);
MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset) - yResOffset; MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset);
MAP_HELICOPTER_ETA_POPUP_WIDTH = 120; MAP_HELICOPTER_ETA_POPUP_WIDTH = 120;
MAP_HELICOPTER_ETA_POPUP_HEIGHT = 68; MAP_HELICOPTER_ETA_POPUP_HEIGHT = 68;
MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 74; MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 74;
@@ -4641,7 +4641,7 @@ UINT32 MapScreenHandle(void)
MAP_GRID_Y = 25; MAP_GRID_Y = 25;
MAP_BORDER_X_OFFSET = (SCREEN_WIDTH - 800)/ 2 +(((800 - 261) - 540) / 2); MAP_BORDER_X_OFFSET = (SCREEN_WIDTH - 800)/ 2 +(((800 - 261) - 540) / 2);
MAP_BORDER_Y_OFFSET = (((600 - 121) - 480) / 2); MAP_BORDER_Y_OFFSET = (SCREEN_HEIGHT - 600)/ 2 +(((600 - 121) - 480) / 2);
MAP_VIEW_START_X = (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9); MAP_VIEW_START_X = (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9);
MAP_VIEW_START_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10); MAP_VIEW_START_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10);
@@ -4663,7 +4663,7 @@ UINT32 MapScreenHandle(void)
ETA_FONT = BLOCKFONT2; ETA_FONT = BLOCKFONT2;
// standard ETA box // standard ETA box
CLOCK_Y_START = (250 + iScreenHeightOffset + 108) - yResOffset; CLOCK_Y_START = (250 + iScreenHeightOffset + 108);
DEST_PLOT_X = (400 + iScreenWidthOffset + 10); DEST_PLOT_X = (400 + iScreenWidthOffset + 10);
DEST_PLOT_Y = (250 + iScreenHeightOffset + 148) - yResOffset; DEST_PLOT_Y = (250 + iScreenHeightOffset + 148) - yResOffset;
CLOCK_ETA_X = (400 + iScreenWidthOffset + 30); CLOCK_ETA_X = (400 + iScreenWidthOffset + 30);
@@ -4672,15 +4672,15 @@ UINT32 MapScreenHandle(void)
// Helicopter ETA box // Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset); MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 58) - yResOffset; MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 58);
MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset - 40) - yResOffset; MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset - 40);
MAP_HELICOPTER_ETA_POPUP_WIDTH = 120; MAP_HELICOPTER_ETA_POPUP_WIDTH = 120;
MAP_HELICOPTER_ETA_POPUP_HEIGHT = 68; MAP_HELICOPTER_ETA_POPUP_HEIGHT = 68;
MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 74; MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 74;
// Map Level string // Map Level string
MAP_LEVEL_STRING_X = (SCREEN_WIDTH - 800)/ 2 + (800 - 208 - 80); MAP_LEVEL_STRING_X = (SCREEN_WIDTH - 800)/ 2 + (800 - 208 - 80);
MAP_LEVEL_STRING_Y = 600 -175; MAP_LEVEL_STRING_Y = (SCREEN_WIDTH - 600)/ 2 + (600 - 175);
strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_800x600.pcx"); strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_800x600.pcx");
} }
@@ -4694,7 +4694,7 @@ UINT32 MapScreenHandle(void)
MAP_GRID_Y = 35; MAP_GRID_Y = 35;
MAP_BORDER_X_OFFSET = (SCREEN_WIDTH - 1024)/ 2 +(((1024 - 261) - 764) / 2); MAP_BORDER_X_OFFSET = (SCREEN_WIDTH - 1024)/ 2 +(((1024 - 261) - 764) / 2);
MAP_BORDER_Y_OFFSET = (((768 - 121) - 648) / 2); MAP_BORDER_Y_OFFSET = (SCREEN_HEIGHT - 768)/ 2 +(((768 - 121) - 648) / 2);
MAP_VIEW_START_X = (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9); MAP_VIEW_START_X = (MAP_BORDER_X + MAP_BORDER_X_OFFSET + 9);
MAP_VIEW_START_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10); MAP_VIEW_START_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 10);
@@ -4715,24 +4715,24 @@ UINT32 MapScreenHandle(void)
ETA_FONT = FONT12ARIAL; ETA_FONT = FONT12ARIAL;
// standard ETA box // standard ETA box
CLOCK_Y_START = (250 + iScreenHeightOffset + 190) - yResOffset; CLOCK_Y_START = (250 + iScreenHeightOffset + 190);
DEST_PLOT_X = (400 + iScreenWidthOffset + 10); DEST_PLOT_X = (400 + iScreenWidthOffset + 10);
DEST_PLOT_Y = (250 + iScreenHeightOffset + 240) - yResOffset; DEST_PLOT_Y = (250 + iScreenHeightOffset + 240);
CLOCK_ETA_X = (400 + iScreenWidthOffset + 30); CLOCK_ETA_X = (400 + iScreenWidthOffset + 30);
CLOCK_HOUR_X_START = (400 + iScreenWidthOffset + 68); CLOCK_HOUR_X_START = (400 + iScreenWidthOffset + 68);
CLOCK_MIN_X_START = (400 + iScreenWidthOffset + 84); CLOCK_MIN_X_START = (400 + iScreenWidthOffset + 84);
// Helicopter ETA box // Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset); MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 120) - yResOffset; MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 120);
MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset - 100) - yResOffset; MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset - 100);
MAP_HELICOPTER_ETA_POPUP_WIDTH = 120; MAP_HELICOPTER_ETA_POPUP_WIDTH = 120;
MAP_HELICOPTER_ETA_POPUP_HEIGHT = 76; MAP_HELICOPTER_ETA_POPUP_HEIGHT = 76;
MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 97; MAP_HELICOPTER_ETA_POPUP_ALTERNATE_HEIGHT = 97;
// Map Level string // Map Level string
MAP_LEVEL_STRING_X = (SCREEN_WIDTH - 1024)/ 2 + (1024 - 208 - 187); MAP_LEVEL_STRING_X = (SCREEN_WIDTH - 1024)/ 2 + (1024 - 208 - 187);
MAP_LEVEL_STRING_Y = 768 - 175; MAP_LEVEL_STRING_Y = (SCREEN_HEIGHT - 768)/ 2 + (768 - 175);
strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_1024x768.pcx"); strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_1024x768.pcx");
} }
@@ -5111,7 +5111,7 @@ UINT32 MapScreenHandle(void)
MSYS_DefineRegion( &gMapViewRegion, MAP_VIEW_START_X + MAP_GRID_X, MAP_VIEW_START_Y + MAP_GRID_Y,MAP_VIEW_START_X + MAP_VIEW_WIDTH+MAP_GRID_X-1, MAP_VIEW_START_Y + MAP_VIEW_HEIGHT-1 + 8, MSYS_PRIORITY_HIGH - 3, MSYS_DefineRegion( &gMapViewRegion, MAP_VIEW_START_X + MAP_GRID_X, MAP_VIEW_START_Y + MAP_GRID_Y,MAP_VIEW_START_X + MAP_VIEW_WIDTH+MAP_GRID_X-1, MAP_VIEW_START_Y + MAP_VIEW_HEIGHT-1 + 8, MSYS_PRIORITY_HIGH - 3,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK ); MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
MSYS_DefineRegion( &gCharInfoHandRegion, ((INT16)( xResOffset + 4 )), ((INT16)( 81 )) ,((INT16)(xResOffset + 62)), ((INT16)(103)), MSYS_PRIORITY_HIGH, MSYS_DefineRegion( &gCharInfoHandRegion, ((INT16)( xResOffset + 4 )), ((INT16)( yResOffset + 81 )) ,((INT16)( xResOffset + 62 )), ((INT16)( yResOffset + 103 )), MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, ItemRegionMvtCallback , ItemRegionBtnCallback ); MSYS_NO_CURSOR, ItemRegionMvtCallback , ItemRegionBtnCallback );
MSYS_DefineRegion( &gCharInfoFaceRegion, (INT16) PLAYER_INFO_FACE_START_X, (INT16) PLAYER_INFO_FACE_START_Y, (INT16) PLAYER_INFO_FACE_END_X, (INT16) PLAYER_INFO_FACE_END_Y, MSYS_PRIORITY_HIGH, MSYS_DefineRegion( &gCharInfoFaceRegion, (INT16) PLAYER_INFO_FACE_START_X, (INT16) PLAYER_INFO_FACE_START_Y, (INT16) PLAYER_INFO_FACE_END_X, (INT16) PLAYER_INFO_FACE_END_Y, MSYS_PRIORITY_HIGH,
@@ -9106,7 +9106,7 @@ void PopupText( STR16 pFontString, ... )
FindFontCenterCoordinates( 0, 0, SCREEN_WIDTH, INTERFACE_START_Y, PopupString, LARGEFONT1, &sX, &sY ); FindFontCenterCoordinates( 0, 0, SCREEN_WIDTH, INTERFACE_START_Y, PopupString, LARGEFONT1, &sX, &sY );
BltVideoSurface( FRAME_BUFFER, guiINTEXT, 0, xResOffset + 85, 160, VS_BLT_FAST | VS_BLT_USECOLORKEY, NULL ); BltVideoSurface( FRAME_BUFFER, guiINTEXT, 0, xResOffset + 85, yResOffset + 160, VS_BLT_FAST | VS_BLT_USECOLORKEY, NULL );
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES); pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES);
@@ -9985,30 +9985,30 @@ void RenderAttributeStringsForUpperLeftHandCorner( UINT32 uiBufferToRenderTo )
SetFontDestBuffer( uiBufferToRenderTo, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( uiBufferToRenderTo, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
// assignment strings // assignment strings
DrawString( pUpperLeftMapScreenStrings[ 0 ], (UINT16)(xResOffset + 220 - StringPixLength( pUpperLeftMapScreenStrings[0], CHAR_FONT)/2), 6, CHAR_FONT); DrawString( pUpperLeftMapScreenStrings[ 0 ], (UINT16)(xResOffset + 220 - StringPixLength( pUpperLeftMapScreenStrings[0], CHAR_FONT)/2), yResOffset + 6, CHAR_FONT);
// vehicles and robot don't have attributes, contracts, or morale // vehicles and robot don't have attributes, contracts, or morale
if ( ( pSoldier == NULL ) || ( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && !AM_A_ROBOT( pSoldier ) ) ) if ( ( pSoldier == NULL ) || ( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && !AM_A_ROBOT( pSoldier ) ) )
{ {
// health // health
DrawString(pUpperLeftMapScreenStrings[ 2 ], xResOffset + 87, 80, CHAR_FONT); DrawString(pUpperLeftMapScreenStrings[ 2 ], xResOffset + 87, yResOffset + 80, CHAR_FONT);
for( iCounter = 0; iCounter < 5; iCounter++ ) for( iCounter = 0; iCounter < 5; iCounter++ )
{ {
DrawString(pShortAttributeStrings[ iCounter ], xResOffset + 88, ( INT16 )( 22 + iCounter * 10 ) ,CHAR_FONT ); DrawString(pShortAttributeStrings[ iCounter ], xResOffset + 88, ( INT16 )( yResOffset + 22 + iCounter * 10 ) ,CHAR_FONT );
DrawString(pShortAttributeStrings[ iCounter + 5 ] ,xResOffset + 133, ( INT16 )( 22 + iCounter * 10 ), CHAR_FONT ); DrawString(pShortAttributeStrings[ iCounter + 5 ] ,xResOffset + 133, ( INT16 )( yResOffset + 22 + iCounter * 10 ), CHAR_FONT );
} }
// contract // contract
//DrawString(pUpperLeftMapScreenStrings[ 1 ], 194, 52, CHAR_FONT); //DrawString(pUpperLeftMapScreenStrings[ 1 ], 194, 52, CHAR_FONT);
// morale // morale
DrawString(pUpperLeftMapScreenStrings[ 3 ], xResOffset + 87, 94, CHAR_FONT); DrawString(pUpperLeftMapScreenStrings[ 3 ], xResOffset + 87, yResOffset + 94, CHAR_FONT);
} }
else else
{ {
// condition // condition
DrawString(pUpperLeftMapScreenStrings[ 4 ], xResOffset + 87, 80, CHAR_FONT); DrawString(pUpperLeftMapScreenStrings[ 4 ], xResOffset + 87, yResOffset + 80, CHAR_FONT);
} }
// restore buffer // restore buffer
@@ -10273,27 +10273,27 @@ void CreateMouseRegionsForTeamList( void )
sYAdd = 0; sYAdd = 0;
// name region // name region
MSYS_DefineRegion( &gTeamListNameRegion[ sCounter ] , NAME_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), NAME_X + NAME_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL, MSYS_DefineRegion( &gTeamListNameRegion[ sCounter ], NAME_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), NAME_X + NAME_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL,
MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack );
// assignment region // assignment region
MSYS_DefineRegion( &gTeamListAssignmentRegion[ sCounter ] ,ASSIGN_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), ASSIGN_X + ASSIGN_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1, MSYS_DefineRegion( &gTeamListAssignmentRegion[ sCounter ], ASSIGN_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), ASSIGN_X + ASSIGN_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1,
MSYS_NO_CURSOR, TeamListAssignmentRegionMvtCallBack, TeamListAssignmentRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListAssignmentRegionMvtCallBack, TeamListAssignmentRegionBtnCallBack );
// location region (same function as name regions, so uses the same callbacks) // location region (same function as name regions, so uses the same callbacks)
MSYS_DefineRegion( &gTeamListLocationRegion[ sCounter ] , LOC_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), LOC_X + LOC_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1, MSYS_DefineRegion( &gTeamListLocationRegion[ sCounter ], LOC_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), LOC_X + LOC_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1,
MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack );
// destination region // destination region
MSYS_DefineRegion( &gTeamListDestinationRegion[ sCounter ] ,DEST_ETA_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), DEST_ETA_X + DEST_ETA_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1, MSYS_DefineRegion( &gTeamListDestinationRegion[ sCounter ], DEST_ETA_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd ), DEST_ETA_X + DEST_ETA_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1,
MSYS_NO_CURSOR, TeamListDestinationRegionMvtCallBack, TeamListDestinationRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListDestinationRegionMvtCallBack, TeamListDestinationRegionBtnCallBack );
// contract region // contract region
MSYS_DefineRegion( &gTeamListContractRegion[ sCounter ] ,TIME_REMAINING_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), TIME_REMAINING_X + TIME_REMAINING_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1, MSYS_DefineRegion( &gTeamListContractRegion[ sCounter ], TIME_REMAINING_X , ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), TIME_REMAINING_X + TIME_REMAINING_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1,
MSYS_NO_CURSOR, TeamListContractRegionMvtCallBack, TeamListContractRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListContractRegionMvtCallBack, TeamListContractRegionBtnCallBack );
// contract region // sleep region
MSYS_DefineRegion( &gTeamListSleepRegion[ sCounter ] ,SLEEP_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), SLEEP_X + SLEEP_WIDTH, ( INT16 )( 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1, MSYS_DefineRegion( &gTeamListSleepRegion[ sCounter ], SLEEP_X, ( INT16 )( Y_START + ( sCounter ) * ( Y_SIZE + 2 ) + sYAdd), SLEEP_X + SLEEP_WIDTH, ( INT16 )( yResOffset + 145 + ( sCounter + 1 ) * ( Y_SIZE + 2 ) + sYAdd ), MSYS_PRIORITY_NORMAL + 1,
MSYS_NO_CURSOR, TeamListSleepRegionMvtCallBack, TeamListSleepRegionBtnCallBack ); MSYS_NO_CURSOR, TeamListSleepRegionMvtCallBack, TeamListSleepRegionBtnCallBack );
@@ -11619,19 +11619,19 @@ void RenderTeamRegionBackground( void )
// restore background for area // restore background for area
if(fShowInventoryFlag == TRUE && UsingNewInventorySystem() == false) if(fShowInventoryFlag == TRUE && UsingNewInventorySystem() == false)
{ {
RestoreExternBackgroundRect( 0 + xResOffset, 107, 261, SCREEN_HEIGHT - 107 - 121 - 2 * yResOffset); RestoreExternBackgroundRect( 0 + xResOffset, 107 + yResOffset, 261, SCREEN_HEIGHT - 107 - 121 - yResOffset);
} }
else if(fShowInventoryFlag == TRUE && iResolution >= _640x480 && iResolution < _800x600) else if(fShowInventoryFlag == TRUE && iResolution >= _640x480 && iResolution < _800x600)
{ {
RestoreExternBackgroundRect( 0 + xResOffset, 107, 261, SCREEN_HEIGHT - 107 - 2 * yResOffset ); RestoreExternBackgroundRect( 0 + xResOffset, 107 + yResOffset, 261, SCREEN_HEIGHT - 107 - yResOffset );
} }
else if(fShowInventoryFlag == TRUE && iResolution < _1024x768) else if(fShowInventoryFlag == TRUE && iResolution < _1024x768)
{ {
RestoreExternBackgroundRect( 0 + xResOffset, 107, 261, SCREEN_HEIGHT - 107 - 2 * yResOffset ); RestoreExternBackgroundRect( 0 + xResOffset, 107 + yResOffset, 261, SCREEN_HEIGHT - 107 - yResOffset );
} }
else if(fShowInventoryFlag == FALSE || iResolution >= _1024x768) else if(fShowInventoryFlag == FALSE || iResolution >= _1024x768)
{ {
RestoreExternBackgroundRect( 0 + xResOffset, 107, 261, SCREEN_HEIGHT - 107 - 121 - 2 * yResOffset ); RestoreExternBackgroundRect( 0 + xResOffset, 107 + yResOffset, 261, SCREEN_HEIGHT - 107 - 121 - yResOffset );
} }
MapscreenMarkButtonsDirty(); MapscreenMarkButtonsDirty();
@@ -11684,7 +11684,7 @@ void RenderCharacterInfoBackground( void )
MarkAllBoxesAsAltered( ); MarkAllBoxesAsAltered( );
// restore background for area // restore background for area
RestoreExternBackgroundRect( xResOffset + 0, 0, 261, 107 ); RestoreExternBackgroundRect( xResOffset + 0, yResOffset + 0, 261, 107 );
} }
void DetermineIfContractMenuCanBeShown( void ) void DetermineIfContractMenuCanBeShown( void )
@@ -13455,7 +13455,7 @@ void CreateDestroyMapCharacterScrollButtons( void )
giCharInfoButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,11,4,-1,6,-1 ); giCharInfoButtonImage[ 0 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,11,4,-1,6,-1 );
// set the button value // set the button value
giCharInfoButton[ 0 ] = QuickCreateButton( giCharInfoButtonImage[ 0 ], xResOffset + 67, 69, giCharInfoButton[ 0 ] = QuickCreateButton( giCharInfoButtonImage[ 0 ], xResOffset + 67, yResOffset + 69,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)PrevInventoryMapBtnCallback ); BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)PrevInventoryMapBtnCallback );
@@ -13463,7 +13463,7 @@ void CreateDestroyMapCharacterScrollButtons( void )
giCharInfoButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,12,5,-1,7,-1 ); giCharInfoButtonImage[ 1 ]= LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,12,5,-1,7,-1 );
// set the button value // set the button value
giCharInfoButton[ 1 ] = QuickCreateButton( giCharInfoButtonImage[ 1 ], xResOffset + 67, 87, giCharInfoButton[ 1 ] = QuickCreateButton( giCharInfoButtonImage[ 1 ], xResOffset + 67, yResOffset + 87,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)NextInventoryMapBtnCallback ); BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)NextInventoryMapBtnCallback );
@@ -13647,7 +13647,7 @@ void AddTeamPanelSortButtonsForMapScreen( void )
{ {
giMapSortButtonImage[ iCounter ] = LoadButtonImage( filename, -1, iImageIndex[ iCounter ] , -1, iImageIndex[ iCounter ] + 6 , -1 ); giMapSortButtonImage[ iCounter ] = LoadButtonImage( filename, -1, iImageIndex[ iCounter ] , -1, iImageIndex[ iCounter ] + 6 , -1 );
giMapSortButton[ iCounter ]= QuickCreateButton( giMapSortButtonImage[ iCounter ], ( INT16 )( xResOffset + gMapSortButtons[ iCounter ].iX ), ( INT16 )( gMapSortButtons[ iCounter ].iY ), giMapSortButton[ iCounter ]= QuickCreateButton( giMapSortButtonImage[ iCounter ], ( INT16 )( xResOffset + gMapSortButtons[ iCounter ].iX ), ( INT16 )( yResOffset + gMapSortButtons[ iCounter ].iY ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5, BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 5,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapSortBtnCallback ); (GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapSortBtnCallback );
Tactical/Dialogue Control.cpp
+3 -2
View File
@@ -2710,7 +2710,7 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
if ( guiCurrentScreen == MAP_SCREEN ) if ( guiCurrentScreen == MAP_SCREEN )
{ {
sLeft = ( gsExternPanelXPosition + 97 + xResOffset ); sLeft = ( gsExternPanelXPosition + 97 + xResOffset );
gsTopPosition = gsExternPanelYPosition; gsTopPosition = gsExternPanelYPosition + yResOffset;
} }
else else
{ {
@@ -2742,6 +2742,7 @@ void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuote
else else
{ {
sLeft = 110 + xResOffset; sLeft = 110 + xResOffset;
gsTopPosition += yResOffset;
} }
//previous version //previous version
@@ -2843,7 +2844,7 @@ void HandleExternNPCSpeechFace( INT32 iIndex )
// Setup video overlay! // Setup video overlay!
VideoOverlayDesc.sLeft = gsExternPanelXPosition + xResOffset; VideoOverlayDesc.sLeft = gsExternPanelXPosition + xResOffset;
VideoOverlayDesc.sTop = gsExternPanelYPosition; VideoOverlayDesc.sTop = gsExternPanelYPosition + yResOffset;
VideoOverlayDesc.sRight = VideoOverlayDesc.sLeft + 99; VideoOverlayDesc.sRight = VideoOverlayDesc.sLeft + 99;
VideoOverlayDesc.sBottom = VideoOverlayDesc.sTop + 98; VideoOverlayDesc.sBottom = VideoOverlayDesc.sTop + 98;
Tactical/Interface Items.cpp
+2 -2
View File
@@ -1365,12 +1365,12 @@ BOOLEAN InitInvSlotInterface( INV_REGION_DESC *pRegionDesc , INV_REGION_DESC *pC
if(UsingNewAttachmentSystem() == true) if(UsingNewAttachmentSystem() == true)
{ {
gMoneyButtonLoc.x = 186 + INTERFACE_START_X; gMoneyButtonLoc.x = 186 + INTERFACE_START_X;
gMoneyButtonLoc.y = 170; gMoneyButtonLoc.y = 170 + yResOffset;
} }
else else
{ {
gMoneyButtonLoc.x = 174 + INTERFACE_START_X; gMoneyButtonLoc.x = 174 + INTERFACE_START_X;
gMoneyButtonLoc.y = 115; gMoneyButtonLoc.y = 115 + yResOffset;
} }
} }
else if ( UsingEDBSystem() > 0 ) else if ( UsingEDBSystem() > 0 )
TileEngine/Buildings.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ UINT8 gubNumberOfBuildings;
BUILDING * CreateNewBuilding( UINT8 * pubBuilding ) BUILDING * CreateNewBuilding( UINT8 * pubBuilding )
{ {
if (gubNumberOfBuildings + 1 >= MAX_BUILDINGS) if (gubNumberOfBuildings >= MAX_BUILDINGS)
{ {
return( NULL ); return( NULL );
} }
@@ -254,7 +254,7 @@ INT32 FindClosestClimbPoint( SOLDIERTYPE *pSoldier, INT32 sStartGridNo, INT32 sD
BUILDING * CreateNewBuilding( UINT8 * pubBuilding ) BUILDING * CreateNewBuilding( UINT8 * pubBuilding )
{ {
if (gubNumberOfBuildings + 1 >= MAX_BUILDINGS) if (gubNumberOfBuildings >= MAX_BUILDINGS)
{ {
return( NULL ); return( NULL );
} }