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

IsAnExtraStage().

Browse Source
This commit is contained in:
Steve Checkoway
2006-08-06 02:36:23 +00:00
parent 6a6f55b7c7
commit a89e8b9cb2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+10 -7
View File
@@ -688,7 +688,7 @@ int GameState::GetStageIndex() const
int GameState::GetNumStagesLeft() const int GameState::GetNumStagesLeft() const
{ {
if( IsExtraStage() || IsExtraStage2() ) if( IsAnExtraStage() )
return 1; return 1;
if( GAMESTATE->IsEventMode() ) if( GAMESTATE->IsEventMode() )
return 999; return 999;
@@ -710,18 +710,19 @@ bool GameState::IsFinalStage() const
return m_iCurrentStageIndex + iPredictedStageForCurSong == PREFSMAN->m_iSongsPerPlay; return m_iCurrentStageIndex + iPredictedStageForCurSong == PREFSMAN->m_iSongsPerPlay;
} }
bool GameState::IsAnExtraStage() const
{
return !IsEventMode() && m_iCurrentStageIndex >= PREFSMAN->m_iSongsPerPlay;
}
bool GameState::IsExtraStage() const bool GameState::IsExtraStage() const
{ {
if( GAMESTATE->IsEventMode() ) return !IsEventMode() && m_iCurrentStageIndex == PREFSMAN->m_iSongsPerPlay;
return false;
return m_iCurrentStageIndex == PREFSMAN->m_iSongsPerPlay;
} }
bool GameState::IsExtraStage2() const bool GameState::IsExtraStage2() const
{ {
if( GAMESTATE->IsEventMode() ) return !IsEventMode() && m_iCurrentStageIndex == PREFSMAN->m_iSongsPerPlay+1;
return false;
return m_iCurrentStageIndex == PREFSMAN->m_iSongsPerPlay+1;
} }
Stage GameState::GetCurrentStage() const Stage GameState::GetCurrentStage() const
@@ -1916,6 +1917,7 @@ public:
static int GetCourseSongIndex( T* p, lua_State *L ) { lua_pushnumber(L, p->GetCourseSongIndex() ); return 1; } static int GetCourseSongIndex( T* p, lua_State *L ) { lua_pushnumber(L, p->GetCourseSongIndex() ); return 1; }
static int GetLoadingCourseSongIndex( T* p, lua_State *L ) { lua_pushnumber(L, p->GetLoadingCourseSongIndex() ); return 1; } static int GetLoadingCourseSongIndex( T* p, lua_State *L ) { lua_pushnumber(L, p->GetLoadingCourseSongIndex() ); return 1; }
static int IsFinalStage( T* p, lua_State *L ) { lua_pushboolean(L, p->IsFinalStage() ); return 1; } static int IsFinalStage( T* p, lua_State *L ) { lua_pushboolean(L, p->IsFinalStage() ); return 1; }
static int IsAnExtraStage( T* p, lua_State *L ) { lua_pushboolean(L, p->IsAnExtraStage() ); return 1; }
static int IsExtraStage( T* p, lua_State *L ) { lua_pushboolean(L, p->IsExtraStage() ); return 1; } static int IsExtraStage( T* p, lua_State *L ) { lua_pushboolean(L, p->IsExtraStage() ); return 1; }
static int IsExtraStage2( T* p, lua_State *L ) { lua_pushboolean(L, p->IsExtraStage2() ); return 1; } static int IsExtraStage2( T* p, lua_State *L ) { lua_pushboolean(L, p->IsExtraStage2() ); return 1; }
static int GetCurrentStage( T* p, lua_State *L ) { lua_pushnumber(L, p->GetCurrentStage() ); return 1; } static int GetCurrentStage( T* p, lua_State *L ) { lua_pushnumber(L, p->GetCurrentStage() ); return 1; }
@@ -2035,6 +2037,7 @@ public:
ADD_METHOD( GetCourseSongIndex ); ADD_METHOD( GetCourseSongIndex );
ADD_METHOD( GetLoadingCourseSongIndex ); ADD_METHOD( GetLoadingCourseSongIndex );
ADD_METHOD( IsFinalStage ); ADD_METHOD( IsFinalStage );
ADD_METHOD( IsAnExtraStage );
ADD_METHOD( IsExtraStage ); ADD_METHOD( IsExtraStage );
ADD_METHOD( IsExtraStage2 ); ADD_METHOD( IsExtraStage2 );
ADD_METHOD( GetCurrentStage ); ADD_METHOD( GetCurrentStage );
stepmania/src/GameState.h
+1
View File
@@ -125,6 +125,7 @@ public:
void FinishStage(); void FinishStage();
int GetNumStagesLeft() const; int GetNumStagesLeft() const;
bool IsFinalStage() const; bool IsFinalStage() const;
bool IsAnExtraStage() const;
bool IsExtraStage() const; bool IsExtraStage() const;
bool IsExtraStage2() const; bool IsExtraStage2() const;
Stage GetCurrentStage() const; Stage GetCurrentStage() const;