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

[Strings] Refactor Strings Usage (#2305)

Browse Source 
* Initial commit checkpoint

* More functions converted

* Commify

* More functions

* Fin

* Sort declarations

* Split functions between files

* Bots

* Update strings.h

* Split

* Revert find replaces

* Repository template

* Money

* Misc function

* Update CMakeLists.txt

* Saylink

* Update strings.cpp

* Swap Strings::Saylink for Saylink::Create since saylink is coupled to zone database

* API casings
This commit is contained in:
Chris Miles
2022-07-14 02:10:52 -05:00
committed by GitHub
parent 44c85a0dd7
commit dfd8f84cac
573 changed files with 5197 additions and 5137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+8 -8
View File
@@ -74,7 +74,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
#include "../common/rulesys.h"
#include "../common/skills.h"
#include "../common/spdat.h"
#include "../common/string_util.h"
#include "../common/strings.h"
#include "../common/data_verification.h"
#include "../common/misc_functions.h"
@@ -2200,7 +2200,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
if (!spell_target_tot) {
return false;
}
//Verfied from live - Target's Target needs to be in combat range to recieve the effect
if (RuleB(Spells, TargetsTargetRequiresCombatRange) && !CombatRange(spell_target)) {
return false;
@@ -5542,7 +5542,7 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) {
query = fmt::format(
"SELECT value FROM quest_globals WHERE charid = {} AND name = '{}'",
character_id,
EscapeString(spell_global_name)
Strings::Escape(spell_global_name)
);
results = database.QueryDatabase(query);
@@ -5570,7 +5570,7 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) {
row = results.begin();
std::string global_value = row[0];
if (StringIsNumber(global_value) && StringIsNumber(spell_global_value)) {
if (Strings::IsNumber(global_value) && Strings::IsNumber(spell_global_value)) {
if (std::stoi(global_value) >= std::stoi(spell_global_value)) {
return true; // If value is greater than or equal to spell global value, allow scribing.
}
@@ -5624,11 +5624,11 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id) {
auto bucket_value = DataBucket::GetData(new_bucket_name);
if (!bucket_value.empty()) {
if (StringIsNumber(bucket_value) && StringIsNumber(spell_bucket_value)) {
if (Strings::IsNumber(bucket_value) && Strings::IsNumber(spell_bucket_value)) {
if (std::stoi(bucket_value) >= std::stoi(spell_bucket_value)) {
return true; // If value is greater than or equal to spell bucket value, allow scribing.
}
} else {
} else {
if (bucket_value == spell_bucket_value) {
return true; // If value is equal to spell bucket value, allow scribing.
}
@@ -5643,11 +5643,11 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id) {
bucket_value = DataBucket::GetData(old_bucket_name);
if (!bucket_value.empty()) {
if (StringIsNumber(bucket_value) && StringIsNumber(spell_bucket_value)) {
if (Strings::IsNumber(bucket_value) && Strings::IsNumber(spell_bucket_value)) {
if (std::stoi(bucket_value) >= std::stoi(spell_bucket_value)) {
return true; // If value is greater than or equal to spell bucket value, allow scribing.
}
} else {
} else {
if (bucket_value == spell_bucket_value) {
return true; // If value is equal to spell bucket value, allow scribing.
}