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

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
+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)
{
(&seg)->SetBeat((float)(root["Beat"].asDouble()));
if ((&seg)->GetType() == SEGMENT_BPM)
seg.SetBeat((float)(root["Beat"].asDouble()));
if (seg.GetType() == SEGMENT_BPM)
{
static_cast<BPMSegment *>(&seg)->SetBPM((float)(root["BPM"].asDouble()));
static_cast<BPMSegment &>(seg).SetBPM((float)(root["BPM"].asDouble()));
}
else
{
static_cast<StopSegment *>(&seg)->SetPause((float)(root["Seconds"].asDouble()));
static_cast<StopSegment &>(seg).SetPause((float)(root["Seconds"].asDouble()));
}
}