New branch: [sm130attacks].
Look into allowing song attacks again.
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
#include "Song.h"
|
#include "Song.h"
|
||||||
#include "SongManager.h"
|
#include "SongManager.h"
|
||||||
#include "Steps.h"
|
#include "Steps.h"
|
||||||
|
#include "Attack.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
|
|
||||||
/** @brief The maximum file size for edits. */
|
/** @brief The maximum file size for edits. */
|
||||||
@@ -468,7 +469,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
|
|||||||
|
|
||||||
// handle the data
|
// handle the data
|
||||||
/* Don't use GetMainAndSubTitlesFromFullTitle; that's only for heuristically
|
/* Don't use GetMainAndSubTitlesFromFullTitle; that's only for heuristically
|
||||||
* splitting other formats that *don't* natively support #SUBTITLE. */
|
* splitting other formats that *don't* natively support #SUBTITLE. */
|
||||||
if( sValueName=="TITLE" )
|
if( sValueName=="TITLE" )
|
||||||
out.m_sMainTitle = sParams[1];
|
out.m_sMainTitle = sParams[1];
|
||||||
|
|
||||||
@@ -540,7 +541,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
|
|||||||
; /* ignore */
|
; /* ignore */
|
||||||
|
|
||||||
/* We calculate these. Some SMs in circulation have bogus values for
|
/* We calculate these. Some SMs in circulation have bogus values for
|
||||||
* these, so make sure we always calculate it ourself. */
|
* these, so make sure we always calculate it ourself. */
|
||||||
else if( sValueName=="FIRSTBEAT" )
|
else if( sValueName=="FIRSTBEAT" )
|
||||||
{
|
{
|
||||||
if( bFromCache )
|
if( bFromCache )
|
||||||
|
|||||||
Reference in New Issue
Block a user