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

VC7 compile fix

Browse Source
This commit is contained in:
Chris Danford
2005-08-23 23:48:23 +00:00
parent eb0704bf41
commit dd907dd19c
4 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+18 -18
View File
@@ -90,7 +90,7 @@ AutoScreenMessage( SM_StopHereWeGo )
static Preference<float> g_fNetStartOffset( "NetworkStartOffset", -3.0 );
ScreenGameplay::PlayerInfo::PlayerInfo()
PlayerInfo::PlayerInfo()
{
m_pn = PLAYER_INVALID;
m_mp = MultiPlayer_INVALID;
@@ -111,7 +111,7 @@ ScreenGameplay::PlayerInfo::PlayerInfo()
m_pDifficultyMeter = NULL;
}
void ScreenGameplay::PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField )
void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField )
{
m_pn = pn;
m_mp = mp;
@@ -190,7 +190,7 @@ void ScreenGameplay::PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bSh
}
}
void ScreenGameplay::PlayerInfo::LoadDummyP1()
void PlayerInfo::LoadDummyP1()
{
m_pn = PLAYER_1;
m_bIsDummy = true;
@@ -202,7 +202,7 @@ void ScreenGameplay::PlayerInfo::LoadDummyP1()
m_PlayerStateDummy.m_PlayerController = PC_AUTOPLAY;
}
ScreenGameplay::PlayerInfo::~PlayerInfo()
PlayerInfo::~PlayerInfo()
{
SAFE_DELETE( m_pLifeMeter );
SAFE_DELETE( m_ptextCourseSongNumber );
@@ -220,12 +220,12 @@ ScreenGameplay::PlayerInfo::~PlayerInfo()
SAFE_DELETE( m_pDifficultyMeter );
}
void ScreenGameplay::PlayerInfo::ShowOniGameOver()
void PlayerInfo::ShowOniGameOver()
{
m_sprOniGameOver->PlayCommand( "Die" );
}
PlayerState *ScreenGameplay::PlayerInfo::GetPlayerState()
PlayerState *PlayerInfo::GetPlayerState()
{
if( m_bIsDummy )
return &m_PlayerStateDummy;
@@ -234,7 +234,7 @@ PlayerState *ScreenGameplay::PlayerInfo::GetPlayerState()
GAMESTATE->m_pPlayerState[ GetPlayerStateAndStageStatsIndex() ];
}
PlayerStageStats *ScreenGameplay::PlayerInfo::GetPlayerStageStats()
PlayerStageStats *PlayerInfo::GetPlayerStageStats()
{
if( m_bIsDummy )
return &m_PlayerStageStatsDummy;
@@ -243,7 +243,7 @@ PlayerStageStats *ScreenGameplay::PlayerInfo::GetPlayerStageStats()
&STATSMAN->m_CurStageStats.m_player[ GetPlayerStateAndStageStatsIndex() ];
}
bool ScreenGameplay::PlayerInfo::IsEnabled()
bool PlayerInfo::IsEnabled()
{
if( m_pn != PLAYER_INVALID )
return GAMESTATE->IsPlayerEnabled( m_pn );
@@ -255,8 +255,8 @@ bool ScreenGameplay::PlayerInfo::IsEnabled()
return false;
}
vector<ScreenGameplay::PlayerInfo>::iterator
GetNextEnabledPlayerInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v )
vector<PlayerInfo>::iterator
GetNextEnabledPlayerInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v )
{
iter++;
for( ; iter != v.end(); iter++ )
@@ -268,8 +268,8 @@ GetNextEnabledPlayerInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vec
return iter;
}
vector<ScreenGameplay::PlayerInfo>::iterator
GetNextEnabledPlayerInfoNotDummy( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v )
vector<PlayerInfo>::iterator
GetNextEnabledPlayerInfoNotDummy( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v )
{
iter++;
for( ; iter != v.end(); iter++ )
@@ -283,8 +283,8 @@ GetNextEnabledPlayerInfoNotDummy( vector<ScreenGameplay::PlayerInfo>::iterator i
return iter;
}
vector<ScreenGameplay::PlayerInfo>::iterator
GetNextEnabledPlayerNumberInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v )
vector<PlayerInfo>::iterator
GetNextEnabledPlayerNumberInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v )
{
iter++;
for( ; iter != v.end(); iter++ )
@@ -300,8 +300,8 @@ GetNextEnabledPlayerNumberInfo( vector<ScreenGameplay::PlayerInfo>::iterator ite
return iter;
}
vector<ScreenGameplay::PlayerInfo>::iterator
GetNextPlayerNumberInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v )
vector<PlayerInfo>::iterator
GetNextPlayerNumberInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v )
{
iter++;
for( ; iter != v.end(); iter++ )
@@ -315,8 +315,8 @@ GetNextPlayerNumberInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vect
return iter;
}
vector<ScreenGameplay::PlayerInfo>::iterator
GetNextVisiblePlayerInfo( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v )
vector<PlayerInfo>::iterator
GetNextVisiblePlayerInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v )
{
iter++;
for( ; iter != v.end(); iter++ )
stepmania/src/ScreenGameplay.h
+64 -63
View File
@@ -34,6 +34,65 @@ class ScoreKeeper;
AutoScreenMessage( SM_NotesEnded )
class PlayerInfo
{
public:
PlayerInfo();
~PlayerInfo();
void Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField );
void LoadDummyP1();
void ShowOniGameOver();
MultiPlayer GetPlayerStateAndStageStatsIndex() { return m_pn == PLAYER_INVALID ? m_mp : (MultiPlayer)m_pn; }
PlayerState *GetPlayerState();
PlayerStageStats *GetPlayerStageStats();
PlayerNumber GetStepsAndTrailIndex() { return m_pn == PLAYER_INVALID ? PLAYER_1 : m_pn; }
bool IsEnabled();
bool IsMultiPlayer() { return m_mp != MultiPlayer_INVALID; }
CString GetName()
{
if( m_bIsDummy )
return "Dummy";
if( IsMultiPlayer() )
return MultiPlayerToString( m_mp );
else
return PlayerNumberToString( m_pn );
}
PlayerNumber m_pn;
MultiPlayer m_mp;
bool m_bIsDummy;
PlayerState m_PlayerStateDummy;
PlayerStageStats m_PlayerStageStatsDummy;
vector<Steps*> m_vpStepsQueue; // size may be >1 if playing a course
vector<AttackArray> m_asModifiersQueue;// size may be >1 if playing a course
LifeMeter *m_pLifeMeter;
BitmapText *m_ptextCourseSongNumber;
BitmapText *m_ptextStepsDescription;
ScoreDisplay *m_pPrimaryScoreDisplay;
ScoreDisplay *m_pSecondaryScoreDisplay;
ScoreKeeper *m_pPrimaryScoreKeeper;
ScoreKeeper *m_pSecondaryScoreKeeper;
BitmapText *m_ptextPlayerOptions;
ActiveAttackList *m_pActiveAttackList;
Transition *m_pWin;
Player *m_pPlayer;
// used in PLAY_MODE_BATTLE
Inventory *m_pInventory;
DifficultyIcon *m_pDifficultyIcon;
DifficultyMeter *m_pDifficultyMeter;
AutoActor m_sprOniGameOver;
};
class ScreenGameplay : public ScreenWithMenuElements
{
public:
@@ -159,73 +218,15 @@ protected:
NoteData m_CabinetLightsNoteData;
class PlayerInfo
{
public:
PlayerInfo();
~PlayerInfo();
void Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField );
void LoadDummyP1();
void ShowOniGameOver();
MultiPlayer GetPlayerStateAndStageStatsIndex() { return m_pn == PLAYER_INVALID ? m_mp : (MultiPlayer)m_pn; }
PlayerState *GetPlayerState();
PlayerStageStats *GetPlayerStageStats();
PlayerNumber GetStepsAndTrailIndex() { return m_pn == PLAYER_INVALID ? PLAYER_1 : m_pn; }
bool IsEnabled();
bool IsMultiPlayer() { return m_mp != MultiPlayer_INVALID; }
CString GetName()
{
if( m_bIsDummy )
return "Dummy";
if( IsMultiPlayer() )
return MultiPlayerToString( m_mp );
else
return PlayerNumberToString( m_pn );
}
PlayerNumber m_pn;
MultiPlayer m_mp;
bool m_bIsDummy;
PlayerState m_PlayerStateDummy;
PlayerStageStats m_PlayerStageStatsDummy;
vector<Steps*> m_vpStepsQueue; // size may be >1 if playing a course
vector<AttackArray> m_asModifiersQueue;// size may be >1 if playing a course
LifeMeter *m_pLifeMeter;
BitmapText *m_ptextCourseSongNumber;
BitmapText *m_ptextStepsDescription;
ScoreDisplay *m_pPrimaryScoreDisplay;
ScoreDisplay *m_pSecondaryScoreDisplay;
ScoreKeeper *m_pPrimaryScoreKeeper;
ScoreKeeper *m_pSecondaryScoreKeeper;
BitmapText *m_ptextPlayerOptions;
ActiveAttackList *m_pActiveAttackList;
Transition *m_pWin;
Player *m_pPlayer;
// used in PLAY_MODE_BATTLE
Inventory *m_pInventory;
DifficultyIcon *m_pDifficultyIcon;
DifficultyMeter *m_pDifficultyMeter;
AutoActor m_sprOniGameOver;
};
vector<PlayerInfo> m_vPlayerInfo; // filled by SGameplay derivatives in Init
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut ) = 0;
};
vector<ScreenGameplay::PlayerInfo>::iterator GetNextEnabledPlayerInfo ( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v );
vector<ScreenGameplay::PlayerInfo>::iterator GetNextEnabledPlayerInfoNotDummy ( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v );
vector<ScreenGameplay::PlayerInfo>::iterator GetNextEnabledPlayerNumberInfo ( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v );
vector<ScreenGameplay::PlayerInfo>::iterator GetNextPlayerNumberInfo ( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v );
vector<ScreenGameplay::PlayerInfo>::iterator GetNextVisiblePlayerInfo ( vector<ScreenGameplay::PlayerInfo>::iterator iter, vector<ScreenGameplay::PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextEnabledPlayerInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextEnabledPlayerInfoNotDummy ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextEnabledPlayerNumberInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextPlayerNumberInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
vector<PlayerInfo>::iterator GetNextVisiblePlayerInfo ( vector<PlayerInfo>::iterator iter, vector<PlayerInfo> &v );
#define FOREACH_EnabledPlayerInfo( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfo (v.begin()-1,v); pi != v.end(); pi = GetNextEnabledPlayerInfo(pi,v) )
#define FOREACH_EnabledPlayerInfoNotDummy( v, pi ) for( vector<PlayerInfo>::iterator pi = GetNextEnabledPlayerInfoNotDummy (v.begin()-1,v); pi != v.end(); pi = GetNextEnabledPlayerInfoNotDummy(pi,v) )
stepmania/src/ScreenGameplayMultiplayer.h
+1 -1
View File
@@ -11,7 +11,7 @@ class ScreenGameplayMultiplayer : public ScreenGameplay
public:
ScreenGameplayMultiplayer( CString sName );
void Init();
virtual void FillPlayerInfo( vector<ScreenGameplay::PlayerInfo> &vPlayerInfoOut );
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
};
stepmania/src/ScreenGameplayNormal.h
+1 -1
View File
@@ -10,7 +10,7 @@ class ScreenGameplayNormal : public ScreenGameplay
{
public:
ScreenGameplayNormal( CString sName );
virtual void FillPlayerInfo( vector<ScreenGameplay::PlayerInfo> &vPlayerInfoOut );
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
};