Integrate C++11 branch into 5_1-new
This commit is contained in:
@@ -181,7 +181,7 @@ void ScoreKeeperRave::LaunchAttack( AttackLevel al )
|
||||
RString* asAttacks = GAMESTATE->m_pCurCharacters[pn]->m_sAttacks[al]; // [NUM_ATTACKS_PER_LEVEL]
|
||||
RString sAttackToGive;
|
||||
|
||||
if (GAMESTATE->m_pCurCharacters[pn] != NULL)
|
||||
if (GAMESTATE->m_pCurCharacters[pn] != nullptr)
|
||||
sAttackToGive = asAttacks[ RandomInt(NUM_ATTACKS_PER_LEVEL) ];
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user