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

misc fixes (by rftr):

Browse Source 
- cleaned up warnings in Rebel Command.cpp
- ARC: Draft directive is hidden if volunteer pool option is disabled
- fixed dropdown menu behaviour at the RIS website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-09-03 05:15:54 +00:00
parent 7a14a167fb
commit 418cf24039
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/Intelmarket.cpp
+26 -27
View File
@@ -263,6 +263,32 @@ void IntelBuyButtonCallback( GUI_BUTTON *btn, INT32 reason )
void EnterIntelmarket()
{
std::vector<std::pair<INT16, STR16> > dropdownvector;
for ( INT16 i = 0; i < 16; ++i )
{
if ( !( LaptopSaveInfo.usMapIntelFlags & ( 1 << i ) ) )
{
swprintf( gIntelBuyMapPartNamesStr[i], szIntelWebsiteText[TEXT_INTEL_MAPREGION_1 + i] );
gIntelBuyMapPartNamesStr[i][63] = '/0';
dropdownvector.push_back( std::make_pair( i, gIntelBuyMapPartNamesStr[i] ) );
}
}
if ( !dropdownvector.empty() )
{
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetEntries( dropdownvector );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetHelpText( szIntelWebsiteText[TEXT_INTEL_DROPDOWN_HELPTEXT] );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().Create( LAPTOP_SCREEN_UL_X, MCA_START_CONTENT_Y + 40 );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetColorLine( Get16BPPColor( FROMRGB( 137, 16, 231 ) ) );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetColorMarked( Get16BPPColor( FROMRGB( 137, 16, 231 ) ) );
}
else
{
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().ClearEntries();
}
InitDefaults_IM();
BuildIntelInfoArray();
@@ -302,33 +328,6 @@ void HandleIntelmarket()
{
if ( fIntelRedraw )
{
UINT8 count = 0;
std::vector<std::pair<INT16, STR16> > dropdownvector;
for ( INT16 i = 0; i < 16; ++i )
{
if ( !( LaptopSaveInfo.usMapIntelFlags & ( 1 << i ) ) )
{
swprintf( gIntelBuyMapPartNamesStr[i], szIntelWebsiteText[TEXT_INTEL_MAPREGION_1 + i] );
gIntelBuyMapPartNamesStr[i][63] = '/0';
dropdownvector.push_back( std::make_pair( i, gIntelBuyMapPartNamesStr[i] ) );
}
}
if ( !dropdownvector.empty() )
{
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetEntries( dropdownvector );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetHelpText( szIntelWebsiteText[TEXT_INTEL_DROPDOWN_HELPTEXT] );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().Create( LAPTOP_SCREEN_UL_X, MCA_START_CONTENT_Y + 40 );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetColorLine( Get16BPPColor( FROMRGB( 137, 16, 231 ) ) );
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().SetColorMarked( Get16BPPColor( FROMRGB( 137, 16, 231 ) ) );
}
else
{
DropDownTemplate<DROPDOWN_INTEL_BUY>::getInstance().ClearEntries();
}
RenderIntelmarket();
fIntelRedraw = FALSE;