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

Merge branch 'master' of https://github.com/stepmania/stepmania

Browse Source
This commit is contained in:
Jonathan Payne
2014-09-10 00:47:55 -07:00
parent 3c054e80e5 9a060f3cf0
commit c91bb20d21
4 changed files with 10 additions and 9 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/LuaManager.cpp
+1 -1
View File
@@ -807,7 +807,7 @@ Dialog::Result LuaHelpers::ReportScriptError(RString const& Error, RString Error
ScriptErrorMessage(Error); ScriptErrorMessage(Error);
InReportScriptError= false; InReportScriptError= false;
} }
LOG->Warn(Error.c_str()); LOG->Warn( "%s", Error.c_str());
if(UseAbort) if(UseAbort)
{ {
RString with_correct= Error + " Correct this and click Retry, or Cancel to break."; RString with_correct= Error + " Correct this and click Retry, or Cancel to break.";
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;
src/ThemeManager.cpp
+6 -6
View File
@@ -816,12 +816,12 @@ try_element_again:
goto try_element_again; goto try_element_again;
case Dialog::ignore: case Dialog::ignore:
{ {
RString error= sCategory + '/' + sFileName + RString element = sCategory + '/' + sFileName;
" could not be found in \"" + RString error = "could not be found in \"" +
GetThemeDirFromName(m_sCurThemeName).c_str() + "\" or \"" + GetThemeDirFromName(m_sCurThemeName) + "\" or \"" +
GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() + "\"."; GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME) + "\".";
LOG->UserLog("Theme element", "%s", error.c_str()); LOG->UserLog("Theme element", element.c_str(), "%s", error.c_str());
LOG->Warn(error.c_str()); LOG->Warn( "%s %s", element.c_str(), error.c_str());
LuaHelpers::ScriptErrorMessage(error); LuaHelpers::ScriptErrorMessage(error);
} }