Merge with default

Docs/Changelog_sm5.txt

@@ -5,10 +5,15 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 ????????? | 20110???
+StepMania 5.0 Preview 2 | 20110???
 --------------------------------------------------------------------------------
 
-2011/05/31
+2011/06/02
+----------
+* [BPMDisplay] Added SetFromSteps Lua binding. [AJ]
+
+2011/06/01
+----------
 * [TimingData] Added the HasScrollChanges lua binding. [Wolfman2000]
 
 2011/05/31
@@ -16,6 +21,7 @@ StepMania 5.0 ????????? | 20110???
 * [Player] Added the BattleRaveMirror metric. This determines if Battle and
   Rave mode will have the two players with mirrored charts or not. By default,
   this is set to true, preserving the ITG style behavior. [Wolfman2000]
+* [TimingData] Added the HasScrollChanges lua binding. [Wolfman2000]
 
 ================================================================================
 StepMania 5.0 Preview 1 | 20110529

Docs/Luadoc/LuaDocumentation.xml

@@ -902,12 +902,18 @@
 	<Function name='bezier' theme='_fallback' return='void' arguments=''>
 		[02 Actor.lua]
 	</Function>
+	<Function name='Center' theme='_fallback' return='void' arguments=''>
+		[02 Actor.lua] Centers an Actor on the screen. (equivalent to <code>x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y</code>)
+	</Function>
 	<Function name='CenterX' theme='_fallback' return='void' arguments=''>
 		[03 ProductivityHelpers.lua] Centers an Actor on the X axis. (equivalent to <code>x,SCREEN_CENTER_X</code>)
 	</Function>
 	<Function name='CenterY' theme='_fallback' return='void' arguments=''>
 		[03 ProductivityHelpers.lua] Centers an Actor on the y axis. (equivalent to <code>y,SCREEN_CENTER_Y</code>)
 	</Function>
+	<Function name='FullScreen' theme='_fallback' return='void' arguments=''>
+		[02 Actor.lua] Stretches an Actor to cover the screen. (equivalent to <code>stretchto,0,0,SCREEN_WIDTH,SCREEN_HEIGHT</code>)
+	</Function>
 	<Function name='heartbeat' theme='_fallback' return='void' arguments='float fEffectPeriod'>
 		[03 ProductivityHelpers.lua] A customized version of pulse that is more appealing for on-beat effects.
 	</Function>
@@ -1267,6 +1273,9 @@
 	<Function name='SetFromSong' sm-ssc='true' return='void' arguments='Song s'>
 		Sets the BPMDisplay from the specified Song.
 	</Function>
+	<Function name='SetFromSteps' sm-ssc='true' return='void' arguments='Steps s'>
+		Sets the BPMDisplay from the specified Steps.
+	</Function>
 </Class>
 <Class name='Character'>
 	<Function name='GetCardPath' return='string' arguments=''>

Themes/_fallback/Fonts/_misc 16px.ini

@@ -27,7 +27,7 @@ Top=8
 Baseline=23
 LineSpacing=24
 
-line 0=☆★♡♥Ω
+line 0=☆★♥♡Ω
 map doublezeta=5
 map planet=6
 

src/BPMDisplay.cpp

@@ -9,6 +9,7 @@
 #include "CommonMetrics.h"
 #include "LocalizedString.h"
 #include "Song.h"
+#include "Steps.h"
 
 #include <limits.h>
 
@@ -198,6 +199,17 @@ void BPMDisplay::SetBpmFromSong( const Song* pSong )
 	}
 }
 
+void BPMDisplay::SetBpmFromSteps( const Steps* pSteps )
+{
+	ASSERT( pSteps );
+	DisplayBpms bpms;
+	float fMinBPM, fMaxBPM;
+	pSteps->m_Timing.GetActualBPM( fMinBPM, fMaxBPM );
+	bpms.Add( fMinBPM );
+	bpms.Add( fMaxBPM );
+	m_fCycleTime = 1.0f;
+}
+
 void BPMDisplay::SetBpmFromCourse( const Course* pCourse )
 {
 	ASSERT( pCourse );
@@ -307,6 +319,16 @@ public:
 		}
 		return 0;
 	}
+	static int SetFromSteps( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { p->NoBPM(); }
+		else
+		{
+			const Steps* pSteps = Luna<Steps>::check( L, 1, true );
+			p->SetBpmFromSteps(pSteps);
+		}
+		return 0;
+	}
 	static int SetFromCourse( T* p, lua_State *L )
 	{
 		if( lua_isnil(L,1) ) { p->NoBPM(); }
@@ -323,6 +345,7 @@ public:
 	{
 		ADD_METHOD( SetFromGameState );
 		ADD_METHOD( SetFromSong );
+		ADD_METHOD( SetFromSteps );
 		ADD_METHOD( SetFromCourse );
 		ADD_METHOD( GetText );
 	}

src/BPMDisplay.h

@@ -6,6 +6,7 @@
 #include "ThemeMetric.h"
 #include "LocalizedString.h"
 class Song;
+class Steps;
 class Course;
 struct DisplayBpms;
 
@@ -30,6 +31,11 @@ public:
 	 * @param pSong the song in question.
 	 */
 	void SetBpmFromSong( const Song* pSong );
+	/**
+	 * @brief Use the BPM[s] from a steps.
+	 * @param pSteps the steps in question.
+	 */
+	void SetBpmFromSteps( const Steps* pSteps );
 	/**
 	 * @brief Use the BPM[s] from a course.
 	 * @param pCourse the course in question.

src/ScreenEdit.cpp

@@ -2354,12 +2354,16 @@ void ScreenEdit::TransitionEditState( EditState em )
 
 		case STATE_PLAYING:
 			AdjustSync::HandleSongEnd();
+			if (!GAMESTATE->m_bIsUsingStepTiming)
+				GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = backupStepTiming;
 			if( AdjustSync::IsSyncDataChanged() )
 				ScreenSaveSync::PromptSaveSync();
 			break;
 
 		case STATE_RECORDING:
 			SetDirty( true );
+			if (!GAMESTATE->m_bIsUsingStepTiming)
+				GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = backupStepTiming;
 			SaveUndo();
 
 			// delete old TapNotes in the range
@@ -2410,6 +2414,12 @@ void ScreenEdit::TransitionEditState( EditState em )
 		GAMESTATE->UpdateSongPosition( fSeconds, GetAppropriateTiming(), RageZeroTimer, true );
 
 		GAMESTATE->m_bGameplayLeadIn.Set( false );
+		
+		if (!GAMESTATE->m_bIsUsingStepTiming)
+		{
+			backupStepTiming = GetAppropriateTiming();
+			GAMESTATE->m_pCurSteps[PLAYER_1]->m_Timing = GAMESTATE->m_pCurSong->m_SongTiming;
+		}
 
 		/* Reset the note skin, in case preferences have changed. */
 		// XXX

src/ScreenEdit.h

@@ -251,6 +251,13 @@ protected:
 
 	BitmapText		m_textInputTips;
 	
+	/**
+	 * @brief Keep a backup of the present Step TimingData when
+	 * entering a playing or recording state.
+	 *
+	 * This is mainly to allow playing a chart with Song Timing. */
+	TimingData		backupStepTiming;
+	
 	/** @brief The current TapNote that would be inserted. */
 	TapNote			m_selectedTap;