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

Interface Items & Sector Inv Readability Enhancement (by Buggler)

Browse Source 
- Adjusted font colors in Sector Inventory & Interface Panel (increasing dull contrast colors that only shows when activated, highlights & high contrast colors that's always displayed are toned down)
- Changed 'Item Name' font in non-zoomed sector inventory
- Changed 'Ammo Count' font in item description box
- Increased 'Max Bullet' font size in zoomed sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-05 15:20:43 +00:00
parent bf65559bef
commit c04898d095
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map Inventory.cpp
+5 -5
View File
@@ -538,11 +538,11 @@ BOOLEAN RenderItemInPoolSlot( INT32 iCurrentSlot, INT32 iFirstSlotOnPage )
// Determine Color // Determine Color
if ( fMapInventoryItemCompatable[ iCurrentSlot ] ) if ( fMapInventoryItemCompatable[ iCurrentSlot ] )
{ {
sOutLine = Get16BPPColor( FROMRGB( 255, 255, 255 ) ); sOutLine = Get16BPPColor( FROMRGB( 210, 210, 210 ) );
} }
else if ( gfMapInventoryItemToZoom[ iCurrentSlot ] ) else if ( gfMapInventoryItemToZoom[ iCurrentSlot ] )
{ {
sOutLine = Get16BPPColor( FROMRGB( 255, 255, 55 ) ); sOutLine = Get16BPPColor( FROMRGB( 235, 235, 30 ) );
} }
} }
else else
@@ -630,7 +630,7 @@ BOOLEAN RenderItemInPoolSlot( INT32 iCurrentSlot, INT32 iFirstSlotOnPage )
SetFontDestBuffer( guiSAVEBUFFER, 0,0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( guiSAVEBUFFER, 0,0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
SetFont( MAP_INVEN_NAME_FONT ); SetFont( MAP_INVEN_NAME_FONT );
SetFontForeground( FONT_WHITE ); SetFontForeground( FONT_GRAY2 );
SetFontBackground( FONT_BLACK ); SetFontBackground( FONT_BLACK );
// HEADROCK HAM 5: Offset is now changeable. // HEADROCK HAM 5: Offset is now changeable.
@@ -659,7 +659,7 @@ BOOLEAN RenderItemInPoolSlot( INT32 iCurrentSlot, INT32 iFirstSlotOnPage )
SetFontDestBuffer( guiSAVEBUFFER, 0,0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE ); SetFontDestBuffer( guiSAVEBUFFER, 0,0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
SetFont( uiSalePriceFont ); SetFont( uiSalePriceFont );
SetFontForeground( FONT_RED ); SetFontForeground( FONT_LTRED );
SetFontBackground( FONT_BLACK ); SetFontBackground( FONT_BLACK );
INT16 sOffsetX = (fMapInventoryZoom ? 12 : 10); INT16 sOffsetX = (fMapInventoryZoom ? 12 : 10);
@@ -3745,7 +3745,7 @@ void ResetMapInventoryOffsets( void )
MAP_INVEN_SLOT_HEIGHT = 32; MAP_INVEN_SLOT_HEIGHT = 32;
MAP_INVEN_SLOT_IMAGE_HEIGHT = 24; MAP_INVEN_SLOT_IMAGE_HEIGHT = 24;
MAP_INVEN_NAME_FONT = SMALLCOMPFONT; MAP_INVEN_NAME_FONT = BLOCKFONTNARROW;
} }
else else
Tactical/Interface Items.cpp
+9 -9
View File
@@ -176,8 +176,8 @@ INT16 ITEMDESC_DONE_Y;
#define ITEMDESC_ITEM_WIDTH 117 #define ITEMDESC_ITEM_WIDTH 117
#define ITEMDESC_ITEM_HEIGHT 54 #define ITEMDESC_ITEM_HEIGHT 54
#define ITEMDESC_AMMO_TEXT_X 3 #define ITEMDESC_AMMO_TEXT_X 2
#define ITEMDESC_AMMO_TEXT_Y 1 #define ITEMDESC_AMMO_TEXT_Y 3
#define ITEMDESC_AMMO_TEXT_WIDTH 31 #define ITEMDESC_AMMO_TEXT_WIDTH 31
#define WORD_WRAP_INV_WIDTH 58 #define WORD_WRAP_INV_WIDTH 58
@@ -3530,13 +3530,13 @@ void RenderPocketItemCapacity( UINT32 uiWhichBuffer, INT8 pCapacity, INT16 bPos,
// Setup display parameters // Setup display parameters
SetFont( ITEM_FONT ); SetFont( ITEM_FONT );
SetFontBackground( FONT_MCOLOR_BLACK ); SetFontBackground( FONT_MCOLOR_BLACK );
SetFontForeground( FONT_RED ); SetFontForeground( FONT_LTRED );
if(pSoldier == NULL || (pCapacity != 0 && CanItemFitInPosition(pSoldier, gpItemPointer, (INT8)bPos, FALSE))) if(pSoldier == NULL || (pCapacity != 0 && CanItemFitInPosition(pSoldier, gpItemPointer, (INT8)bPos, FALSE)))
{ {
// Adjust capacity to account for current items // Adjust capacity to account for current items
if(gpItemPointer->usItem == pObj->usItem) if(gpItemPointer->usItem == pObj->usItem)
{ {
SetFontForeground( FONT_GREEN ); SetFontForeground( FONT_LTGREEN );
pCapacity = pCapacity - pObj->ubNumberOfObjects; pCapacity = pCapacity - pObj->ubNumberOfObjects;
if(pCapacity > 0) if(pCapacity > 0)
swprintf( pStr, L"+%d", pCapacity ); swprintf( pStr, L"+%d", pCapacity );
@@ -4415,7 +4415,7 @@ void MAPINVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pOb
// Set font properties // Set font properties
SetFontForeground( FONT_GRAY4 ); SetFontForeground( FONT_GRAY4 );
SetFont( TINYFONT1 ); SetFont( SMALLFONT1 );
// Find difference in width and height. // Find difference in width and height.
INT16 sFontHeightDifference = 1; INT16 sFontHeightDifference = 1;
@@ -4497,7 +4497,7 @@ void MAPINVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pOb
// Set font properties // Set font properties
SetFontForeground( FONT_GRAY4 ); SetFontForeground( FONT_GRAY4 );
SetFont( TINYFONT1 ); SetFont( SMALLFONT1 );
// Find difference in width and height. // Find difference in width and height.
INT16 sFontHeightDifference = 1; INT16 sFontHeightDifference = 1;
@@ -5050,7 +5050,7 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
if( guiCurrentItemDescriptionScreen == MAP_SCREEN ) if( guiCurrentItemDescriptionScreen == MAP_SCREEN )
{ {
// in mapscreen, move over a bit // in mapscreen, move over a bit
giItemDescAmmoButton = CreateIconAndTextButton( giItemDescAmmoButtonImages, pStr, TINYFONT1, giItemDescAmmoButton = CreateIconAndTextButton( giItemDescAmmoButtonImages, pStr, BLOCKFONTNARROW,
sForeColour, FONT_MCOLOR_BLACK, sForeColour, FONT_MCOLOR_BLACK,
sForeColour, FONT_MCOLOR_BLACK, sForeColour, FONT_MCOLOR_BLACK,
TEXT_CJUSTIFIED, TEXT_CJUSTIFIED,
@@ -5062,7 +5062,7 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
{ {
// not in mapscreen // not in mapscreen
giItemDescAmmoButton = CreateIconAndTextButton( giItemDescAmmoButtonImages, pStr, TINYFONT1, giItemDescAmmoButton = CreateIconAndTextButton( giItemDescAmmoButtonImages, pStr, BLOCKFONTNARROW,
sForeColour, FONT_MCOLOR_BLACK, sForeColour, FONT_MCOLOR_BLACK,
sForeColour, FONT_MCOLOR_BLACK, sForeColour, FONT_MCOLOR_BLACK,
TEXT_CJUSTIFIED, TEXT_CJUSTIFIED,
@@ -5084,7 +5084,7 @@ BOOLEAN InternalInitItemDescriptionBox( OBJECTTYPE *pObject, INT16 sX, INT16 sY,
MSYS_SetBtnUserData( giItemDescAmmoButton, 1, ubStatusIndex ); MSYS_SetBtnUserData( giItemDescAmmoButton, 1, ubStatusIndex );
} }
FindFontCenterCoordinates( (INT16)ITEMDESC_AMMO_TEXT_X, (INT16)ITEMDESC_AMMO_TEXT_Y, ITEMDESC_AMMO_TEXT_WIDTH, GetFontHeight( TINYFONT1 ), pStr, TINYFONT1, &usX, &usY); FindFontCenterCoordinates( (INT16)ITEMDESC_AMMO_TEXT_X, (INT16)ITEMDESC_AMMO_TEXT_Y, ITEMDESC_AMMO_TEXT_WIDTH, GetFontHeight( BLOCKFONTNARROW ), pStr, BLOCKFONTNARROW, &usX, &usY);
SpecifyButtonTextOffsets( giItemDescAmmoButton, (UINT8) usX, (UINT8) usY, TRUE ); SpecifyButtonTextOffsets( giItemDescAmmoButton, (UINT8) usX, (UINT8) usY, TRUE );