josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Corrected NULL usage, it should only be used with pointers, not integers

Browse Source
This commit is contained in:
Shauren
2011-04-23 15:53:48 +02:00
parent a2a751b9d6
commit 8898db8b27
56 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+5 -5
View File
@@ -88,7 +88,7 @@ class boss_archaedas : public CreatureScript
bVaultWalkersAwake = false;
if (pInstance)
pInstance->SetData(NULL, 5); // respawn any dead minions
pInstance->SetData(0, 5); // respawn any dead minions
me->setFaction(35);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
@@ -117,7 +117,7 @@ class boss_archaedas : public CreatureScript
// Being woken up from the altar, start the awaken sequence
if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN))
{
me->MonsterYell(SAY_AGGRO,LANG_UNIVERSAL,NULL);
me->MonsterYell(SAY_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me,SOUND_AGGRO);
iAwakenTimer = 4000;
bWakingUp = true;
@@ -126,7 +126,7 @@ class boss_archaedas : public CreatureScript
void KilledUnit(Unit * /*victim*/)
{
me->MonsterYell(SAY_KILL,LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_KILL, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_KILL);
}
@@ -167,7 +167,7 @@ class boss_archaedas : public CreatureScript
ActivateMinion(pInstance->GetData64(8),true); // EarthenGuardian4
ActivateMinion(pInstance->GetData64(9),true); // EarthenGuardian5
ActivateMinion(pInstance->GetData64(10),false); // EarthenGuardian6
me->MonsterYell(SAY_SUMMON,LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_SUMMON, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON);
bGuardiansAwake = true;
}
@@ -179,7 +179,7 @@ class boss_archaedas : public CreatureScript
ActivateMinion(pInstance->GetData64(2),true); // VaultWalker2
ActivateMinion(pInstance->GetData64(3),true); // VaultWalker3
ActivateMinion(pInstance->GetData64(4),false); // VaultWalker4
me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, NULL);
me->MonsterYell(SAY_SUMMON2, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_SUMMON2);
bVaultWalkersAwake = true;
}
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+5 -5
View File
@@ -106,14 +106,14 @@ class instance_uldaman : public InstanceMapScript
uiAltarOfTheKeeperTempleDoor = go->GetGUID();
if(m_auiEncounter[0] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_ARCHAEDAS_TEMPLE_DOOR:
uiArchaedasTempleDoor = go->GetGUID();
if(m_auiEncounter[0] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_ANCIENT_VAULT_DOOR:
@@ -122,14 +122,14 @@ class instance_uldaman : public InstanceMapScript
uiAncientVaultDoor = go->GetGUID();
if(m_auiEncounter[1] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_IRONAYA_SEAL_DOOR:
uiIronayaSealDoor = go->GetGUID();
if (m_auiEncounter[2] == DONE)
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
break;
case GO_KEYSTONE:
@@ -137,7 +137,7 @@ class instance_uldaman : public InstanceMapScript
if (m_auiEncounter[2] == DONE)
{
HandleGameObject(NULL, true, go);
HandleGameObject(0, true, go);
go->SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
}
break;