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

separate "credits info" text into "credits" and "player info"

Browse Source 
force reload of metrics after retry for missing metric
This commit is contained in:
Chris Danford
2003-11-07 20:43:17 +00:00
parent 354fbd9a87
commit 1cc5d0abf0
4 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+6 -4
View File
@@ -1645,10 +1645,12 @@ TimerSeconds=0
[ScreenSystemLayer] [ScreenSystemLayer]
StatsX=632 StatsX=632
StatsY=10 StatsY=10
CreditsP1X=120 PlayerInfoP1X=120
CreditsP1Y=474 PlayerInfoP1Y=474
CreditsP2X=520 PlayerInfoP2X=520
CreditsP2Y=474 PlayerInfoP2Y=474
CreditsX=320
CreditsY=474
CreditsColor=1,1,1,1 CreditsColor=1,1,1,1
CreditsShadowLength=0 CreditsShadowLength=0
CreditsZoom=1.0 CreditsZoom=1.0
stepmania/src/ScreenManager.cpp
+61 -37
View File
@@ -39,10 +39,11 @@ ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our p
#define CREDITS_COLOR THEME->GetMetricC("ScreenSystemLayer","CreditsColor") #define CREDITS_COLOR THEME->GetMetricC("ScreenSystemLayer","CreditsColor")
#define CREDITS_SHADOW_LENGTH THEME->GetMetricF("ScreenSystemLayer","CreditsShadowLength") #define CREDITS_SHADOW_LENGTH THEME->GetMetricF("ScreenSystemLayer","CreditsShadowLength")
#define CREDITS_ZOOM THEME->GetMetricF("ScreenSystemLayer","CreditsZoom") #define CREDITS_ZOOM THEME->GetMetricF("ScreenSystemLayer","CreditsZoom")
#define CREDITS_TEXT_HOME_JOIN THEME->GetMetric ("ScreenSystemLayer","CreditsTextHomeJoin") #define CREDITS_TEXT_PRESS_START THEME->GetMetric ("ScreenSystemLayer","CreditsTextPressStart")
#define CREDITS_TEXT_HOME_JOINED THEME->GetMetric ("ScreenSystemLayer","CreditsTextHomeJoined") #define CREDITS_TEXT_JOINED THEME->GetMetric ("ScreenSystemLayer","CreditsTextJoined")
#define CREDITS_TEXT_HOME_TOO_LATE THEME->GetMetric ("ScreenSystemLayer","CreditsTextHomeTooLate") #define CREDITS_TEXT_TOO_LATE THEME->GetMetric ("ScreenSystemLayer","CreditsTextTooLate")
#define CREDITS_TEXT_PAY THEME->GetMetric ("ScreenSystemLayer","CreditsTextPay") #define CREDITS_TEXT_INSERT_MORE THEME->GetMetric ("ScreenSystemLayer","CreditsTextInsertMore")
#define CREDITS_TEXT_CREDITS THEME->GetMetric ("ScreenSystemLayer","CreditsTextCredits")
#define CREDITS_TEXT_FREE THEME->GetMetric ("ScreenSystemLayer","CreditsTextFree") #define CREDITS_TEXT_FREE THEME->GetMetric ("ScreenSystemLayer","CreditsTextFree")
const int NUM_SKIPS = 5; const int NUM_SKIPS = 5;
@@ -53,7 +54,8 @@ class ScreenSystemLayer: public Screen
{ {
BitmapText m_textStats; BitmapText m_textStats;
BitmapText m_textSystemMessage; BitmapText m_textSystemMessage;
BitmapText m_textCreditInfo[NUM_PLAYERS]; BitmapText m_textPlayerInfo[NUM_PLAYERS];
BitmapText m_textCredits;
BitmapText m_textSysTime; BitmapText m_textSysTime;
BitmapText m_Skips[NUM_SKIPS]; BitmapText m_Skips[NUM_SKIPS];
int m_LastSkip; int m_LastSkip;
@@ -99,9 +101,11 @@ ScreenSystemLayer::ScreenSystemLayer() : Screen("ScreenSystemLayer")
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
{ {
this->AddChild(&m_textCreditInfo[p]); this->AddChild(&m_textPlayerInfo[p]);
} }
this->AddChild(&m_textCredits);
/* "Was that a skip?" This displays a message when an update takes /* "Was that a skip?" This displays a message when an update takes
* abnormally long, to quantify skips more precisely, verify them * abnormally long, to quantify skips more precisely, verify them
* when they're subtle, and show the time it happened, so you can pinpoint * when they're subtle, and show the time it happened, so you can pinpoint
@@ -147,48 +151,68 @@ void ScreenSystemLayer::SystemMessage( CString sMessage )
void ScreenSystemLayer::RefreshCreditsMessages() void ScreenSystemLayer::RefreshCreditsMessages()
{ {
m_textCredits.LoadFromFont( THEME->GetPathToF("ScreenManager credits") );
m_textCredits.SetName( "Credits" );
SET_XY( &m_textCredits );
m_textCredits.SetZoom( CREDITS_ZOOM );
m_textCredits.SetDiffuse( CREDITS_COLOR );
m_textCredits.SetShadowLength( CREDITS_SHADOW_LENGTH );
CString sCredits;
switch( PREFSMAN->m_iCoinMode )
{
case COIN_HOME:
sCredits = "";
break;
case COIN_PAY:
{
int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit;
sCredits = ssprintf("%s %d", CREDITS_TEXT_CREDITS.c_str(), GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit);
if (Coins)
sCredits += ssprintf(" %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit );
}
break;
case COIN_FREE:
sCredits = CREDITS_TEXT_FREE;
break;
default:
ASSERT(0);
}
m_textCredits.SetText( sCredits );
// update joined // update joined
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
{ {
m_textCreditInfo[p].LoadFromFont( THEME->GetPathToF("ScreenManager credits") ); m_textPlayerInfo[p].LoadFromFont( THEME->GetPathToF("ScreenManager credits") );
m_textCreditInfo[p].SetName( ssprintf("CreditsP%d",p+1 ) ); m_textPlayerInfo[p].SetName( ssprintf("PlayerInfoP%d",p+1 ) );
SET_XY( &m_textCreditInfo[p] ); SET_XY( &m_textPlayerInfo[p] );
m_textCreditInfo[p].SetZoom( CREDITS_ZOOM ); m_textPlayerInfo[p].SetZoom( CREDITS_ZOOM );
m_textCreditInfo[p].SetDiffuse( CREDITS_COLOR ); m_textPlayerInfo[p].SetDiffuse( CREDITS_COLOR );
m_textCreditInfo[p].SetShadowLength( CREDITS_SHADOW_LENGTH ); m_textPlayerInfo[p].SetShadowLength( CREDITS_SHADOW_LENGTH );
CString sText; CString sPlayerInfo;
switch( PREFSMAN->m_iCoinMode ) if( GAMESTATE->m_bSideIsJoined[p] )
{ {
case COIN_HOME: sPlayerInfo = CREDITS_TEXT_JOINED;
if( GAMESTATE->m_bSideIsJoined[p] ) }
sText = CREDITS_TEXT_HOME_JOINED; else if( GAMESTATE->m_bPlayersCanJoin )
else if( GAMESTATE->m_bPlayersCanJoin ) // would (GAMESTATE->m_CurStyle!=STYLE_INVALID) do the same thing? {
sText = CREDITS_TEXT_HOME_JOIN; if( PREFSMAN->m_iCoinMode==COIN_PAY && GAMESTATE->m_iCoins<PREFSMAN->m_iCoinsPerCredit )
sPlayerInfo = CREDITS_TEXT_INSERT_MORE;
else else
sText = CREDITS_TEXT_HOME_TOO_LATE; sPlayerInfo = CREDITS_TEXT_PRESS_START;
break; }
case COIN_PAY: else
{ {
int Coins = GAMESTATE->m_iCoins % PREFSMAN->m_iCoinsPerCredit; sPlayerInfo = CREDITS_TEXT_TOO_LATE;
CString txt = ssprintf("%s %d", CREDITS_TEXT_PAY.c_str(), GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit);
if (Coins)
txt += ssprintf(" %d/%d", Coins, PREFSMAN->m_iCoinsPerCredit );
sText = txt;
}
break;
case COIN_FREE:
sText = CREDITS_TEXT_FREE;
break;
default:
ASSERT(0);
} }
Profile* pProfile = PROFILEMAN->GetProfile( (PlayerNumber)p ); Profile* pProfile = PROFILEMAN->GetProfile( (PlayerNumber)p );
if( pProfile ) if( pProfile )
sText += " " + pProfile->m_sName; sPlayerInfo += " " + pProfile->m_sName;
m_textCreditInfo[p].SetText( sText ); m_textPlayerInfo[p].SetText( sPlayerInfo );
} }
} }
stepmania/src/ThemeManager.cpp
+8 -3
View File
@@ -396,9 +396,14 @@ void ThemeManager::ReloadMetricsIfNecessary()
if( m_uHashForCurThemeMetrics != GetHashForFile(sCurMetricPath) || if( m_uHashForCurThemeMetrics != GetHashForFile(sCurMetricPath) ||
m_uHashForBaseThemeMetrics != GetHashForFile(sDefaultMetricPath) ) m_uHashForBaseThemeMetrics != GetHashForFile(sDefaultMetricPath) )
{ {
SwitchThemeAndLanguage(m_sCurThemeName, m_sCurLanguage); // force a reload of the metrics cache ReloadMetrics();
SCREENMAN->SystemMessage( "Reloaded metrics" );
} }
}
void ThemeManager::ReloadMetrics()
{
SwitchThemeAndLanguage(m_sCurThemeName, m_sCurLanguage); // force a reload of the metrics cache
SCREENMAN->SystemMessage( "Reloaded metrics" );
// //
// clear theme path cache // clear theme path cache
@@ -428,7 +433,7 @@ try_metric_again:
break; // fall through break; // fall through
case ArchHooks::retry: case ArchHooks::retry:
FlushDirCache(); FlushDirCache();
ReloadMetricsIfNecessary(); ReloadMetrics();
goto try_metric_again; goto try_metric_again;
case ArchHooks::ignore: case ArchHooks::ignore:
return ""; return "";
stepmania/src/ThemeManager.h
+1
View File
@@ -34,6 +34,7 @@ public:
CString GetCurLanguage() { return m_sCurLanguage; }; CString GetCurLanguage() { return m_sCurLanguage; };
CString GetCurThemeDir() { return GetThemeDirFromName(m_sCurThemeName); }; CString GetCurThemeDir() { return GetThemeDirFromName(m_sCurThemeName); };
void NextTheme(); void NextTheme();
void ReloadMetrics();
void ReloadMetricsIfNecessary(); void ReloadMetricsIfNecessary();
CString GetPathTo( ElementCategory category, CString sFileName, bool bOptional=false ); CString GetPathTo( ElementCategory category, CString sFileName, bool bOptional=false );