Merged revision(s) 7698 from branches/ja2_source_official_2014:

Merged revision(s) 7685 from branches/Flugente/BaseTable:
no need for each dropdown to have its own image library

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-01-05 00:33:38 +00:00
parent 134b534718
commit 72809ac09f
2 changed files with 7 additions and 7 deletions
+6 -4
View File
@@ -20,6 +20,8 @@
#define CITY_NAME_OFFSET 6
#define STATIC_TEXT_COLOR 145
UINT32 guGoldArrowImages = 0;
// helpful draw functions, as adding sti objects to paint boundaries is... lets say, inefficient
void DisplaySmallLine( UINT16 usStartX, UINT16 usStartY, UINT16 EndX, UINT16 EndY, UINT16 usColor )
{
@@ -138,7 +140,7 @@ DropDownBase::Create(UINT16 sX, UINT16 sY)
// Gold Arrow for the scroll area
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP( "LAPTOP\\GoldArrows.sti", VObjectDesc.ImageFile );
if ( !AddVideoObject( &VObjectDesc, &muiGoldArrowImages ) )
if ( !AddVideoObject( &VObjectDesc, &guGoldArrowImages ) )
return;
gDropObj = (void*) this;
@@ -240,7 +242,7 @@ DropDownBase::Destroy()
MSYS_RemoveRegion( &mSelectedCloseDropDownRegion);
MSYS_RemoveRegion( &mBubbleHelpRegion);
DeleteVideoObjectFromIndex(muiGoldArrowImages);
DeleteVideoObjectFromIndex( guGoldArrowImages );
SetRefresh();
}
@@ -304,7 +306,7 @@ DropDownBase::Display()
DrawTopEntry();
//get and display the up and down arrows
GetVideoObject(&hArrowHandle, muiGoldArrowImages);
GetVideoObject( &hArrowHandle, guGoldArrowImages );
//top arrow
BltVideoObject(FRAME_BUFFER, hArrowHandle, 0, musUpArrowX, musUpArrowY, VO_BLT_SRCTRANSPARENCY,NULL);
@@ -351,7 +353,7 @@ DropDownBase::Display_Drop()
DrawSelectedCity();
//get and display the up and down arrows
GetVideoObject(&hArrowHandle, muiGoldArrowImages);
GetVideoObject( &hArrowHandle, guGoldArrowImages );
// top arrow
BltVideoObject(FRAME_BUFFER, hArrowHandle, 1, musUpArrowX, musUpArrowY, VO_BLT_SRCTRANSPARENCY,NULL);