expose Center1Player

This commit is contained in:
Glenn Maynard
2006-02-28 21:55:58 +00:00
parent 7146649851
commit 054cacfc11
2 changed files with 18 additions and 10 deletions
+16 -10
View File
@@ -487,16 +487,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
// visible and don't bother setting its position.
float fPlayerX = PLAYER_X( pi->GetName(), GAMESTATE->GetCurrentStyle()->m_StyleType );
/* Perhaps this should be handled better by defining a new
* StyleType for ONE_PLAYER_ONE_CREDIT_AND_ONE_COMPUTER,
* but for now just ignore Center1Player when it's Battle or Rave
* Mode. This doesn't begin to address two-player solo (6 arrows) */
if( g_bCenter1Player &&
(bool)ALLOW_CENTER_1_PLAYER &&
GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE &&
GAMESTATE->m_PlayMode != PLAY_MODE_RAVE &&
GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_ONE_SIDE )
if( Center1Player() )
fPlayerX = SCREEN_CENTER_X;
pi->m_pPlayer->SetXY( fPlayerX, SCREEN_CENTER_Y );
@@ -843,6 +834,19 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
m_GiveUpTimer.SetZero();
}
bool ScreenGameplay::Center1Player() const
{
/* Perhaps this should be handled better by defining a new
* StyleType for ONE_PLAYER_ONE_CREDIT_AND_ONE_COMPUTER,
* but for now just ignore Center1Player when it's Battle or Rave
* Mode. This doesn't begin to address two-player solo (6 arrows) */
return g_bCenter1Player &&
(bool)ALLOW_CENTER_1_PLAYER &&
GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE &&
GAMESTATE->m_PlayMode != PLAY_MODE_RAVE &&
GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_ONE_SIDE;
}
//
// fill in m_apSongsQueue, m_vpStepsQueue, m_asModifiersQueue
//
@@ -2735,9 +2739,11 @@ public:
LunaScreenGameplay() { LUA->Register( Register ); }
static int GetNextCourseSong( T* p, lua_State *L ) { p->GetNextCourseSong()->PushSelf(L); return 1; }
static int Center1Player( T* p, lua_State *L ) { lua_pushboolean( L, p->Center1Player() ); return 1; }
static void Register( Lua *L )
{
ADD_METHOD( GetNextCourseSong );
ADD_METHOD( Center1Player );
Luna<T>::Register( L );
}
+2
View File
@@ -110,6 +110,8 @@ public:
virtual ScreenType GetScreenType() const { return gameplay; }
bool Center1Player() const;
//
// Lua
//