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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingSegments.cpp
+19 -19
View File
@@ -121,8 +121,8 @@ void FakeSegment::DebugPrint() const
RString FakeSegment::ToString(int dec) const
{
RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetLength());
}
@@ -138,8 +138,8 @@ void FakeSegment::Scale( int start, int length, int newLength )
RString WarpSegment::ToString(int dec) const
{
RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetLength());
}
@@ -156,12 +156,12 @@ void WarpSegment::Scale( int start, int length, int newLength )
RString TickcountSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec) + "f=%i";
const RString str = "%.0" + std::to_string(dec) + "f=%i";
return ssprintf(str.c_str(), GetBeat(), GetTicks());
}
RString ComboSegment::ToString(int dec) const
{
RString str = "%.0" + IntToString(dec) + "f=%i";
RString str = "%.0" + std::to_string(dec) + "f=%i";
if (GetCombo() == GetMissCombo())
{
return ssprintf(str.c_str(), GetBeat(), GetCombo());
@@ -180,20 +180,20 @@ vector<float> ComboSegment::GetValues() const
RString LabelSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec) + "f=%s";
const RString str = "%.0" + std::to_string(dec) + "f=%s";
return ssprintf(str.c_str(), GetBeat(), GetLabel().c_str());
}
RString BPMSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
const RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetBPM());
}
RString TimeSignatureSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec) + "f=%i=%i";
const RString str = "%.0" + std::to_string(dec) + "f=%i=%i";
return ssprintf(str.c_str(), GetBeat(), GetNum(), GetDen());
}
@@ -207,9 +207,9 @@ vector<float> TimeSignatureSegment::GetValues() const
RString SpeedSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f=%.0"
+ IntToString(dec) + "f=%u";
const RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f=%.0"
+ std::to_string(dec) + "f=%u";
return ssprintf(str.c_str(), GetBeat(), GetRatio(),
GetDelay(), static_cast<unsigned int>(GetUnit()));
}
@@ -245,22 +245,22 @@ void SpeedSegment::Scale( int start, int oldLength, int newLength )
RString ScrollSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
const RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetRatio());
}
RString StopSegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
const RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetPause());
}
RString DelaySegment::ToString(int dec) const
{
const RString str = "%.0" + IntToString(dec)
+ "f=%.0" + IntToString(dec) + "f";
const RString str = "%.0" + std::to_string(dec)
+ "f=%.0" + std::to_string(dec) + "f";
return ssprintf(str.c_str(), GetBeat(), GetPause());
}