The big NULL replacement party part 4.

...okay, not as big of a commit.
This commit is contained in:
Jason Felds
2013-05-03 23:24:23 -04:00
parent a3f37dc2b4
commit 328c41eec0
8 changed files with 154 additions and 154 deletions
+4 -4
View File
@@ -338,11 +338,11 @@ void NetworkSyncManager::StartRequest( short position )
Steps * tSteps;
tSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
if( tSteps!=NULL && GAMESTATE->IsPlayerEnabled(PLAYER_1) )
if( tSteps!= nullptr && GAMESTATE->IsPlayerEnabled(PLAYER_1) )
ctr = uint8_t(ctr+tSteps->GetMeter()*16);
tSteps = GAMESTATE->m_pCurSteps[PLAYER_2];
if( tSteps!=NULL && GAMESTATE->IsPlayerEnabled(PLAYER_2) )
if( tSteps!= nullptr && GAMESTATE->IsPlayerEnabled(PLAYER_2) )
ctr = uint8_t( ctr+tSteps->GetMeter() );
m_packet.Write1( ctr );
@@ -350,11 +350,11 @@ void NetworkSyncManager::StartRequest( short position )
ctr=0;
tSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
if( tSteps!=NULL && GAMESTATE->IsPlayerEnabled(PLAYER_1) )
if( tSteps!= nullptr && GAMESTATE->IsPlayerEnabled(PLAYER_1) )
ctr = uint8_t( ctr + (int)tSteps->GetDifficulty()*16 );
tSteps = GAMESTATE->m_pCurSteps[PLAYER_2];
if( tSteps!=NULL && GAMESTATE->IsPlayerEnabled(PLAYER_2) )
if( tSteps!= nullptr && GAMESTATE->IsPlayerEnabled(PLAYER_2) )
ctr = uint8_t( ctr + (int)tSteps->GetDifficulty() );
m_packet.Write1( ctr );