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

deps cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-25 18:29:42 +00:00
parent 8f08b61319
commit d4a46a214d
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+8 -1
View File
@@ -2,6 +2,7 @@
#include "Player.h" #include "Player.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageTimer.h"
#include "PrefsManager.h" #include "PrefsManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "GameManager.h" #include "GameManager.h"
@@ -18,6 +19,7 @@
#include "LifeMeter.h" #include "LifeMeter.h"
#include "CombinedLifeMeter.h" #include "CombinedLifeMeter.h"
#include "PlayerAI.h" #include "PlayerAI.h"
#include "NoteField.h"
#include "NoteFieldPositioning.h" #include "NoteFieldPositioning.h"
#include "NoteDataUtil.h" #include "NoteDataUtil.h"
#include "ScreenGameplay.h" /* for SM_ComboStopped */ #include "ScreenGameplay.h" /* for SM_ComboStopped */
@@ -658,7 +660,7 @@ int Player::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fM
} }
void Player::Step( int col, RageTimer tm ) void Player::Step( int col, const RageTimer &tm )
{ {
bool bOniDead = bool bOniDead =
GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY && GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY &&
@@ -1392,6 +1394,11 @@ float Player::GetMaxStepDistanceSeconds()
return GAMESTATE->m_SongOptions.m_fMusicRate * ADJUSTED_WINDOW(Boo); return GAMESTATE->m_SongOptions.m_fMusicRate * ADJUSTED_WINDOW(Boo);
} }
void Player::CacheAllUsedNoteSkins( bool bDeleteUnused )
{
m_pNoteField->CacheAllUsedNoteSkins( bDeleteUnused );
}
void Player::FadeToFail() void Player::FadeToFail()
{ {
if( m_pNoteField ) if( m_pNoteField )
stepmania/src/Player.h
+5 -4
View File
@@ -8,16 +8,17 @@
#include "HoldJudgment.h" #include "HoldJudgment.h"
#include "Combo.h" #include "Combo.h"
#include "NoteDataWithScoring.h" #include "NoteDataWithScoring.h"
#include "RageTimer.h"
#include "RageSound.h" #include "RageSound.h"
#include "AttackDisplay.h" #include "AttackDisplay.h"
#include "NoteField.h" #include "NoteData.h"
class ScoreDisplay; class ScoreDisplay;
class LifeMeter; class LifeMeter;
class CombinedLifeMeter; class CombinedLifeMeter;
class ScoreKeeper; class ScoreKeeper;
class Inventory; class Inventory;
class RageTimer;
class NoteField;
struct PlayerStageStats; struct PlayerStageStats;
#define SAMPLE_COUNT 16 #define SAMPLE_COUNT 16
@@ -44,7 +45,7 @@ public:
void Load( const NoteData& noteData ); void Load( const NoteData& noteData );
void CrossedRow( int iNoteRow ); void CrossedRow( int iNoteRow );
void CrossedMineRow( int iNoteRow ); void CrossedMineRow( int iNoteRow );
void Step( int col, RageTimer tm ); void Step( int col, const RageTimer &tm );
void RandomizeNotes( int iNoteRow ); void RandomizeNotes( int iNoteRow );
void FadeToFail(); void FadeToFail();
int GetDancingCharacterState() const { return m_iDCState; }; int GetDancingCharacterState() const { return m_iDCState; };
@@ -53,7 +54,7 @@ public:
static float GetMaxStepDistanceSeconds(); static float GetMaxStepDistanceSeconds();
void CacheAllUsedNoteSkins( bool bDeleteUnused ) { m_pNoteField->CacheAllUsedNoteSkins(bDeleteUnused); } void CacheAllUsedNoteSkins( bool bDeleteUnused );
NoteData m_NoteData; NoteData m_NoteData;
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include "Background.h" #include "Background.h"
#include "Foreground.h" #include "Foreground.h"
#include "Course.h" #include "Course.h"
#include "NoteField.h"
const int NUM_ACTION_MENU_ITEMS = 23; const int NUM_ACTION_MENU_ITEMS = 23;
const int NUM_NAMING_MENU_ITEMS = 6; const int NUM_NAMING_MENU_ITEMS = 6;
stepmania/src/ScreenHowToPlay.h
+1
View File
@@ -6,6 +6,7 @@
#include "LifeMeterBar.h" #include "LifeMeterBar.h"
#include "Character.h" #include "Character.h"
#include "BGAnimation.h" #include "BGAnimation.h"
#include "Model.h"
class ScreenHowToPlay : public ScreenAttract class ScreenHowToPlay : public ScreenAttract