actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added MaxDimensionUsesZoom to BMT copy constructor.

Browse Source
This commit is contained in:
Kyzentun
2014-09-07 22:56:50 -06:00
parent 1ca9753e10
commit 33a9b042b2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BitmapText.cpp
+1
View File
@@ -90,6 +90,7 @@ BitmapText & BitmapText::operator=(const BitmapText &cpy)
CPY( m_fDistortion ); CPY( m_fDistortion );
CPY( m_bUsingDistortion ); CPY( m_bUsingDistortion );
CPY( m_iVertSpacing ); CPY( m_iVertSpacing );
CPY( m_MaxDimensionUsesZoom );
CPY( m_aVertices ); CPY( m_aVertices );
CPY( m_vpFontPageTextures ); CPY( m_vpFontPageTextures );
CPY( m_mAttributes ); CPY( m_mAttributes );
src/ScreenEdit.cpp
+2 -2
View File
@@ -4546,7 +4546,7 @@ static bool ConvertMappingInputToMapping(RString const& mapstr, int* mapping, RS
{ {
vector<RString> mapping_input; vector<RString> mapping_input;
split(mapstr, ",", mapping_input); split(mapstr, ",", mapping_input);
int tracks_for_type= GAMEMAN->GetStepsTypeInfo(GAMESTATE->m_pCurSteps[0]->m_StepsType).iNumTracks; size_t tracks_for_type= GAMEMAN->GetStepsTypeInfo(GAMESTATE->m_pCurSteps[0]->m_StepsType).iNumTracks;
if(mapping_input.size() > tracks_for_type) if(mapping_input.size() > tracks_for_type)
{ {
error= TOO_MANY_TRACKS; error= TOO_MANY_TRACKS;
@@ -4568,7 +4568,7 @@ static bool ConvertMappingInputToMapping(RString const& mapstr, int* mapping, RS
error= ssprintf(NOT_A_TRACK.GetValue(), mapping_input[track].c_str()); error= ssprintf(NOT_A_TRACK.GetValue(), mapping_input[track].c_str());
return false; return false;
} }
if(mapping[track] < 1 || mapping[track] > tracks_for_type) if(mapping[track] < 1 || mapping[track] > static_cast<int>(tracks_for_type))
{ {
error= ssprintf(OUT_OF_RANGE_ID.GetValue(), track+1, mapping[track], tracks_for_type); error= ssprintf(OUT_OF_RANGE_ID.GetValue(), track+1, mapping[track], tracks_for_type);
return false; return false;