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

- Fixed 'Subtotal' disappearing in BR when all items out of stock/not available yet (by Buggler)

Browse Source 
- Added new shortcut 'u' which opens selected sector inventory screen when item filter is active in strategic screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-10-11 14:46:27 +00:00
parent 03b63f17dc
commit dcaa44bdd2
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/BobbyRGuns.cpp
+13 -13
View File
@@ -1346,6 +1346,19 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
PosY = BOBBYR_GRID_PIC_Y; PosY = BOBBYR_GRID_PIC_Y;
usTextPosY = BOBBYR_ITEM_DESC_START_Y; usTextPosY = BOBBYR_ITEM_DESC_START_Y;
//Display the subtotal at the bottom of the screen
swprintf( sDollarTemp, L"%d", CalculateTotalPurchasePrice() );
InsertCommasForDollarFigure( sDollarTemp );
InsertDollarSignInToString( sDollarTemp );
swprintf( sTemp, L"%s %s", BobbyRText[BOBBYR_GUNS_SUB_TOTAL], sDollarTemp );
DrawTextToScreen(sTemp, BOBBYR_ORDER_SUBTOTAL_X, BOBBYR_ORDER_SUBTOTAL_Y, 0, BOBBYR_ORDER_TITLE_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
//Display the Used item disclaimer
if( gfOnUsedPage )
{
DrawTextToScreen( BobbyRText[BOBBYR_GUNS_PERCENT_FUNCTIONAL], BOBBYR_PERCENT_FUNTCIONAL_X, BOBBYR_PERCENT_FUNTCIONAL_Y, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
}
// InitFirstAndLastGlobalIndex( uiItemClass ); // InitFirstAndLastGlobalIndex( uiItemClass );
//if there are no items then return //if there are no items then return
@@ -1651,19 +1664,6 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
gusOldItemNumOnTopOfPage = gusCurWeaponIndex; gusOldItemNumOnTopOfPage = gusCurWeaponIndex;
} }
//Display the subtotal at the bottom of the screen
swprintf( sDollarTemp, L"%d", CalculateTotalPurchasePrice() );
InsertCommasForDollarFigure( sDollarTemp );
InsertDollarSignInToString( sDollarTemp );
swprintf( sTemp, L"%s %s", BobbyRText[BOBBYR_GUNS_SUB_TOTAL], sDollarTemp );
DrawTextToScreen(sTemp, BOBBYR_ORDER_SUBTOTAL_X, BOBBYR_ORDER_SUBTOTAL_Y, 0, BOBBYR_ORDER_TITLE_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
//Display the Used item disclaimer
if( gfOnUsedPage )
{
DrawTextToScreen( BobbyRText[BOBBYR_GUNS_PERCENT_FUNCTIONAL], BOBBYR_PERCENT_FUNTCIONAL_X, BOBBYR_PERCENT_FUNTCIONAL_Y, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
}
return(TRUE); return(TRUE);
} }
Strategic/mapscreen.cpp
+15 -16
View File
@@ -7554,24 +7554,13 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
{ {
fDisableJustForIan = ! fDisableJustForIan; fDisableJustForIan = ! fDisableJustForIan;
} }
else
{
// only handle border button keyboard equivalents if the button is visible!
if ( !fShowMapInventoryPool )
{
ToggleItemsFilter();
}
}
#else
// only handle border button keyboard equivalents if the button is visible!
if ( !fShowMapInventoryPool )
{
ToggleItemsFilter();
}
#endif #endif
// only handle border button keyboard equivalents if the button is visible!
if ( !fShowMapInventoryPool )
{
ToggleItemsFilter();
}
break; break;
case 'K': case 'K':
//CHRISL: Swap gunsling //CHRISL: Swap gunsling
if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true ) if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true )
@@ -7897,6 +7886,16 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
} }
} }
#endif #endif
// open selected sector inventory screen
// if showing item counts on the map, and not already in sector inventory
if ( fShowItemsFlag && !fShowMapInventoryPool )
{
// show sector inventory for selected sector
ChangeSelectedMapSector( sSelMapX, sSelMapY, ( INT8 ) iCurrentMapSectorZ );
fShowMapInventoryPool = TRUE;
CreateDestroyMapInventoryPoolButtons( TRUE );
}
break; break;
case 'v': case 'v':
if( fCtrl ) if( fCtrl )