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

TIMER_SECONDS: int -> float

Browse Source
This commit is contained in:
Chris Danford
2005-03-26 03:30:08 +00:00
parent 5e7ea768ff
commit 1833d67aa9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuTimer.cpp
+6 -6
View File
@@ -15,8 +15,8 @@ static const ThemeMetric<int> WARNING_BEEP_START ("MenuTimer","WarningBeepStart"
#define WARNING_COMMAND(i) THEME->GetMetricA ("MenuTimer", ssprintf("WarningCommand%i",i))
static const ThemeMetric<apActorCommands> ON_COMMAND ("MenuTimer","OnCommand");
static const int TIMER_SECONDS = 99;
static const int MAX_STALL_SECONDS = 30;
static const float TIMER_PAUSE_SECONDS = 99;
static const float MAX_STALL_SECONDS = 30;
MenuTimer::MenuTimer()
{
@@ -34,7 +34,7 @@ MenuTimer::MenuTimer()
this->AddChild( &m_textDigit1 );
this->AddChild( &m_textDigit2 );
SetSeconds( TIMER_SECONDS );
SetSeconds( TIMER_PAUSE_SECONDS );
m_soundBeep.Load( THEME->GetPathS("MenuTimer","tick") );
}
@@ -132,15 +132,15 @@ void MenuTimer::Stall()
m_fStallSecondsLeft -= ToAdd;
}
void MenuTimer::SetSeconds( int iSeconds )
void MenuTimer::SetSeconds( float fSeconds )
{
m_fSecondsLeft = (float)iSeconds;
m_fSecondsLeft = fSeconds;
CLAMP( m_fSecondsLeft, 0, 99 );
m_textDigit1.RunCommands( ON_COMMAND );
m_textDigit2.RunCommands( ON_COMMAND );
SetText( iSeconds );
SetText( (int)fSeconds );
}
void MenuTimer::Start()
stepmania/src/MenuTimer.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual void Update( float fDeltaTime );
void SetSeconds( int iTimerSeconds );
void SetSeconds( float fSeconds );
void Start(); // resume countdown from paused
void Pause(); // don't count down
void Stop(); // set to "00" and pause
stepmania/src/ScreenNameEntry.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#define NUM_CHARS_TO_DRAW_BEHIND THEME->GetMetricI("ScreenNameEntry","NumCharsToDrawBehind")
#define NUM_CHARS_TO_DRAW_TOTAL THEME->GetMetricI("ScreenNameEntry","NumCharsToDrawTotal")
#define FAKE_BEATS_PER_SEC THEME->GetMetricF("ScreenNameEntry","FakeBeatsPerSec")
#define TIMER_SECONDS THEME->GetMetricI("ScreenNameEntry","TimerSeconds")
#define TIMER_SECONDS THEME->GetMetricF("ScreenNameEntry","TimerSeconds")
#define MAX_RANKING_NAME_LENGTH THEME->GetMetricI(m_sName,"MaxRankingNameLength")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
#define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str()))
stepmania/src/ScreenWithMenuElements.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "GameSoundManager.h"
#include "AnnouncerManager.h"
#define TIMER_SECONDS THEME->GetMetricI(m_sName,"TimerSeconds")
#define TIMER_SECONDS THEME->GetMetricF(m_sName,"TimerSeconds")
#define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth")
#define STYLE_ICON THEME->GetMetricB(m_sName,"StyleIcon")
#define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons")