pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-22 19:58:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

converted spell id's to integers and made the internal representation 322-bit

Browse Source
This commit is contained in:
dannuic
2026-04-26 23:53:57 -06:00
parent 05cb1921e8
commit 5de441fa20
134 changed files with 1644 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/castspell.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void command_castspell(Client *c, const Seperator *sep)
t = c->GetTarget();
}
const uint16 spell_id = Strings::ToUnsignedInt(sep->arg[1]);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (spell_id >= SPDAT_RECORDS) {
c->Message(Chat::White, "Invalid Spell ID.");
zone/gm_commands/npccast.cpp
+4 -4
View File
@@ -27,7 +27,7 @@ void command_npccast(Client *c, const Seperator *sep)
auto target = c->GetTarget()->CastToNPC();
if (!sep->IsNumber(1) && sep->arg[1] && sep->IsNumber(2)) {
std::string entity_name = sep->arg[1] ? sep->arg[1] : 0;
auto spell_id = sep->arg[2] ? Strings::ToUnsignedInt(sep->arg[2]) : 0;
int32 spell_id = sep->arg[2] ? Strings::ToInt(sep->arg[2]) : 0;
auto spell_target = entity_list.GetMob(entity_name.c_str());
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@@ -35,7 +35,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
@@ -63,7 +63,7 @@ void command_npccast(Client *c, const Seperator *sep)
}
} else if (sep->IsNumber(1) && sep->IsNumber(2)) {
uint16 entity_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1]));
auto spell_id = Strings::ToUnsignedInt(sep->arg[2]);
int32 spell_id = Strings::ToInt(sep->arg[2]);
auto spell_target = entity_list.GetMob(entity_id);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@@ -71,7 +71,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
zone/gm_commands/unscribespell.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void command_unscribespell(Client *c, const Seperator *sep)
t = c->GetTarget()->CastToClient();
}
const uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(
zone/gm_commands/untraindisc.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void command_untraindisc(Client *c, const Seperator *sep)
target = c->GetTarget()->CastToClient();
}
uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(