pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 07:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Strings] Add more number formatters (#2873)

Browse Source 
* [Strings] Add more number formatters

# Notes
- Adds `Strings::ToUnsignedInt` for `uint32` support.
- Adds `Strings::ToBigInt` for `int64` support.
- Adds `Strings::ToUnsignedBigInt` for `uint64` support.
- Adds `Strings::ToFloat` for `float` support.
- Replaces all `std::stoi` references with `Strings::ToInt`.
- Replaces all `atoi` references with `Strings::ToInt`.
- Replaces all `std::stoul` references with `Strings::ToUnsignedInt`.
- Replaces all `atoul` references with `Strings::ToUnsignedInt`.
- Replaces all `std::stoll` references with `Strings::ToBigInt`.
- Replaces all `atoll` references with `Strings::ToBigInt`.
- Replaces all `std::stoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `atoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `std::stof` references with `Strings::ToFloat`.

* [Strings] Add more number formatters

- Adds `Strings::ToUnsignedInt` for `uint32` support.
- Adds `Strings::ToBigInt` for `int64` support.
- Adds `Strings::ToUnsignedBigInt` for `uint64` support.
- Adds `Strings::ToFloat` for `float` support.
- Replaces all `std::stoi` references with `Strings::ToInt`.
- Replaces all `atoi` references with `Strings::ToInt`.
- Replaces all `std::stoul` references with `Strings::ToUnsignedInt`.
- Replaces all `atoul` references with `Strings::ToUnsignedInt`.
- Replaces all `std::stoll` references with `Strings::ToBigInt`.
- Replaces all `atoll` references with `Strings::ToBigInt`.
- Replaces all `std::stoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `atoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `std::stof` references with `Strings::ToFloat`.

* Rebase cleanup

* Changes/benchmarks/tests

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Alex King
2023-03-04 18:01:19 -05:00
committed by GitHub
parent be567af70d
commit 2a6cf8c8e7
261 changed files with 3178 additions and 3012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+6 -6
View File
@@ -5232,7 +5232,7 @@ int Mob::QGVarDuration(const char *fmt)
// Set val to value after type character
// e.g., for "M3924", set to 3924
int val = atoi(&fmt[0] + 1);
int val = Strings::ToInt(&fmt[0] + 1);
switch (fmt[0])
{
@@ -6310,8 +6310,8 @@ void Mob::ProcessSpecialAbilities(const std::string &str) {
Strings::IsNumber(sub_sp[0]) &&
Strings::IsNumber(sub_sp[1])
) {
int ability_id = std::stoi(sub_sp[0]);
int value = std::stoi(sub_sp[1]);
int ability_id = Strings::ToInt(sub_sp[0]);
int value = Strings::ToInt(sub_sp[1]);
SetSpecialAbility(ability_id, value);
@@ -6338,7 +6338,7 @@ void Mob::ProcessSpecialAbilities(const std::string &str) {
}
if (Strings::IsNumber(sub_sp[i])) {
SetSpecialAbilityParam(ability_id, param_id, std::stoi(sub_sp[i]));
SetSpecialAbilityParam(ability_id, param_id, Strings::ToInt(sub_sp[i]));
}
}
}
@@ -6947,9 +6947,9 @@ std::string Mob::GetBucketKey() {
std::string Mob::GetBucketRemaining(std::string bucket_name) {
std::string full_bucket_name = fmt::format("{}-{}", GetBucketKey(), bucket_name);
std::string bucket_remaining = DataBucket::GetDataRemaining(full_bucket_name);
if (!bucket_remaining.empty() && atoi(bucket_remaining.c_str()) > 0) {
if (!bucket_remaining.empty() && Strings::ToInt(bucket_remaining.c_str()) > 0) {
return bucket_remaining;
} else if (atoi(bucket_remaining.c_str()) == 0) {
} else if (Strings::ToInt(bucket_remaining.c_str()) == 0) {
return "0";
}
return std::string();