swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-01 16:13:19 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-11 15:16:14 -06:00
parent a7f2d0ea6a
commit 3e4cc36e7e
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp
+4 -4
View File
@@ -58,7 +58,7 @@ AiCreatureWeaponActions::AiCreatureWeaponActions()
: m_singleUseActionList()
, m_delayRepeatActionList()
, m_instantRepeatActionList()
, m_combatProfile(NULL)
, m_combatProfile(nullptr)
{
}
@@ -81,7 +81,7 @@ void AiCreatureWeaponActions::setCombatProfile(CreatureObject & owner, AiCreatur
// ----------------------------------------------------------------------
void AiCreatureWeaponActions::reset()
{
if (m_combatProfile != NULL)
if (m_combatProfile != nullptr)
{
resetActionTimers(m_singleUseActionList, m_combatProfile->m_singleUseActionList);
resetActionTimers(m_delayRepeatActionList, m_combatProfile->m_delayRepeatActionList);
@@ -92,9 +92,9 @@ void AiCreatureWeaponActions::reset()
// ----------------------------------------------------------------------
PersistentCrcString const & AiCreatureWeaponActions::getCombatAction()
{
// If the combat profile is NULL, then the AI has no special actions assigned
// If the combat profile is nullptr, then the AI has no special actions assigned
if (m_combatProfile != NULL)
if (m_combatProfile != nullptr)
{
time_t const osTime = Os::getRealSystemTime();