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

Changed variables to UINT16, in case a dropdown has a lot of entries

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-05-01 19:04:50 +00:00
parent bd59b2fcba
commit dba2386bc3
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/DynamicDialogueWidget.cpp
+7 -6
View File
@@ -425,8 +425,9 @@ IMPDialogueChooseBox::Init( UINT16 sX, UINT16 sY )
mSelectedEntry = 0;
musWidth = 0;
UINT8 size = mEntryVector.size( );
for ( UINT8 i = 0; i < size; ++i )
UINT16 size = mEntryVector.size( );
for ( UINT16 i = 0; i < size; ++i )
{
musWidth = max( musWidth, StringPixLength( mEntryVector[i].second, MYBOX_FONT_DEF ) );
}
@@ -449,8 +450,8 @@ IMPDialogueChooseBox::Create( UINT16 sX, UINT16 sY )
sY += IMPDIALOGUECHOOSEBOX_BAR_Y_OFFSET;
UINT8 size = mEntryVector.size( );
for ( UINT8 i = 0; i < size; ++i )
UINT16 size = mEntryVector.size( );
for ( UINT16 i = 0; i < size; ++i )
{
if ( !mChoiceRegionDefined[i] )
{
@@ -559,7 +560,7 @@ IMPDialogueChooseBox::DrawTopEntry( )
UINT16 sY = GetY( ) + IMPDIALOGUECHOOSEBOX_BAR_Y_OFFSET;
UINT8 cnt = 0;
UINT16 cnt = 0;
std::vector<std::pair<INT16, STR16> >::iterator itend = mEntryVector.end( );
for ( std::vector<std::pair<INT16, STR16> >::iterator it = mEntryVector.begin( ); it != itend; ++it )
{
@@ -586,7 +587,7 @@ IMPDialogueChooseBox::SelectDropDownRegionCallBack( MOUSE_REGION * pRegion, INT3
}
else if ( iReason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
mSelectedEntry = (UINT8)MSYS_GetRegionUserData( pRegion, 0 );
mSelectedEntry = (UINT16)MSYS_GetRegionUserData( pRegion, 0 );
}
}