sync up hg with the svn code in preparation for sm-ssc v1.0 beta 4; this adds at least one new Lua binding and the WIP warps code (partially-working in quirks mode).

2010-05-30 17:03:30 -05:00
parent 317e37fe65
commit f79d6fb365
7 changed files with 98 additions and 59 deletions
@@ -184,7 +184,7 @@ public:
 	//bool		m_bStop;	// in the middle of a stop (freeze or delay)
 	bool		m_bFreeze;	// in the middle of a freeze
 	bool		m_bDelay;	// in the middle of a delay
-	//int			m_iWarpToRow, m_iWarpFromRow;	// used for warping
+	int			m_iWarpBeginRow, m_iWarpEndRow;	// used for warping
 	RageTimer	m_LastBeatUpdate; // time of last m_fSongBeat, etc. update
 	BroadcastOnChange<bool> m_bGameplayLeadIn;