From 22c302713347b848a72ab01c5831115bfe4fc9e5 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 21 Mar 2011 00:42:30 -0400 Subject: [PATCH] Reverting recent initialization list attempt. The old code was behaving better...by that I mean not crashing on me. Steve is right: time to use different tools to improve our code. --- src/ScreenGameplay.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 641bae8beb..8280993a27 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -95,14 +95,26 @@ static Preference g_fNetStartOffset( "NetworkStartOffset", -3.0 ); static Preference g_bEasterEggs( "EasterEggs", true ); -PlayerInfo::PlayerInfo(): m_pn(PLAYER_INVALID), m_mp(MultiPlayer_Invalid), - m_bIsDummy(false), m_iDummyIndex(0), m_iAddToDifficulty(0), - m_bPlayerEnabled(false), m_pLifeMeter(NULL), - m_ptextCourseSongNumber(NULL), m_ptextStepsDescription(NULL), - m_pPrimaryScoreDisplay(NULL), m_pSecondaryScoreDisplay(NULL), - m_pPrimaryScoreKeeper(NULL), m_pSecondaryScoreKeeper(NULL), - m_pActiveAttackList(NULL), m_pPlayer(NULL), m_pInventory(NULL), - m_pStepsDisplay(NULL) {} +PlayerInfo::PlayerInfo() +{ + m_pn = PLAYER_INVALID; + m_mp = MultiPlayer_Invalid; + m_bIsDummy = false; + m_iDummyIndex = 0; + m_iAddToDifficulty = 0; + m_pLifeMeter = NULL; + m_ptextCourseSongNumber = NULL; + m_ptextStepsDescription = NULL; + m_pPrimaryScoreDisplay = NULL; + 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 ) {