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

Fix: compiler warnings

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8814 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2020-05-30 14:26:16 +00:00
parent e932393eae
commit b25a4be4e7
15 changed files with 49 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/DropDown.cpp
+2 -2
View File
@@ -95,8 +95,8 @@ DropDownBase::Init( UINT16 sX, UINT16 sY )
mFirstShownEntry = max( 0, min( mFirstShownEntry, mEntryVector.size( ) - 1 - mNumDisplayedEntries ) );
musWidth = 0;
UINT16 size = mEntryVector.size( );
for ( UINT16 i = 0; i < size; ++i )
size_t size = mEntryVector.size();
for ( size_t i = 0; i < size; ++i )
{
musWidth = max( musWidth, StringPixLength( mEntryVector[i].second, DEF_DROPDOWN_FONT ) );
}
Laptop/DynamicDialogueWidget.cpp
+2 -4
View File
@@ -439,8 +439,7 @@ IMPDialogueChooseBox::Init( UINT16 sX, UINT16 sY )
musWidth = 0;
UINT16 size = mEntryVector.size( );
for ( UINT16 i = 0; i < size; ++i )
for ( size_t i = 0, size = mEntryVector.size(); i < size; ++i )
{
musWidth = max( musWidth, StringPixLength( mEntryVector[i].second, MYBOX_FONT_DEF ) );
}
@@ -463,8 +462,7 @@ IMPDialogueChooseBox::Create( UINT16 sX, UINT16 sY )
sY += IMPDIALOGUECHOOSEBOX_BAR_Y_OFFSET;
UINT16 size = mEntryVector.size( );
for ( UINT16 i = 0; i < size; ++i )
for ( size_t i = 0, size = mEntryVector.size(); i < size; ++i )
{
if ( !mChoiceRegionDefined[i] )
{
Laptop/Intelmarket.cpp
+3 -7
View File
@@ -132,11 +132,7 @@ void DisplayDefaults_IM()
GetVideoObject( &hPixHandle, guiMercCompareLogoImage );
SetFontShadow( MERCOMP_FONT_SHADOW );
CHAR16 sText[800];
UINT16 usPosX = CAMPAIGN_HISTORY_LINK_START_X;
UINT16 usPosY = CAMPAIGN_HISTORY_LINK_START_Y;
WebPageTileBackground( 4, 4, BACKGROUND_WIDTH, CAMPAIGN_HISTORY_BACKGROUND_HEIGHT, guiInsuranceBackGround );
//Display the title slogan
@@ -145,8 +141,8 @@ void DisplayDefaults_IM()
//Display the subtitle slogan
DrawTextToScreen( szIntelWebsiteText[TEXT_INTEL_SUBTITLE], CAMPAIGN_HISTORY_SUBTITLE_X, CAMPAIGN_HISTORY_SUBTITLE_Y, 0, CAMPHIS_FONT_BIG, MERCOMP_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
usPosX = CAMPAIGN_HISTORY_LINK_START_X;
usPosY = CAMPAIGN_HISTORY_LINK_START_Y;
UINT16 usPosX = CAMPAIGN_HISTORY_LINK_START_X;
UINT16 usPosY = CAMPAIGN_HISTORY_LINK_START_Y;
for ( int i = 0; i<NUM_LINKS; ++i )
{
DisplayWrappedString( usPosX, usPosY, CAMPAIGN_HISTORY_LINK_TEXT_WIDTH, 2, CAMPHIS_FONT_MED, MERCOMP_FONT_COLOR, szIntelWebsiteText[TEXT_INTEL_LINK_1 + i], FONT_MCOLOR_BLACK, FALSE, 0 );