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

.

Browse Source
This commit is contained in:
Alberto Ramos
2010-08-08 18:08:19 -06:00
parent d29e0052bb
commit e8e5987a0a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/02 ActorDef.lua
+2 -1
View File
@@ -167,7 +167,8 @@ end
function LoadFont(a, b) function LoadFont(a, b)
local sSection = b and a or "" local sSection = b and a or ""
local sFile = b or a local sFile = b or a
if (sFile == "" and sSection == "") or (sFile == nil and sSection == nil) then --if (sFile == "" and sSection == "") or (sFile == nil and sSection == nil) then
if not a and not b then
sSection = "Common" sSection = "Common"
sFile = "normal" sFile = "normal"
end end
src/NotesLoaderKSF.cpp
+4 -4
View File
@@ -124,7 +124,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
sFName.MakeLower(); sFName.MakeLower();
out.SetDescription(sFName); out.SetDescription(sFName);
//Check another before anything else... is this okay? -DaisuMaster // Check another before anything else... is this okay? -DaisuMaster
if( sFName.find("another") != string::npos ) if( sFName.find("another") != string::npos )
{ {
out.SetDifficulty( Difficulty_Edit ); out.SetDifficulty( Difficulty_Edit );
@@ -147,7 +147,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
} }
else if( sFName.find("easy") != string::npos || sFName.find("ez") != string::npos || sFName.find("normal") != string::npos ) else if( sFName.find("easy") != string::npos || sFName.find("ez") != string::npos || sFName.find("normal") != string::npos )
{ {
//I wonder if I should leave easy fall into the Beginner difficulty... -DaisuMaster // I wonder if I should leave easy fall into the Beginner difficulty... -DaisuMaster
out.SetDifficulty( Difficulty_Easy ); out.SetDifficulty( Difficulty_Easy );
if( !out.GetMeter() ) out.SetMeter( 4 ); if( !out.GetMeter() ) out.SetMeter( 4 );
} }
@@ -166,7 +166,6 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
// Check for "halfdouble" before "double". // Check for "halfdouble" before "double".
if( sFName.find("halfdouble") != string::npos || sFName.find("half-double") != string::npos || sFName.find("h_double") != string::npos || sFName.find("hdb") != string::npos ) if( sFName.find("halfdouble") != string::npos || sFName.find("half-double") != string::npos || sFName.find("h_double") != string::npos || sFName.find("hdb") != string::npos )
//if( BeginsWith( sFName.MakeLower(), "half" ) && EndsWith( sFName.MakeLower(), "double" )
out.m_StepsType = StepsType_pump_halfdouble; out.m_StepsType = StepsType_pump_halfdouble;
// Handle bDoublesChart from above as well. -aj // Handle bDoublesChart from above as well. -aj
else if( sFName.find("double") != string::npos || sFName.find("nightmare") != string::npos || sFName.find("freestyle") != string::npos || sFName.find("db") != string::npos || sFName.find("nm") != string::npos || sFName.find("fs") != string::npos || bDoublesChart ) else if( sFName.find("double") != string::npos || sFName.find("nightmare") != string::npos || sFName.find("freestyle") != string::npos || sFName.find("db") != string::npos || sFName.find("nm") != string::npos || sFName.find("fs") != string::npos || bDoublesChart )
@@ -220,6 +219,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
break; break;
} }
// Why do this? Rows made with precise DM05 tags can go up to 13 too -DaisuMaster
if( sRowString.size() != 13 ) if( sRowString.size() != 13 )
{ {
if( bKIUCompliant ) if( bKIUCompliant )
@@ -576,7 +576,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
{ {
float fCurBpm = (float)numTemp; float fCurBpm = (float)numTemp;
//out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) ); //out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) );
out.m_Timing.SetBPMAtBeat( fCurBeat, (float)numTemp ); out.m_Timing.SetBPMAtBeat( fCurBeat, fCurBpm );
continue; continue;
} }
else if (BeginsWith(NoteRowString, "|E")) else if (BeginsWith(NoteRowString, "|E"))