pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Cleanup Haste references and Lua API calls for unsigned to signed. (#2240)

Browse Source
This commit is contained in:
Kinglykrab 2022-06-04 14:00:21 -04:00 committed by GitHub
parent 8414ce02e3
commit 7160aa651e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/bonuses.cpp
View File

@ -353,7 +353,7 @@ void Client::AddItemBonuses(const EQ::ItemInstance *inst, StatBonuses *newbon, b
}
// FatherNitwit: New style haste, shields, and regens
if (newbon->haste < (int32)item->Haste) {
if (newbon->haste < item->Haste) {
newbon->haste = item->Haste;
}
if (item->Regen > 0)

18
zone/lua_item.cpp
View File

@ -76,7 +76,7 @@ uint32 Lua_Item::GetIcon() {
return self->Icon;
}
uint32 Lua_Item::GetLoreGroup() {
int32 Lua_Item::GetLoreGroup() {
Lua_Safe_Call_Int();
return self->LoreGroup;
}
@ -531,42 +531,42 @@ uint32 Lua_Item::GetAugRestrict() {
return self->AugRestrict;
}
uint32 Lua_Item::GetEndur() {
int32 Lua_Item::GetEndur() {
Lua_Safe_Call_Int();
return self->Endur;
}
uint32 Lua_Item::GetDotShielding() {
int32 Lua_Item::GetDotShielding() {
Lua_Safe_Call_Int();
return self->DotShielding;
}
uint32 Lua_Item::GetAttack() {
int32 Lua_Item::GetAttack() {
Lua_Safe_Call_Int();
return self->Attack;
}
uint32 Lua_Item::GetRegen() {
int32 Lua_Item::GetRegen() {
Lua_Safe_Call_Int();
return self->Regen;
}
uint32 Lua_Item::GetManaRegen() {
int32 Lua_Item::GetManaRegen() {
Lua_Safe_Call_Int();
return self->ManaRegen;
}
uint32 Lua_Item::GetEnduranceRegen() {
int32 Lua_Item::GetEnduranceRegen() {
Lua_Safe_Call_Int();
return self->EnduranceRegen;
}
uint32 Lua_Item::GetHaste() {
int32 Lua_Item::GetHaste() {
Lua_Safe_Call_Int();
return self->Haste;
}
uint32 Lua_Item::GetDamageShield() {
int32 Lua_Item::GetDamageShield() {
Lua_Safe_Call_Int();
return self->DamageShield;
}

18
zone/lua_item.h
View File

@ -41,7 +41,7 @@ public:
uint32 GetSlots();
uint32 GetPrice();
uint32 GetIcon();
uint32 GetLoreGroup();
int32 GetLoreGroup();
bool GetLoreFlag();
bool GetPendingLoreFlag();
bool GetArtifactFlag();
@ -129,14 +129,14 @@ public:
uint32 GetLDoNSold();
uint32 GetBaneDmgRaceAmt();
uint32 GetAugRestrict();
uint32 GetEndur();
uint32 GetDotShielding();
uint32 GetAttack();
uint32 GetRegen();
uint32 GetManaRegen();
uint32 GetEnduranceRegen();
uint32 GetHaste();
uint32 GetDamageShield();
int32 GetEndur();
int32 GetDotShielding();
int32 GetAttack();
int32 GetRegen();
int32 GetManaRegen();
int32 GetEnduranceRegen();
int32 GetHaste();
int32 GetDamageShield();
uint32 GetRecastDelay();
uint32 GetRecastType();
uint32 GetAugDistiller();

2
zone/merc.cpp
View File

@ -351,7 +351,7 @@ void Merc::AddItemBonuses(const EQ::ItemData *item, StatBonuses* newbon) {
}
//FatherNitwit: New style haste, shields, and regens
if(newbon->haste < (int16)item->Haste) {
if(newbon->haste < item->Haste) {
newbon->haste = item->Haste;
}
if(item->Regen > 0)