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

tab cleanup

Browse Source 
remove unfinished multiplayer stuff
This commit is contained in:
Chris Danford
2006-04-21 00:17:48 +00:00
parent 82c56f6589
commit a6272ec9ca
2 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+6 -30
View File
@@ -47,7 +47,6 @@
#include "Player.h" #include "Player.h"
#include "DifficultyIcon.h" #include "DifficultyIcon.h"
#include "DifficultyMeter.h" #include "DifficultyMeter.h"
#include "PlayerScoreList.h"
#include "InputEventPlus.h" #include "InputEventPlus.h"
#include "XmlFile.h" #include "XmlFile.h"
#include "Background.h" #include "Background.h"
@@ -348,7 +347,6 @@ ScreenGameplay::ScreenGameplay()
{ {
m_pSongBackground = NULL; m_pSongBackground = NULL;
m_pSongForeground = NULL; m_pSongForeground = NULL;
m_pPlayerScoreList = NULL;
} }
void ScreenGameplay::Init() void ScreenGameplay::Init()
@@ -615,25 +613,6 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground )
this->AddChild( &m_MaxCombo ); this->AddChild( &m_MaxCombo );
if( GAMESTATE->m_bMultiplayer )
{
vector<const PlayerState*> vpPlayerState;
vector<const PlayerStageStats*> vpPlayerStageStats;
FOREACH_EnabledMultiPlayer( p )
{
vpPlayerState.push_back( m_vPlayerInfo[p].GetPlayerState() );
vpPlayerStageStats.push_back( m_vPlayerInfo[p].GetPlayerStageStats() );
}
m_pPlayerScoreList = new PlayerScoreList;
m_pPlayerScoreList->Init( vpPlayerState, vpPlayerStageStats );
m_pPlayerScoreList->SetName( "PlayerScoreList" );
SET_XY( m_pPlayerScoreList );
this->AddChild( m_pPlayerScoreList );
}
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{ {
// primary score display // primary score display
@@ -928,7 +907,6 @@ ScreenGameplay::~ScreenGameplay()
LOG->Trace( "ScreenGameplay::~ScreenGameplay()" ); LOG->Trace( "ScreenGameplay::~ScreenGameplay()" );
SAFE_DELETE( m_pPlayerScoreList );
SAFE_DELETE( m_pSongBackground ); SAFE_DELETE( m_pSongBackground );
SAFE_DELETE( m_pSongForeground ); SAFE_DELETE( m_pSongForeground );
@@ -2525,7 +2503,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{ {
SongFinished(); SongFinished();
StageFinished( false ); StageFinished( false );
//SaveRecordedResults(); //SaveReplay();
if( AdjustSync::IsSyncDataChanged() ) if( AdjustSync::IsSyncDataChanged() )
ScreenSaveSync::PromptSaveSync( SM_GoToNextScreen ); ScreenSaveSync::PromptSaveSync( SM_GoToNextScreen );
@@ -2602,7 +2580,6 @@ void ScreenGameplay::TweenOnScreen()
ON_COMMAND( m_sprScoreFrame ); ON_COMMAND( m_sprScoreFrame );
ON_COMMAND( m_BPMDisplay ); ON_COMMAND( m_BPMDisplay );
ON_COMMAND( m_MaxCombo ); ON_COMMAND( m_MaxCombo );
ON_COMMAND( m_pPlayerScoreList );
if( !GAMESTATE->m_bDemonstrationOrJukebox ) if( !GAMESTATE->m_bDemonstrationOrJukebox )
ON_COMMAND( m_textDebug ); ON_COMMAND( m_textDebug );
@@ -2647,7 +2624,6 @@ void ScreenGameplay::TweenOffScreen()
OFF_COMMAND( m_sprScoreFrame ); OFF_COMMAND( m_sprScoreFrame );
OFF_COMMAND( m_BPMDisplay ); OFF_COMMAND( m_BPMDisplay );
OFF_COMMAND( m_MaxCombo ); OFF_COMMAND( m_MaxCombo );
OFF_COMMAND( m_pPlayerScoreList );
if( m_pCombinedLifeMeter ) if( m_pCombinedLifeMeter )
OFF_COMMAND( *m_pCombinedLifeMeter ); OFF_COMMAND( *m_pCombinedLifeMeter );
@@ -2691,7 +2667,7 @@ Song *ScreenGameplay::GetNextCourseSong() const
return m_apSongsQueue[iPlaySongIndex]; return m_apSongsQueue[iPlaySongIndex];
} }
void ScreenGameplay::SaveRecordedResults() void ScreenGameplay::SaveReplay()
{ {
FOREACH_HumanPlayer( pn ) FOREACH_HumanPlayer( pn )
{ {
@@ -2706,15 +2682,15 @@ void ScreenGameplay::SaveRecordedResults()
FlushDirCache(); FlushDirCache();
vector<RString> files; vector<RString> files;
GetDirListing( "Save/recording*", files, false, false ); GetDirListing( "Save/reply*", files, false, false );
sort( files.begin(), files.end() ); sort( files.begin(), files.end() );
/* Files should be of the form "recording######.xxx". */ /* Files should be of the form "reply######.xxx". */
int iIndex = 0; int iIndex = 0;
for( int i = files.size()-1; i >= 0; --i ) for( int i = files.size()-1; i >= 0; --i )
{ {
static Regex re( "^recording([0-9]{5})\\....$" ); static Regex re( "^replay([0-9]{5})\\....$" );
vector<RString> matches; vector<RString> matches;
if( !re.Compare( files[i], matches ) ) if( !re.Compare( files[i], matches ) )
continue; continue;
@@ -2724,7 +2700,7 @@ void ScreenGameplay::SaveRecordedResults()
break; break;
} }
RString sFileName = ssprintf( "recording%05d.xml", iIndex ); RString sFileName = ssprintf( "replay%05d.xml", iIndex );
p->SaveToFile( "Save/"+sFileName, opt ); p->SaveToFile( "Save/"+sFileName, opt );
SAFE_DELETE( p ); SAFE_DELETE( p );
stepmania/src/ScreenGameplay.h
+1 -4
View File
@@ -29,7 +29,6 @@ class DifficultyIcon;
class DifficultyMeter; class DifficultyMeter;
class Inventory; class Inventory;
class ScoreKeeper; class ScoreKeeper;
class PlayerScoreList;
class Background; class Background;
class Foreground; class Foreground;
@@ -151,7 +150,7 @@ protected:
void UpdateLyrics( float fDeltaTime ); void UpdateLyrics( float fDeltaTime );
void SongFinished(); void SongFinished();
void StageFinished( bool bBackedOut ); void StageFinished( bool bBackedOut );
void SaveRecordedResults(); void SaveReplay();
virtual void InitSongQueues(); virtual void InitSongQueues();
@@ -196,8 +195,6 @@ protected:
BitmapText m_MaxCombo; // TODO: move this into an overlay BitmapText m_MaxCombo; // TODO: move this into an overlay
PlayerScoreList *m_pPlayerScoreList;
Transition m_Ready; Transition m_Ready;
Transition m_Go; Transition m_Go;
Transition m_Failed; Transition m_Failed;