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

[Bots] Move all spell_id instances to uint16 (#4876)

Browse Source 
* [Bots] Move all spell_id instances to uint16

* Alignment
This commit is contained in:
nytmyr 2025-05-14 19:58:18 -05:00 committed by GitHub
parent f3697e633c
commit 780120036d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/bot.h
View File

@ -747,7 +747,7 @@ public:
static BotSpell GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal); static BotSpell GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static BotSpell GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal); static BotSpell GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static Mob* GetFirstIncomingMobToMez(Bot* caster, int16 spell_id, uint16 spell_type, bool AE); static Mob* GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE);
static BotSpell GetBestBotSpellForMez(Bot* caster, uint16 spell_type = BotSpellTypes::Mez); static BotSpell GetBestBotSpellForMez(Bot* caster, uint16 spell_type = BotSpellTypes::Mez);
static BotSpell GetBestBotMagicianPetSpell(Bot* caster, uint16 spell_type = BotSpellTypes::Pet); static BotSpell GetBestBotMagicianPetSpell(Bot* caster, uint16 spell_type = BotSpellTypes::Pet);
static std::string GetBotMagicianPetType(Bot* caster); static std::string GetBotMagicianPetType(Bot* caster);

4
zone/bot_structs.h
View File

@ -68,7 +68,7 @@ struct BotSpellSetting {
struct BotSpells { struct BotSpells {
uint32 type; // 0 = never, must be one (and only one) of the defined values uint32 type; // 0 = never, must be one (and only one) of the defined values
int16 spellid; // <= 0 = no spell uint16 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next uint32 time_cancast; // when we can cast this spell next
int32 recast_delay; int32 recast_delay;
@ -86,7 +86,7 @@ struct BotSpells {
struct BotSpells_wIndex { struct BotSpells_wIndex {
uint32 index; //index of AIBot_spells uint32 index; //index of AIBot_spells
uint32 type; // 0 = never, must be one (and only one) of the defined values uint32 type; // 0 = never, must be one (and only one) of the defined values
int16 spellid; // <= 0 = no spell uint16 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next uint32 time_cancast; // when we can cast this spell next
int32 recast_delay; int32 recast_delay;

2
zone/botspellsai.cpp
View File

@ -1459,7 +1459,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* caster, uint16 spell_type) {
return result; return result;
} }
Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, int16 spell_id, uint16 spell_type, bool AE) { Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE) {
Mob* result = nullptr; Mob* result = nullptr;
if (caster && caster->GetOwner()) { if (caster && caster->GetOwner()) {