mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Merged revision(s) 7694 from branches/Flugente/BaseTable:
IMP gear images can be shown without background if required git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+8
-5
@@ -136,7 +136,7 @@ extern BOOLEAN fNewIMPGearMethodUsed;
|
||||
|
||||
|
||||
void IMPGearDisplay( );
|
||||
void DisplayGear( UINT16 usItem, UINT16 usPosX, UINT16 usPosY );
|
||||
void DisplayGear( UINT16 usItem, UINT16 usPosX, UINT16 usPosY, BOOLEAN fWithBackGround );
|
||||
void BtnIMPGearFinishCallback( GUI_BUTTON *btn, INT32 reason );
|
||||
|
||||
// determine all items that are selectable according to xml and choices
|
||||
@@ -482,7 +482,7 @@ void IMPGearDisplay( )
|
||||
|
||||
INT16 sItem = (UINT16)pIMPGEARDropDown[i]->GetSelectedEntryKey( );
|
||||
|
||||
DisplayGear( (UINT16)sItem, pIMPGEARDropDown[i]->GetX( ) - IMP_GEAR_ITEMDISPLAY_WIDTH, pIMPGEARDropDown[i]->GetY( ) );
|
||||
DisplayGear( (UINT16)sItem, pIMPGEARDropDown[i]->GetX( ) - IMP_GEAR_ITEMDISPLAY_WIDTH, pIMPGEARDropDown[i]->GetY( ), TRUE );
|
||||
|
||||
if ( sItem > 0 )
|
||||
{
|
||||
@@ -511,12 +511,15 @@ void IMPGearDisplay( )
|
||||
DrawTextToScreen( wTemp, LAPTOP_SCREEN_UL_X + 180, LAPTOP_SCREEN_WEB_UL_Y + 360, LAPTOP_TEXT_WIDTH, FONT14ARIAL, IMP_GEAR__COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
|
||||
}
|
||||
|
||||
void DisplayGear( UINT16 usItem, UINT16 usPosX, UINT16 usPosY )
|
||||
void DisplayGear( UINT16 usItem, UINT16 usPosX, UINT16 usPosY, BOOLEAN fWithBackGround )
|
||||
{
|
||||
if ( usItem )
|
||||
{
|
||||
// draw background 'box' for an item
|
||||
ColorFillVideoSurfaceArea( FRAME_BUFFER, usPosX, usPosY, usPosX + IMP_GEAR_ITEMDISPLAY_WIDTH, usPosY + IMP_GEAR_ITEMDISPLAY_HEIGHT, Get16BPPColor( FROMRGB( 200, 169, 87 ) ) );
|
||||
if ( fWithBackGround )
|
||||
{
|
||||
// draw background 'box' for an item
|
||||
ColorFillVideoSurfaceArea( FRAME_BUFFER, usPosX, usPosY, usPosX + IMP_GEAR_ITEMDISPLAY_WIDTH, usPosY + IMP_GEAR_ITEMDISPLAY_HEIGHT, Get16BPPColor( FROMRGB( 200, 169, 87 ) ) );
|
||||
}
|
||||
|
||||
HVOBJECT hVObject;
|
||||
ETRLEObject *pTrav;
|
||||
|
||||
Reference in New Issue
Block a user