aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-10 08:48:25 -0700
committermaximius <none@none>2009-09-10 08:48:25 -0700
commit465d3c6717d542fca677a68ff9b0407cf8419cce (patch)
treedb75e1a324ad372e1177a01d986a2525ed4b0075 /src
parent7111de479b61eee9f3df499245e20b654b10b19b (diff)
*Fix Hunter pet focus regen (thanks MrSmite)
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Pet.cpp2
-rw-r--r--src/game/Pet.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 17cafed6df0..e6dcf0ed19c 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -480,7 +480,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
}
}
-void Pet::Update(int32 diff)
+void Pet::Update(uint32 diff)
{
if(m_removed) // pet already removed, just wait in remove queue, no updates
return;
diff --git a/src/game/Pet.h b/src/game/Pet.h
index 9a506b71026..7f3684bbd59 100644
--- a/src/game/Pet.h
+++ b/src/game/Pet.h
@@ -148,7 +148,7 @@ class Pet : public Guardian
static void DeleteFromDB(uint32 guidlow);
void setDeathState(DeathState s); // overwrite virtual Creature::setDeathState and Unit::setDeathState
- void Update(int32 diff); // overwrite virtual Creature::Update and Unit::Update
+ void Update(uint32 diff); // overwrite virtual Creature::Update and Unit::Update
uint8 GetPetAutoSpellSize() const { return m_autospells.size(); }
uint32 GetPetAutoSpellOnPos(uint8 pos) const
@@ -237,7 +237,7 @@ class Pet : public Guardian
int32 m_duration; // time until unsummon (used mostly for summoned guardians and not used for controlled pets)
uint64 m_auraRaidUpdateMask;
bool m_loading;
- int32 m_regenTimer;
+ uint32 m_regenTimer;
DeclinedName *m_declinedname;