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

[timing] Slightly (?) better (??) casting.

Browse Source
This commit is contained in:
Jason Felds
2011-07-15 18:46:11 -04:00
parent bcec471213
commit c454bb9c14
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderJson.cpp
+4 -4
View File
@@ -17,14 +17,14 @@ void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString>
static void Deserialize(TimingSegment &seg, const Json::Value &root) static void Deserialize(TimingSegment &seg, const Json::Value &root)
{ {
(&seg)->SetBeat((float)(root["Beat"].asDouble())); seg.SetBeat((float)(root["Beat"].asDouble()));
if ((&seg)->GetType() == SEGMENT_BPM) if (seg.GetType() == SEGMENT_BPM)
{ {
static_cast<BPMSegment *>(&seg)->SetBPM((float)(root["BPM"].asDouble())); static_cast<BPMSegment &>(seg).SetBPM((float)(root["BPM"].asDouble()));
} }
else else
{ {
static_cast<StopSegment *>(&seg)->SetPause((float)(root["Seconds"].asDouble())); static_cast<StopSegment &>(seg).SetPause((float)(root["Seconds"].asDouble()));
} }
} }
src/NotesWriterJson.cpp
+4 -4
View File
@@ -11,14 +11,14 @@
static void Serialize(const TimingSegment &seg, Json::Value &root) static void Serialize(const TimingSegment &seg, Json::Value &root)
{ {
root["Beat"] = (&seg)->GetBeat(); root["Beat"] = seg.GetBeat();
if ((&seg)->GetType() == SEGMENT_BPM) if (seg.GetType() == SEGMENT_BPM)
{ {
root["BPM"] = static_cast<BPMSegment *>(const_cast<TimingSegment *>(&seg))->GetBPM(); root["BPM"] = static_cast<BPMSegment &>(const_cast<TimingSegment &>(seg)).GetBPM();
} }
else else
{ {
root["Seconds"] = static_cast<StopSegment *>(const_cast<TimingSegment *>(&seg))->GetPause(); root["Seconds"] = static_cast<StopSegment &>(const_cast<TimingSegment &>(seg)).GetPause();
} }
} }