Re-revert, implement right.

Pay attention to your compiler warnings everyone.
(And also don't test exclusively in the editor.)
This commit is contained in:
Jason Felds
2011-03-21 00:58:56 -04:00
parent 22c3027133
commit 220e4e168d
+11 -20
View File
@@ -95,26 +95,17 @@ static Preference<float> g_fNetStartOffset( "NetworkStartOffset", -3.0 );
static Preference<bool> g_bEasterEggs( "EasterEggs", true ); static Preference<bool> g_bEasterEggs( "EasterEggs", true );
PlayerInfo::PlayerInfo() PlayerInfo::PlayerInfo(): m_pn(PLAYER_INVALID), m_mp(MultiPlayer_Invalid),
{ m_bIsDummy(false), m_iDummyIndex(0), m_iAddToDifficulty(0),
m_pn = PLAYER_INVALID; m_bPlayerEnabled(false), m_PlayerStateDummy(),
m_mp = MultiPlayer_Invalid; m_PlayerStageStatsDummy(), m_SoundEffectControl(),
m_bIsDummy = false; m_vpStepsQueue(), m_asModifiersQueue(), m_pLifeMeter(NULL),
m_iDummyIndex = 0; m_ptextCourseSongNumber(NULL), m_ptextStepsDescription(NULL),
m_iAddToDifficulty = 0; m_pPrimaryScoreDisplay(NULL), m_pSecondaryScoreDisplay(NULL),
m_pLifeMeter = NULL; m_pPrimaryScoreKeeper(NULL), m_pSecondaryScoreKeeper(NULL),
m_ptextCourseSongNumber = NULL; m_ptextPlayerOptions(NULL), m_pActiveAttackList(NULL),
m_ptextStepsDescription = NULL; m_NoteData(), m_pPlayer(NULL), m_pInventory(NULL),
m_pPrimaryScoreDisplay = NULL; m_pStepsDisplay(NULL), m_sprOniGameOver() {}
m_pSecondaryScoreDisplay = NULL;
m_pPrimaryScoreKeeper = NULL;
m_pSecondaryScoreKeeper = NULL;
m_ptextPlayerOptions = NULL;
m_pActiveAttackList = NULL;
m_pPlayer = NULL;
m_pInventory = NULL;
m_pStepsDisplay = NULL;
}
void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField, int iAddToDifficulty ) void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField, int iAddToDifficulty )
{ {