1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- colour TestTable scrollbar

Browse Source 
- militia website sector filter uses longer names
- prisoner surrender dialogue explains how many prisoners were captured, and allows selecting prison via dropdown selection
- explain soldier relation boundaries on Melody website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-05-20 22:39:29 +00:00
parent c0d25c3cb7
commit 74bebdd454
15 changed files with 109 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessageBoxScreen.cpp
+33 -18
View File
@@ -250,7 +250,7 @@ INT32 DoMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UIN
if ( gMsgBox.usFlags & MSG_BOX_FLAG_IMAGE )
heightincrease = 130;
if ( usFlags & MSG_BOX_FLAG_DROPDOWN )
if ( usFlags & ( MSG_BOX_FLAG_DROPDOWN_1 | MSG_BOX_FLAG_DROPDOWN_2 ) )
heightincrease = 130;
UINT16 usMBWidth=MSGBOX_DEFAULT_WIDTH;
@@ -919,9 +919,13 @@ INT32 DoMessageBox( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UIN
}
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN )
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_1 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_1>::getInstance( ).Create( (INT16)(gMsgBox.sX + 15), (INT16)(gMsgBox.sY + 35) );
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_2 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).Create( (INT16)(gMsgBox.sX + 15), (INT16)(gMsgBox.sY + 66) );
}
@@ -954,27 +958,30 @@ template<> void DropDownTemplate<DROPDOWNNR_MSGBOX_1>::SetRefresh()
{
INT16 box1key = DropDownTemplate<DROPDOWNNR_MSGBOX_1>::getInstance( ).GetSelectedEntryKey( );
std::vector<std::pair<INT16, STR16> > dropdownvector_2 = GetTileSetIndexVector( box1key );
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).SetEntries( dropdownvector_2 );
if ( !dropdownvector_2.empty( ) )
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_2 )
{
BOOLEAN found = FALSE;
for ( std::vector<std::pair<INT16, STR16> >::iterator it = dropdownvector_2.begin( ); it != dropdownvector_2.end( ); ++it )
std::vector<std::pair<INT16, STR16> > dropdownvector_2 = GetTileSetIndexVector( box1key );
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).SetEntries( dropdownvector_2 );
if ( !dropdownvector_2.empty( ) )
{
if ( (*it).first == guiMessageBoxImageIndex )
BOOLEAN found = FALSE;
for ( std::vector<std::pair<INT16, STR16> >::iterator it = dropdownvector_2.begin( ); it != dropdownvector_2.end( ); ++it )
{
found = TRUE;
break;
if ( (*it).first == guiMessageBoxImageIndex )
{
found = TRUE;
break;
}
}
if ( !found )
guiMessageBoxImageIndex = dropdownvector_2[0].first;
}
if ( !found )
guiMessageBoxImageIndex = dropdownvector_2[0].first;
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).SetSelectedEntryKey( guiMessageBoxImageIndex );
}
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).SetSelectedEntryKey( guiMessageBoxImageIndex );
if ( gMsgBox.usFlags & MSG_BOX_FLAG_IMAGE )
{
@@ -1249,9 +1256,13 @@ UINT32 ExitMsgBox( INT8 ubExitCode )
DeleteVideoObjectFromIndex( guiMessageBoxImage );
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN )
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_1 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_1>::getInstance( ).Destroy( );
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_2 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).Destroy( );
}
@@ -1666,9 +1677,13 @@ UINT32 MessageBoxScreenHandle( )
BltVideoObject( FRAME_BUFFER, hIconHandle, guiMessageBoxImageIndex, gMsgBox.sX + 70, gMsgBox.sY + 90, VO_BLT_SRCTRANSPARENCY, NULL );
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN )
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_1 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_1>::getInstance( ).Display( );
}
if ( gMsgBox.usFlags & MSG_BOX_FLAG_DROPDOWN_2 )
{
DropDownTemplate<DROPDOWNNR_MSGBOX_2>::getInstance( ).Display( );
}