diff --git a/zone/client.cpp b/zone/client.cpp index 3ad6ba8b2..81ec544bb 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -4530,7 +4530,7 @@ bool Client::IsLeadershipEXPOn() { } -int Client::GetAggroCount() { +uint32 Client::GetAggroCount() { return AggroCount; } diff --git a/zone/client.h b/zone/client.h index 6f3d1f42d..c11f917a7 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1347,7 +1347,7 @@ public: bool CanEnterZone(const std::string& zone_short_name = "", int16 instance_version = -1); - int GetAggroCount(); + uint32 GetAggroCount(); void IncrementAggroCount(bool raid_target = false); void DecrementAggroCount(); void SendPVPStats(); @@ -1903,7 +1903,7 @@ private: int8 last_reported_mana_percent; int8 last_reported_endurance_percent; - unsigned int AggroCount; // How many mobs are aggro on us. + uint32 AggroCount; // How many mobs are aggro on us. bool ooc_regen; float AreaHPRegen; diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index b924ee732..22a6ed5a5 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -1449,7 +1449,7 @@ void Lua_Client::UnFreeze() { self->SendAppearancePacket(AT_Anim, ANIM_STAND); } -int Lua_Client::GetAggroCount() { +uint32 Lua_Client::GetAggroCount() { Lua_Safe_Call_Int(); return self->GetAggroCount(); } @@ -3191,7 +3191,7 @@ luabind::scope lua_register_client() { .def("GetAFK", (int(Lua_Client::*)(void))&Lua_Client::GetAFK) .def("GetAccountAge", (int(Lua_Client::*)(void))&Lua_Client::GetAccountAge) .def("GetAccountFlag", (std::string(Lua_Client::*)(std::string))&Lua_Client::GetAccountFlag) - .def("GetAggroCount", (int(Lua_Client::*)(void))&Lua_Client::GetAggroCount) + .def("GetAggroCount", (uint32(Lua_Client::*)(void))&Lua_Client::GetAggroCount) .def("GetAllMoney", (uint64(Lua_Client::*)(void))&Lua_Client::GetAllMoney) .def("GetAlternateCurrencyValue", (int(Lua_Client::*)(uint32))&Lua_Client::GetAlternateCurrencyValue) .def("GetAnon", (int(Lua_Client::*)(void))&Lua_Client::GetAnon) diff --git a/zone/lua_client.h b/zone/lua_client.h index 462cb7908..e4abb11a7 100644 --- a/zone/lua_client.h +++ b/zone/lua_client.h @@ -367,7 +367,7 @@ public: void AssignToInstance(int instance_id); void Freeze(); void UnFreeze(); - int GetAggroCount(); + uint32 GetAggroCount(); uint64 GetCarriedMoney(); uint32 GetCarriedPlatinum(); uint64 GetAllMoney(); diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index a7a14bbe2..578860617 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1432,7 +1432,7 @@ void Perl_Client_UnFreeze(Client* self) self->SendAppearancePacket(AT_Anim, ANIM_STAND); } -int Perl_Client_GetAggroCount(Client* self) // @categories Script Utility, Hate and Aggro +uint32 Perl_Client_GetAggroCount(Client* self) // @categories Script Utility, Hate and Aggro { return self->GetAggroCount(); }