mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Change: In the militia overview laptop website, do not display militia faces, instead colour their names. This way we can display more militia at once without losing information
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+10
-4
@@ -15,6 +15,10 @@
|
||||
#include "input.h" // for gfLeftButtonState
|
||||
#include "insurance.h" // for DisplaySmallColouredLineWithShadow
|
||||
|
||||
#define TESTTABLE_FONT_MED FONT12ARIAL
|
||||
#define TESTTABLE_OFFSET_ROW 20
|
||||
#define TESTTABLE_FONT_COLOR_REGULAR 2
|
||||
|
||||
BaseTable::BaseTable( )
|
||||
: WidgetBase( ),
|
||||
mName(L""),
|
||||
@@ -105,6 +109,11 @@ STR16 cdp_string_func_dummy( UINT32 aNum )
|
||||
return L"nothing found";
|
||||
}
|
||||
|
||||
UINT8 cdp_textcolour_func_dummy( UINT32 aNum )
|
||||
{
|
||||
return TESTTABLE_FONT_COLOR_REGULAR;
|
||||
}
|
||||
|
||||
void cdp_image_func_dummy( UINT32 aNum, UINT32& arImageLib, UINT16& arImage )
|
||||
{
|
||||
|
||||
@@ -194,9 +203,6 @@ ColumnDataProvider::DestroyMouseRegions( )
|
||||
}
|
||||
|
||||
// Flugente: this unused page will now be a testbed for the BaseTable development
|
||||
#define TESTTABLE_FONT_MED FONT12ARIAL
|
||||
#define TESTTABLE_OFFSET_ROW 20
|
||||
#define TESTTABLE_FONT_COLOR_REGULAR 2
|
||||
|
||||
////////////// TestPanel///////////////////////////////////////
|
||||
TestPanel::TestPanel( )
|
||||
@@ -575,7 +581,7 @@ TestTable::Display( )
|
||||
{
|
||||
swprintf( sText, (*it).GetString( i ) );
|
||||
|
||||
DrawTextToScreen( sText, usPosX, usPosY + 7, GetWidth( ), TESTTABLE_FONT_MED, TESTTABLE_FONT_COLOR_REGULAR, FONT_MCOLOR_BLACK, FALSE, 0 );
|
||||
DrawTextToScreen( sText, usPosX, usPosY + 7, GetWidth( ), TESTTABLE_FONT_MED, (*it).GetColour( i ), FONT_MCOLOR_BLACK, FALSE, 0 );
|
||||
}
|
||||
else if ( it->GetProviderType( ) == ColumnDataProvider::CDP_IMAGE )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user