small cleanup craps

This commit is contained in:
AJ Kelly
2011-09-12 11:38:49 -05:00
parent 48ca50940a
commit c7f41eb9d8
2 changed files with 3 additions and 2 deletions
+1 -2
View File
@@ -18,7 +18,7 @@ void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString>
static void Deserialize(TimingSegment &seg_, const Json::Value &root)
{
TimingSegment *seg = &seg_;
float fBeat = root["Beat"].asDouble();
seg->SetBeat(fBeat);
switch (seg->GetType())
@@ -203,7 +203,6 @@ static void Deserialize( Song &out, const Json::Value &root )
FOREACH( Steps*, vpSteps, iter )
out.AddSteps( *iter );
}
}
bool NotesLoaderJson::LoadFromJsonFile( const RString &sPath, Song &out )
+2
View File
@@ -13,6 +13,8 @@
#include "NoteTypes.h"
#include "NotesLoader.h"
// XXX: this is mostly a copy of NotesLoaderBMS and should be consolidated there. -aj
typedef multimap<RString, RString> NameToData_t;
typedef map<int, float> MeasureToTimeSig_t;