actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added CourseSongRewardLives metric to LifeMeterBattery.

Browse Source
This commit is contained in:
Kyzentun
2014-08-06 15:26:54 -06:00
parent 6be879f06d
commit 6aad3c8f75
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LifeMeterBattery.cpp
+12 -1
View File
@@ -30,6 +30,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
MINES_SUBTRACT_LIVES.Load(sType, "MinesSubtractLives");
HELD_ADD_LIVES.Load(sType, "HeldAddLives");
LET_GO_SUBTRACT_LIVES.Load(sType, "LetGoSubtractLives");
COURSE_SONG_REWARD_LIVES.Load(sType, "CourseSongRewardLives");
LIVES_FORMAT.Load(sType, "NumLivesFormat");
@@ -89,7 +90,17 @@ void LifeMeterBattery::OnSongEnded()
if( pCourse && pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].iGainLives > -1 )
m_iLivesLeft += pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].iGainLives;
else
m_iLivesLeft += ( GAMESTATE->m_pCurSteps[pn]->GetMeter()>=8 ? 2 : 1 );
{
Lua *L= LUA->Get();
COURSE_SONG_REWARD_LIVES.PushSelf(L);
PushSelf(L);
LuaHelpers::Push(L, pn);
RString error= "Error running CourseSongRewardLives callback: ";
LuaHelpers::RunScriptOnStack(L, error, 1, 1, true);
m_iLivesLeft += luaL_optnumber(L, -1, 0);
lua_settop(L, 0);
LUA->Release(L);
}
m_iLivesLeft = min( m_iLivesLeft, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives );
if( m_iTrailingLivesLeft < m_iLivesLeft )