Merge branch 'DefaultHeart' of https://github.com/kyzentun/stepmania

src/GameState.cpp

@@ -2439,6 +2439,7 @@ public:
 		p->m_Position.PushSelf(L);
 		return 1;
 	}
+	DEFINE_METHOD( GetLastGameplayDuration, m_DanceDuration )
 	DEFINE_METHOD( GetGameplayLeadIn,		m_bGameplayLeadIn )
 	DEFINE_METHOD( GetCoins,			m_iCoins )
 	DEFINE_METHOD( IsSideJoined,			m_bSideIsJoined[Enum::Check<PlayerNumber>(L, 1)] )
@@ -2848,6 +2849,7 @@ public:
 		ADD_METHOD( GetSongFreeze );
 		ADD_METHOD( GetSongDelay );*/
 		ADD_METHOD( GetSongPosition );
+		ADD_METHOD( GetLastGameplayDuration );
 		ADD_METHOD( GetGameplayLeadIn );
 		ADD_METHOD( GetCoins );
 		ADD_METHOD( IsSideJoined );

src/GameState.h

@@ -271,6 +271,10 @@ public:
 	float	m_fLastHasteUpdateMusicSeconds;
 	float	m_fAccumulatedHasteSeconds;
 
+	// used by themes that support heart rate entry.
+	RageTimer m_DanceStartTime;
+	float m_DanceDuration;
+
 	// Random Attacks & Attack Mines
 	vector<RString>		m_RandomAttacks;
 

src/ScreenGameplay.cpp

@@ -2509,6 +2509,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		else
 			SOUND->PlayOnceFromAnnouncer( "gameplay here we go normal" );
 
+		GAMESTATE->m_DanceStartTime.Touch();
+
 		m_Go.StartTransitioning( SM_None );
 		GAMESTATE->m_bGameplayLeadIn.Set( false );
 		m_DancingState = STATE_DANCING; // STATE CHANGE!  Now the user is allowed to press Back
@@ -2558,6 +2560,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_LeaveGameplay )
 	{
+		GAMESTATE->m_DanceDuration= GAMESTATE->m_DanceStartTime.Ago();
 		// update dancing characters for win / lose
 		DancingCharacters *pDancers = NULL;
 		if( m_pSongBackground )

src/ScreenOptionsManageProfiles.cpp

@@ -113,7 +113,7 @@ void ScreenOptionsManageProfiles::BeginScreen()
 		Profile *pProfile = PROFILEMAN->GetLocalProfile( *s );
 		ASSERT( pProfile != NULL );
 
-		RString sCommand = ssprintf( "gamecommand;screen,ScreenOptionsEditProfile;profileid,%s;name,dummy", s->c_str() );
+		RString sCommand = ssprintf( "gamecommand;screen,ScreenOptionsCustomizeProfile;profileid,%s;name,dummy", s->c_str() );
 		OptionRowHandler *pHand = OptionRowHandlerUtil::Make( ParseCommands(sCommand) );
 		OptionRowDefinition &def = pHand->m_Def;
 		def.m_layoutType = LAYOUT_SHOW_ALL_IN_ROW;
@@ -380,7 +380,7 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus & )
 		}
 		else
 		{
-			//ADD_ACTION( ProfileAction_Edit );
+			ADD_ACTION( ProfileAction_Edit );
 			ADD_ACTION( ProfileAction_Rename );
 			ADD_ACTION( ProfileAction_Delete );
 		}

src/ThemeManager.cpp

@@ -1056,6 +1056,7 @@ void ThemeManager::PushMetric( Lua *L, const RString &sMetricsGroup, const RStri
 	if(sMetricsGroup == "" || sValueName == "")
 	{
 		LuaHelpers::ReportScriptError("PushMetric:  Attempted to fetch metric with empty group name or empty value name.");
+		lua_pushnil(L);
 		return;
 	}
 	RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sMetricsGroup, sValueName );