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

SideJoinedP1, SideJoinedP2 -> PlayerJoined(P1)

Browse Source 
move most of ScreenSystemLayer into Lua
This commit is contained in:
Glenn Maynard
2007-02-15 11:30:22 +00:00
parent ed3dc0841e
commit 67f372af09
5 changed files with 144 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+3 -1
View File
@@ -317,7 +317,9 @@ void GameState::Reset()
void GameState::JoinPlayer( PlayerNumber pn ) void GameState::JoinPlayer( PlayerNumber pn )
{ {
m_bSideIsJoined[pn] = true; m_bSideIsJoined[pn] = true;
MESSAGEMAN->Broadcast( (MessageID)(Message_SideJoinedP1+pn) ); Message msg( MessageIDToString(Message_PlayerJoined) );
msg.SetParam( "Player", pn );
MESSAGEMAN->Broadcast( msg );
if( m_MasterPlayerNumber == PLAYER_INVALID ) if( m_MasterPlayerNumber == PLAYER_INVALID )
m_MasterPlayerNumber = pn; m_MasterPlayerNumber = pn;
stepmania/src/MessageManager.cpp
+1 -2
View File
@@ -52,8 +52,7 @@ static const char *MessageIDNames[] = {
"MenuRightP2", "MenuRightP2",
"MenuSelectionChanged", "MenuSelectionChanged",
"CoinInserted", "CoinInserted",
"SideJoinedP1", "PlayerJoined",
"SideJoinedP2",
"PlayersFinalized", "PlayersFinalized",
"AutosyncChanged", "AutosyncChanged",
"PreferredSongGroupChanged", "PreferredSongGroupChanged",
stepmania/src/MessageManager.h
+1 -2
View File
@@ -49,8 +49,7 @@ enum MessageID
Message_MenuRightP2, Message_MenuRightP2,
Message_MenuSelectionChanged, Message_MenuSelectionChanged,
Message_CoinInserted, Message_CoinInserted,
Message_SideJoinedP1, Message_PlayerJoined,
Message_SideJoinedP2,
Message_PlayersFinalized, Message_PlayersFinalized,
Message_AutosyncChanged, Message_AutosyncChanged,
Message_PreferredSongGroupChanged, Message_PreferredSongGroupChanged,
stepmania/src/ScreenSystemLayer.cpp
+139 -205
View File
@@ -10,222 +10,156 @@
#include "ProfileManager.h" #include "ProfileManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "ThemeMetric.h"
#include "LocalizedString.h"
namespace
{
LocalizedString CREDITS_PRESS_START("ScreenSystemLayer","CreditsPressStart");
LocalizedString CREDITS_INSERT_CARD("ScreenSystemLayer","CreditsInsertCard");
LocalizedString CREDITS_CARD_TOO_LATE("ScreenSystemLayer","CreditsCardTooLate");
LocalizedString CREDITS_CARD_NO_NAME("ScreenSystemLayer","CreditsCardNoName");
LocalizedString CREDITS_CARD_READY("ScreenSystemLayer","CreditsCardReady");
LocalizedString CREDITS_CARD_CHECKING("ScreenSystemLayer","CreditsCardChecking");
LocalizedString CREDITS_CARD_REMOVED("ScreenSystemLayer","CreditsCardRemoved");
LocalizedString CREDITS_FREE_PLAY("ScreenSystemLayer","CreditsFreePlay");
LocalizedString CREDITS_CREDITS("ScreenSystemLayer","CreditsCredits");
LocalizedString CREDITS_NOT_PRESENT("ScreenSystemLayer","CreditsNotPresent");
LocalizedString CREDITS_LOAD_FAILED("ScreenSystemLayer","CreditsLoadFailed");
LocalizedString CREDITS_LOADED_FROM_LAST_GOOD_APPEND("ScreenSystemLayer","CreditsLoadedFromLastGoodAppend");
ThemeMetric<bool> CREDITS_JOIN_ONLY( "ScreenSystemLayer", "CreditsJoinOnly" );
RString GetCreditsMessage( PlayerNumber pn )
{
if( (bool)CREDITS_JOIN_ONLY && !GAMESTATE->PlayersCanJoin() )
return RString();
bool bShowCreditsMessage;
if( SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == system_menu )
bShowCreditsMessage = true;
else if( MEMCARDMAN->GetCardsLocked() )
bShowCreditsMessage = !GAMESTATE->IsPlayerEnabled( pn );
else
bShowCreditsMessage = !GAMESTATE->m_bSideIsJoined[pn];
if( !bShowCreditsMessage )
{
MemoryCardState mcs = MEMCARDMAN->GetCardState( pn );
const Profile* pProfile = PROFILEMAN->GetProfile( pn );
switch( mcs )
{
case MemoryCardState_NoCard:
// this is a local machine profile
if( PROFILEMAN->LastLoadWasFromLastGood(pn) )
return pProfile->GetDisplayNameOrHighScoreName() + CREDITS_LOADED_FROM_LAST_GOOD_APPEND.GetValue();
else if( PROFILEMAN->LastLoadWasTamperedOrCorrupt(pn) )
return CREDITS_LOAD_FAILED.GetValue();
// Prefer the name of the profile over the name of the card.
else if( PROFILEMAN->IsPersistentProfile(pn) )
return pProfile->GetDisplayNameOrHighScoreName();
else if( GAMESTATE->PlayersCanJoin() )
return CREDITS_INSERT_CARD.GetValue();
else
return RString();
case MemoryCardState_Error: return THEME->GetMetric( "ScreenSystemLayer", "CreditsCard" + MEMCARDMAN->GetCardError(pn) );
case MemoryCardState_TooLate: return CREDITS_CARD_TOO_LATE.GetValue();
case MemoryCardState_Checking: return CREDITS_CARD_CHECKING.GetValue();
case MemoryCardState_Removed: return CREDITS_CARD_REMOVED.GetValue();
case MemoryCardState_Ready:
{
// If the profile failed to load and there was no usable backup...
if( PROFILEMAN->LastLoadWasTamperedOrCorrupt(pn) && !PROFILEMAN->LastLoadWasFromLastGood(pn) )
return CREDITS_LOAD_FAILED.GetValue();
// If there is a local profile loaded, prefer it over the name of the memory card.
if( PROFILEMAN->IsPersistentProfile(pn) )
{
RString s = pProfile->GetDisplayNameOrHighScoreName();
if( s.empty() )
s = CREDITS_CARD_NO_NAME.GetValue();
if( PROFILEMAN->LastLoadWasFromLastGood(pn) )
s += CREDITS_LOADED_FROM_LAST_GOOD_APPEND.GetValue();
return s;
}
else if( !MEMCARDMAN->IsNameAvailable(pn) )
return CREDITS_CARD_READY.GetValue();
else if( !MEMCARDMAN->GetName(pn).empty() )
return MEMCARDMAN->GetName(pn);
else
return CREDITS_CARD_NO_NAME.GetValue();
}
default:
FAIL_M( ssprintf("%i",mcs) );
}
}
else // bShowCreditsMessage
{
switch( GAMESTATE->GetCoinMode() )
{
case COIN_MODE_HOME:
if( GAMESTATE->PlayersCanJoin() )
return CREDITS_PRESS_START.GetValue();
else
return CREDITS_NOT_PRESENT.GetValue();
case COIN_MODE_PAY:
{
int Credits = GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit;
int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit;
RString sCredits = CREDITS_CREDITS;
if( Credits > 0 || PREFSMAN->m_iCoinsPerCredit == 1 )
sCredits += ssprintf(" %d", Credits);
if( PREFSMAN->m_iCoinsPerCredit > 1 )
sCredits += ssprintf(" %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit.Get() );
return sCredits;
}
case COIN_MODE_FREE:
if( GAMESTATE->PlayersCanJoin() )
return CREDITS_FREE_PLAY.GetValue();
else
return CREDITS_NOT_PRESENT.GetValue();
default:
ASSERT(0);
}
}
}
};
// lua start
#include "LuaBinding.h"
namespace
{
int GetCreditsMessage( lua_State *L )
{
PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
RString sText = GetCreditsMessage( pn );
LuaHelpers::Push( L, sText );
return 1;
}
const luaL_Reg ScreenSystemLayerHelpersTable[] =
{
LIST_METHOD( GetCreditsMessage ),
{ NULL, NULL }
};
}
LUA_REGISTER_NAMESPACE( ScreenSystemLayerHelpers )
REGISTER_SCREEN_CLASS( ScreenSystemLayer ); REGISTER_SCREEN_CLASS( ScreenSystemLayer );
void ScreenSystemLayer::Init() void ScreenSystemLayer::Init()
{ {
SubscribeToMessage( "RefreshCreditText" );
SubscribeToMessage( "CoinInserted" );
SubscribeToMessage( "SystemMessage" );
SubscribeToMessage( "SystemMessageNoAnimate" );
SubscribeToMessage( "HideSystemMessage" );
FOREACH_PlayerNumber( pn )
SubscribeToMessage( enum_add2(Message_SideJoinedP1, pn) );
CREDITS_PRESS_START .Load(m_sName,"CreditsPressStart");
CREDITS_INSERT_CARD .Load(m_sName,"CreditsInsertCard");
CREDITS_CARD_TOO_LATE .Load(m_sName,"CreditsCardTooLate");
CREDITS_CARD_NO_NAME .Load(m_sName,"CreditsCardNoName");
CREDITS_CARD_READY .Load(m_sName,"CreditsCardReady");
CREDITS_CARD_CHECKING .Load(m_sName,"CreditsCardChecking");
CREDITS_CARD_REMOVED .Load(m_sName,"CreditsCardRemoved");
CREDITS_FREE_PLAY .Load(m_sName,"CreditsFreePlay");
CREDITS_CREDITS .Load(m_sName,"CreditsCredits");
CREDITS_NOT_PRESENT .Load(m_sName,"CreditsNotPresent");
CREDITS_LOAD_FAILED .Load(m_sName,"CreditsLoadFailed");
CREDITS_LOADED_FROM_LAST_GOOD_APPEND.Load(m_sName,"CreditsLoadedFromLastGoodAppend");
CREDITS_JOIN_ONLY .Load( m_sName, "CreditsJoinOnly" );
Screen::Init(); Screen::Init();
this->AddChild(&m_textMessage);
FOREACH_PlayerNumber( p )
this->AddChild(&m_textCredits[p]);
ReloadCreditsText();
/* This will be done when we set up the first screen, after GAMESTATE->Reset has
* been called. */
// RefreshCreditsMessages();
m_sprOverlay.Load( THEME->GetPathB("ScreenSystemLayer", "overlay") ); m_sprOverlay.Load( THEME->GetPathB("ScreenSystemLayer", "overlay") );
this->AddChild( m_sprOverlay ); this->AddChild( m_sprOverlay );
} }
void ScreenSystemLayer::ReloadCreditsText()
{
if( m_sprMessageFrame.IsLoaded() )
this->RemoveChild( m_sprMessageFrame );
m_sprMessageFrame.Load( THEME->GetPathG(m_sName,"MessageFrame") );
this->AddChild( m_sprMessageFrame );
m_sprMessageFrame->SetName( "MessageFrame" );
SET_XY_AND_ON_COMMAND( m_sprMessageFrame );
m_sprMessageFrame->SetVisible( false );
m_textMessage.LoadFromFont( THEME->GetPathF(m_sName,"message") );
m_textMessage.SetName( "Message" );
SET_XY_AND_ON_COMMAND( m_textMessage );
m_textMessage.SetVisible( false );
FOREACH_PlayerNumber( p )
{
m_textCredits[p].LoadFromFont( THEME->GetPathF("ScreenManager","credits") );
m_textCredits[p].SetName( ssprintf("CreditsP%d",p+1) );
SET_XY_AND_ON_COMMAND( &m_textCredits[p] );
}
this->SortByDrawOrder();
}
RString ScreenSystemLayer::GetCreditsMessage( PlayerNumber pn ) const
{
if( (bool)CREDITS_JOIN_ONLY && !GAMESTATE->PlayersCanJoin() )
return RString();
bool bShowCreditsMessage;
if( SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == system_menu )
bShowCreditsMessage = true;
else if( MEMCARDMAN->GetCardsLocked() )
bShowCreditsMessage = !GAMESTATE->IsPlayerEnabled( pn );
else
bShowCreditsMessage = !GAMESTATE->m_bSideIsJoined[pn];
if( !bShowCreditsMessage )
{
MemoryCardState mcs = MEMCARDMAN->GetCardState( pn );
const Profile* pProfile = PROFILEMAN->GetProfile( pn );
switch( mcs )
{
case MemoryCardState_NoCard:
// this is a local machine profile
if( PROFILEMAN->LastLoadWasFromLastGood(pn) )
return pProfile->GetDisplayNameOrHighScoreName() + CREDITS_LOADED_FROM_LAST_GOOD_APPEND.GetValue();
else if( PROFILEMAN->LastLoadWasTamperedOrCorrupt(pn) )
return CREDITS_LOAD_FAILED.GetValue();
// Prefer the name of the profile over the name of the card.
else if( PROFILEMAN->IsPersistentProfile(pn) )
return pProfile->GetDisplayNameOrHighScoreName();
else if( GAMESTATE->PlayersCanJoin() )
return CREDITS_INSERT_CARD.GetValue();
else
return RString();
case MemoryCardState_Error: return THEME->GetMetric( m_sName, "CreditsCard" + MEMCARDMAN->GetCardError(pn) );
case MemoryCardState_TooLate: return CREDITS_CARD_TOO_LATE.GetValue();
case MemoryCardState_Checking: return CREDITS_CARD_CHECKING.GetValue();
case MemoryCardState_Removed: return CREDITS_CARD_REMOVED.GetValue();
case MemoryCardState_Ready:
{
// If the profile failed to load and there was no usable backup...
if( PROFILEMAN->LastLoadWasTamperedOrCorrupt(pn) && !PROFILEMAN->LastLoadWasFromLastGood(pn) )
return CREDITS_LOAD_FAILED.GetValue();
// If there is a local profile loaded, prefer it over the name of the memory card.
if( PROFILEMAN->IsPersistentProfile(pn) )
{
RString s = pProfile->GetDisplayNameOrHighScoreName();
if( s.empty() )
s = CREDITS_CARD_NO_NAME.GetValue();
if( PROFILEMAN->LastLoadWasFromLastGood(pn) )
s += CREDITS_LOADED_FROM_LAST_GOOD_APPEND.GetValue();
return s;
}
else if( !MEMCARDMAN->IsNameAvailable(pn) )
return CREDITS_CARD_READY.GetValue();
else if( !MEMCARDMAN->GetName(pn).empty() )
return MEMCARDMAN->GetName(pn);
else
return CREDITS_CARD_NO_NAME.GetValue();
}
default:
FAIL_M( ssprintf("%i",mcs) );
}
}
else // bShowCreditsMessage
{
switch( GAMESTATE->GetCoinMode() )
{
case COIN_MODE_HOME:
if( GAMESTATE->PlayersCanJoin() )
return CREDITS_PRESS_START.GetValue();
else
return CREDITS_NOT_PRESENT.GetValue();
case COIN_MODE_PAY:
{
int Credits = GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit;
int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit;
RString sCredits = CREDITS_CREDITS;
if( Credits > 0 || PREFSMAN->m_iCoinsPerCredit == 1 )
sCredits += ssprintf(" %d", Credits);
if( PREFSMAN->m_iCoinsPerCredit > 1 )
sCredits += ssprintf(" %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit.Get() );
return sCredits;
}
case COIN_MODE_FREE:
if( GAMESTATE->PlayersCanJoin() )
return CREDITS_FREE_PLAY.GetValue();
else
return CREDITS_NOT_PRESENT.GetValue();
default:
ASSERT(0);
}
}
}
void ScreenSystemLayer::HandleMessage( const Message &msg )
{
bool bJoinedMessage = false;
FOREACH_PlayerNumber( pn )
if( msg == enum_add2(Message_SideJoinedP1, pn) )
bJoinedMessage = true;
if( msg == "RefreshCreditText" || msg == "CoinInserted" || bJoinedMessage )
{
// update joined
FOREACH_PlayerNumber( pn )
m_textCredits[pn].SetText( GetCreditsMessage(pn) );
}
else if( msg == "SystemMessage" )
{
m_sprMessageFrame->SetVisible( true );
m_sprMessageFrame->PlayCommand( "On" );
m_sprMessageFrame->PlayCommand( "Off" );
m_textMessage.SetVisible( true );
m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
m_textMessage.PlayCommand( "On" );
m_textMessage.PlayCommand( "Off" );
}
else if( msg == "SystemMessageNoAnimate" )
{
m_sprMessageFrame->SetVisible( true );
m_sprMessageFrame->PlayCommand( "On" );
m_sprMessageFrame->FinishTweening();
m_sprMessageFrame->PlayCommand( "Off" );
m_textMessage.SetVisible( true );
m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
m_textMessage.PlayCommand( "On" );
m_textMessage.FinishTweening();
m_textMessage.PlayCommand( "Off" );
}
else if( msg == "HideSystemMessage" )
{
m_sprMessageFrame->SetVisible( false );
m_textMessage.SetVisible( false );
}
Screen::HandleMessage( msg );
}
void ScreenSystemLayer::Update( float fDeltaTime )
{
Screen::Update(fDeltaTime);
}
/* /*
* (c) 2001-2005 Chris Danford, Glenn Maynard * (c) 2001-2005 Chris Danford, Glenn Maynard
* All rights reserved. * All rights reserved.
stepmania/src/ScreenSystemLayer.h
-28
View File
@@ -4,42 +4,14 @@
#define ScreenSystemLayer_H #define ScreenSystemLayer_H
#include "Screen.h" #include "Screen.h"
#include "BitmapText.h"
#include "Quad.h"
#include "ThemeMetric.h"
#include "AutoActor.h" #include "AutoActor.h"
#include "LocalizedString.h"
class ScreenSystemLayer : public Screen class ScreenSystemLayer : public Screen
{ {
public: public:
virtual void Init(); virtual void Init();
void HandleMessage( const Message &msg );
void ReloadCreditsText();
void Update( float fDeltaTime );
private: private:
AutoActor m_sprMessageFrame;
BitmapText m_textMessage;
BitmapText m_textCredits[NUM_PLAYERS];
RString GetCreditsMessage( PlayerNumber pn ) const;
LocalizedString CREDITS_PRESS_START;
LocalizedString CREDITS_INSERT_CARD;
LocalizedString CREDITS_CARD_TOO_LATE;
LocalizedString CREDITS_CARD_NO_NAME;
LocalizedString CREDITS_CARD_READY;
LocalizedString CREDITS_CARD_CHECKING;
LocalizedString CREDITS_CARD_REMOVED;
LocalizedString CREDITS_FREE_PLAY;
LocalizedString CREDITS_CREDITS;
LocalizedString CREDITS_NOT_PRESENT;
LocalizedString CREDITS_LOAD_FAILED;
LocalizedString CREDITS_LOADED_FROM_LAST_GOOD_APPEND;
ThemeMetric<bool> CREDITS_JOIN_ONLY;
AutoActor m_sprOverlay; AutoActor m_sprOverlay;
}; };