aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Events
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2014-09-15 22:52:09 +0200
committerShauren <shauren.trinity@gmail.com>2014-09-15 22:52:09 +0200
commit48deb443f960f0baf10a4cd6893744880651d62e (patch)
tree87d9b040a3db5ba2599bdb5f746df1e3a7f13f04 /src/server/scripts/Events
parenta3d8f1d8794150debbed142ef4621a4f680aa1fd (diff)
Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain
Diffstat (limited to 'src/server/scripts/Events')
-rw-r--r--src/server/scripts/Events/childrens_week.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
index 4bc0642e348..6e95b9351fd 100644
--- a/src/server/scripts/Events/childrens_week.cpp
+++ b/src/server/scripts/Events/childrens_week.cpp
@@ -131,13 +131,13 @@ enum Misc
DISPLAY_INVISIBLE = 11686
};
-uint64 getOrphanGUID(Player* player, uint32 orphan)
+ObjectGuid getOrphanGUID(Player* player, uint32 orphan)
{
if (Aura* orphanOut = player->GetAura(SPELL_ORPHAN_OUT))
if (orphanOut->GetCaster() && orphanOut->GetCaster()->GetEntry() == orphan)
return orphanOut->GetCaster()->GetGUID();
- return 0;
+ return ObjectGuid::Empty;
}
/*######
@@ -159,8 +159,8 @@ class npc_winterfin_playmate : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -235,8 +235,8 @@ class npc_winterfin_playmate : public CreatureScript
private:
uint32 timer;
int8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
@@ -265,8 +265,8 @@ class npc_snowfall_glade_playmate : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -342,8 +342,8 @@ class npc_snowfall_glade_playmate : public CreatureScript
private:
uint32 timer;
int8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
CreatureAI* GetAI(Creature* pCreature) const override
@@ -372,8 +372,8 @@ class npc_the_biggest_tree : public CreatureScript
{
timer = 1000;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -436,8 +436,8 @@ class npc_the_biggest_tree : public CreatureScript
private:
uint32 timer;
uint8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
@@ -466,8 +466,8 @@ class npc_high_oracle_soo_roo : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -533,8 +533,8 @@ class npc_high_oracle_soo_roo : public CreatureScript
private:
uint32 timer;
int8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
@@ -563,8 +563,8 @@ class npc_elder_kekek : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -628,8 +628,8 @@ class npc_elder_kekek : public CreatureScript
private:
uint32 timer;
int8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
@@ -659,8 +659,8 @@ class npc_the_etymidian : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -732,8 +732,8 @@ class npc_the_etymidian : public CreatureScript
private:
uint32 timer;
int8 phase;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};
@@ -762,8 +762,8 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
{
timer = 0;
phase = 0;
- playerGUID = 0;
- orphanGUID = 0;
+ playerGUID.Clear();
+ orphanGUID.Clear();
}
void Reset() override
@@ -900,8 +900,8 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
private:
int8 phase;
uint32 timer;
- uint64 playerGUID;
- uint64 orphanGUID;
+ ObjectGuid playerGUID;
+ ObjectGuid orphanGUID;
};