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

small comment cleanup

Browse Source
This commit is contained in:
AJ Kelly
2010-06-26 18:37:50 -05:00
parent f099672b8d
commit 6e2f688384
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LifeMeterBattery.cpp
+7 -4
View File
@@ -46,7 +46,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
m_textNumLives.LoadFromFont( THEME->GetPathF(sType, "lives") ); m_textNumLives.LoadFromFont( THEME->GetPathF(sType, "lives") );
m_textNumLives.SetName( ssprintf("NumLivesP%i",int(pn+1)) ); m_textNumLives.SetName( ssprintf("NumLivesP%i",int(pn+1)) );
// fucking hardcoded shit // old hardcoded commands:
/* /*
m_textNumLives.SetDiffuse( RageColor(1,1,1,1) ); m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
m_textNumLives.SetShadowLength( 0 ); m_textNumLives.SetShadowLength( 0 );
@@ -56,7 +56,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
ActorUtil::LoadAllCommandsAndSetXY( m_textNumLives, sType ); ActorUtil::LoadAllCommandsAndSetXY( m_textNumLives, sType );
this->AddChild( &m_textNumLives ); this->AddChild( &m_textNumLives );
} }
// fucking hardcoded shit // old hardcoded commands:
/* /*
m_sprFrame.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f ); m_sprFrame.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f );
m_sprBattery.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f ); m_sprBattery.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f );
@@ -68,8 +68,8 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
if( bPlayerEnabled ) if( bPlayerEnabled )
{ {
m_Percent.Load( pPlayerState, pPlayerStageStats, "LifeMeterBattery Percent", true ); m_Percent.Load( pPlayerState, pPlayerStageStats, "LifeMeterBattery Percent", true );
// fucking hardcoded shit (this type of command is useful, but let the // old hardcoded commands (this is useful, but let the themer decide
// themer decide what they want to do, please) // what they want to do, please -aj)
//m_Percent.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f ); //m_Percent.SetZoomX( pn==PLAYER_1 ? 1.0f : -1.0f );
this->AddChild( &m_Percent ); this->AddChild( &m_Percent );
} }
@@ -238,10 +238,13 @@ class LunaLifeMeterBattery: public Luna<LifeMeterBattery>
{ {
public: public:
static int GetLivesLeft( T* p, lua_State *L ) { lua_pushnumber( L, p->GetLivesLeft() ); return 1; } static int GetLivesLeft( T* p, lua_State *L ) { lua_pushnumber( L, p->GetLivesLeft() ); return 1; }
// is this right? wtf -q2x
//static int GetTotalLives( T* p, lua_State *L ) { lua_pushnumber( L, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives ); return 1; }
LunaLifeMeterBattery() LunaLifeMeterBattery()
{ {
ADD_METHOD( GetLivesLeft ); ADD_METHOD( GetLivesLeft );
//ADD_METHOD( GetTotalLives );
} }
}; };
src/NoteDataWithScoring.cpp
+5 -5
View File
@@ -178,7 +178,7 @@ int LastTapNoteScoreTrack( const NoteData &in, unsigned iRow, PlayerNumber pn )
#if 0 #if 0
int MinTapNoteScoreTrack( const NoteData &in, unsigned iRow, PlayerNumber pn ) int MinTapNoteScoreTrack( const NoteData &in, unsigned iRow, PlayerNumber pn )
{ {
// this shit is a wip // work in progress
float scoretime = -9999; float scoretime = -9999;
int worst_track = -1; int worst_track = -1;
TapNoteScore lowestTNS = TapNoteScore_Invalid; TapNoteScore lowestTNS = TapNoteScore_Invalid;
@@ -276,7 +276,7 @@ float GetActualStreamRadarValue( const NoteData &in, float fSongSeconds )
return clamp( float(iW2s)/iTotalSteps, 0.0f, 1.0f ); return clamp( float(iW2s)/iTotalSteps, 0.0f, 1.0f );
} }
/* Return the ratio of actual combo to max combo. */ // Return the ratio of actual combo to max combo.
float GetActualVoltageRadarValue( const NoteData &in, float fSongSeconds, const PlayerStageStats &pss ) float GetActualVoltageRadarValue( const NoteData &in, float fSongSeconds, const PlayerStageStats &pss )
{ {
/* STATSMAN->m_CurStageStats.iMaxCombo is unrelated to GetNumTapNotes: /* STATSMAN->m_CurStageStats.iMaxCombo is unrelated to GetNumTapNotes:
@@ -289,7 +289,7 @@ float GetActualVoltageRadarValue( const NoteData &in, float fSongSeconds, const
return clamp( fComboPercent, 0.0f, 1.0f ); return clamp( fComboPercent, 0.0f, 1.0f );
} }
/* Return the ratio of actual to possible W2s on jumps. */ // Return the ratio of actual to possible W2s on jumps.
float GetActualAirRadarValue( const NoteData &in, float fSongSeconds ) float GetActualAirRadarValue( const NoteData &in, float fSongSeconds )
{ {
const int iTotalDoubles = in.GetNumJumps(); const int iTotalDoubles = in.GetNumJumps();
@@ -301,7 +301,7 @@ float GetActualAirRadarValue( const NoteData &in, float fSongSeconds )
return clamp( (float)iNumDoubles / iTotalDoubles, 0.0f, 1.0f ); return clamp( (float)iNumDoubles / iTotalDoubles, 0.0f, 1.0f );
} }
/* Return the ratio of actual to possible dance points. */ // Return the ratio of actual to possible dance points.
float GetActualChaosRadarValue( const NoteData &in, float fSongSeconds, const PlayerStageStats &pss ) float GetActualChaosRadarValue( const NoteData &in, float fSongSeconds, const PlayerStageStats &pss )
{ {
const int iPossibleDP = pss.m_iPossibleDancePoints; const int iPossibleDP = pss.m_iPossibleDancePoints;
@@ -312,7 +312,7 @@ float GetActualChaosRadarValue( const NoteData &in, float fSongSeconds, const Pl
return clamp( float(ActualDP)/iPossibleDP, 0.0f, 1.0f ); return clamp( float(ActualDP)/iPossibleDP, 0.0f, 1.0f );
} }
/* Return the ratio of actual to possible successful holds. */ // Return the ratio of actual to possible successful holds.
float GetActualFreezeRadarValue( const NoteData &in, float fSongSeconds ) float GetActualFreezeRadarValue( const NoteData &in, float fSongSeconds )
{ {
// number of hold steps // number of hold steps