diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 698141f809..ae5db43ca5 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 $NEXT | 20110xyy
--------------------------------------------------------------------------------
+2011/05/23
+----------
+* [Steps] Added the UsesSplitTiming Lua binding. [Wolfman2000]
+
2011/05/20
----------
* [CryptManager] Added SHA1File Lua binding. [AJ]
diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 942df4b4d5..f697390be9 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -1374,6 +1374,7 @@
+
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index 977a524485..135d345578 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -3454,6 +3454,9 @@
Returns true if the steps were automatically generated.
+
+ Returns true if the Steps use different TimingData from the Song.
+
diff --git a/src/Steps.cpp b/src/Steps.cpp
index 830b19bac6..e2b658f213 100644
--- a/src/Steps.cpp
+++ b/src/Steps.cpp
@@ -19,6 +19,7 @@
#include "RageLog.h"
#include "NoteData.h"
#include "GameManager.h"
+#include "SongManager.h"
#include "NoteDataUtil.h"
#include "NotesLoaderSSC.h"
#include "NotesLoaderSM.h"
@@ -468,6 +469,13 @@ public:
return 1;
}
+ static int UsesSplitTiming( T* p, lua_State *L )
+ {
+ Song *song = SONGMAN->GetSongFromSteps(p);
+ lua_pushboolean(L, p->m_Timing != song->m_SongTiming);
+ return 1;
+ }
+
LunaSteps()
{
@@ -486,6 +494,7 @@ public:
ADD_METHOD( IsAnEdit );
ADD_METHOD( IsAutogen );
ADD_METHOD( IsAPlayerEdit );
+ ADD_METHOD( UsesSplitTiming );
}
};