pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 22:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[INT64] Fix int64 for OOC Regen and GetHP(), GetMaxHP(), GetItemHPBonuses() in Perl/Lua. (#2218)

Browse Source 
* [INT64] Fix int64 for OOC Regen and GetHP(), GetMaxHP(), GetItemHPBonuses() in Perl/Lua.
- These all had int64 values and were overflowing, returning garbage data.

* Update npc.cpp
This commit is contained in:
Kinglykrab 2022-05-29 14:33:30 -04:00 committed by GitHub
parent bcf7ccefcd
commit 8f3ac74196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/lua_mob.cpp
View File

@ -482,17 +482,17 @@ bool Lua_Mob::IsWarriorClass() {
return self->IsWarriorClass(); return self->IsWarriorClass();
} }
int Lua_Mob::GetHP() { int64 Lua_Mob::GetHP() {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetHP(); return self->GetHP();
} }
int Lua_Mob::GetMaxHP() { int64 Lua_Mob::GetMaxHP() {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetMaxHP(); return self->GetMaxHP();
} }
int Lua_Mob::GetItemHPBonuses() { int64 Lua_Mob::GetItemHPBonuses() {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetItemHPBonuses(); return self->GetItemHPBonuses();
} }
@ -1356,9 +1356,9 @@ bool Lua_Mob::DivineAura() {
return self->DivineAura(); return self->DivineAura();
} }
void Lua_Mob::SetOOCRegen(int regen) { void Lua_Mob::SetOOCRegen(int64 new_ooc_regen) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
self->SetOOCRegen(regen); self->SetOOCRegen(new_ooc_regen);
} }
const char* Lua_Mob::GetEntityVariable(const char *name) { const char* Lua_Mob::GetEntityVariable(const char *name) {
@ -2860,7 +2860,7 @@ luabind::scope lua_register_mob() {
.def("SetLevel", (void(Lua_Mob::*)(int))&Lua_Mob::SetLevel) .def("SetLevel", (void(Lua_Mob::*)(int))&Lua_Mob::SetLevel)
.def("SetLevel", (void(Lua_Mob::*)(int,bool))&Lua_Mob::SetLevel) .def("SetLevel", (void(Lua_Mob::*)(int,bool))&Lua_Mob::SetLevel)
.def("SetMana", &Lua_Mob::SetMana) .def("SetMana", &Lua_Mob::SetMana)
.def("SetOOCRegen", (void(Lua_Mob::*)(int))&Lua_Mob::SetOOCRegen) .def("SetOOCRegen", (void(Lua_Mob::*)(int64))&Lua_Mob::SetOOCRegen)
.def("SetPet", &Lua_Mob::SetPet) .def("SetPet", &Lua_Mob::SetPet)
.def("SetPetOrder", (void(Lua_Mob::*)(int))&Lua_Mob::SetPetOrder) .def("SetPetOrder", (void(Lua_Mob::*)(int))&Lua_Mob::SetPetOrder)
.def("SetPseudoRoot", (void(Lua_Mob::*)(bool))&Lua_Mob::SetPseudoRoot) .def("SetPseudoRoot", (void(Lua_Mob::*)(bool))&Lua_Mob::SetPseudoRoot)

8
zone/lua_mob.h
View File

@ -123,9 +123,9 @@ public:
void SetTarget(Lua_Mob t); void SetTarget(Lua_Mob t);
double GetHPRatio(); double GetHPRatio();
bool IsWarriorClass(); bool IsWarriorClass();
int GetHP(); int64 GetHP();
int GetMaxHP(); int64 GetMaxHP();
int GetItemHPBonuses(); int64 GetItemHPBonuses();
int GetSpellHPBonuses(); int GetSpellHPBonuses();
double GetWalkspeed(); double GetWalkspeed();
double GetRunspeed(); double GetRunspeed();
@ -288,7 +288,7 @@ public:
bool SetAA(int rank_id, int new_value); bool SetAA(int rank_id, int new_value);
bool SetAA(int rank_id, int new_value, int charges); bool SetAA(int rank_id, int new_value, int charges);
bool DivineAura(); bool DivineAura();
void SetOOCRegen(int regen); void SetOOCRegen(int64 new_ooc_regen);
const char* GetEntityVariable(const char *name); const char* GetEntityVariable(const char *name);
void SetEntityVariable(const char *name, const char *value); void SetEntityVariable(const char *name, const char *value);
bool EntityVariableExists(const char *name); bool EntityVariableExists(const char *name);

4
zone/mob.h
View File

@ -497,7 +497,7 @@ public:
bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) = 0; bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) = 0;
virtual void SetHP(int64 hp); virtual void SetHP(int64 hp);
bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false); bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false);
inline void SetOOCRegen(int32 newoocregen) {ooc_regen = newoocregen;} inline void SetOOCRegen(int64 new_ooc_regen) { ooc_regen = new_ooc_regen; }
virtual void Heal(); virtual void Heal();
virtual void HealDamage(uint64 ammount, Mob* caster = nullptr, uint16 spell_id = SPELL_UNKNOWN); virtual void HealDamage(uint64 ammount, Mob* caster = nullptr, uint16 spell_id = SPELL_UNKNOWN);
virtual void SetMaxHP() { current_hp = max_hp; } virtual void SetMaxHP() { current_hp = max_hp; }
@ -1448,7 +1448,7 @@ protected:
int64 hp_regen; int64 hp_regen;
int64 hp_regen_per_second; int64 hp_regen_per_second;
int64 mana_regen; int64 mana_regen;
int32 ooc_regen; int64 ooc_regen;
uint8 maxlevel; uint8 maxlevel;
uint32 scalerate; uint32 scalerate;
Buffs_Struct *buffs; Buffs_Struct *buffs;

8
zone/npc.cpp
View File

@ -884,10 +884,10 @@ bool NPC::Process()
ProcessFlee(); ProcessFlee();
} }
uint32 npc_sitting_regen_bonus = 0; int64 npc_sitting_regen_bonus = 0;
uint32 pet_regen_bonus = 0; int64 pet_regen_bonus = 0;
uint64 npc_regen = 0; int64 npc_regen = 0;
int64 npc_hp_regen = GetNPCHPRegen(); int64 npc_hp_regen = GetNPCHPRegen();
if (GetAppearance() == eaSitting) { if (GetAppearance() == eaSitting) {
npc_sitting_regen_bonus += 3; npc_sitting_regen_bonus += 3;

12
zone/perl_mob.cpp
View File

@ -1579,7 +1579,7 @@ XS(XS_Mob_GetHP) {
Perl_croak(aTHX_ "Usage: Mob::GetHP(THIS)"); // @categories Stats and Attributes Perl_croak(aTHX_ "Usage: Mob::GetHP(THIS)"); // @categories Stats and Attributes
{ {
Mob *THIS; Mob *THIS;
int32 RETVAL; int64 RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_MOB; VALIDATE_THIS_IS_MOB;
RETVAL = THIS->GetHP(); RETVAL = THIS->GetHP();
@ -1596,7 +1596,7 @@ XS(XS_Mob_GetMaxHP) {
Perl_croak(aTHX_ "Usage: Mob::GetMaxHP(THIS)"); // @categories Stats and Attributes Perl_croak(aTHX_ "Usage: Mob::GetMaxHP(THIS)"); // @categories Stats and Attributes
{ {
Mob *THIS; Mob *THIS;
int32 RETVAL; int64 RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_MOB; VALIDATE_THIS_IS_MOB;
RETVAL = THIS->GetMaxHP(); RETVAL = THIS->GetMaxHP();
@ -1613,7 +1613,7 @@ XS(XS_Mob_GetItemHPBonuses) {
Perl_croak(aTHX_ "Usage: Mob::GetItemHPBonuses(THIS)"); // @categories Inventory and Items, Stats and Attributes Perl_croak(aTHX_ "Usage: Mob::GetItemHPBonuses(THIS)"); // @categories Inventory and Items, Stats and Attributes
{ {
Mob *THIS; Mob *THIS;
int32 RETVAL; int64 RETVAL;
dXSTARG; dXSTARG;
VALIDATE_THIS_IS_MOB; VALIDATE_THIS_IS_MOB;
RETVAL = THIS->GetItemHPBonuses(); RETVAL = THIS->GetItemHPBonuses();
@ -4417,12 +4417,12 @@ XS(XS_Mob_SetOOCRegen); /* prototype to pass -Wmissing-prototypes */
XS(XS_Mob_SetOOCRegen) { XS(XS_Mob_SetOOCRegen) {
dXSARGS; dXSARGS;
if (items != 2) if (items != 2)
Perl_croak(aTHX_ "Usage: Mob::SetOOCRegen(THIS, int32 new_ooc_regen)"); // @categories Stats and Attributes Perl_croak(aTHX_ "Usage: Mob::SetOOCRegen(THIS, int64 new_ooc_regen)"); // @categories Stats and Attributes
{ {
Mob *THIS; Mob *THIS;
int32 newoocregen = (int32) SvIV(ST(1)); int64 new_ooc_regen = (int64) SvIV(ST(1));
VALIDATE_THIS_IS_MOB; VALIDATE_THIS_IS_MOB;
THIS->SetOOCRegen(newoocregen); THIS->SetOOCRegen(new_ooc_regen);
} }
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }