mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 18:52:22 +00:00
[Strings] Add more number formatters (#2873)
* [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:
+8
-8
@@ -6121,8 +6121,8 @@ void NPC::LoadMercTypes() {
|
||||
{
|
||||
MercType tempMercType;
|
||||
|
||||
tempMercType.Type = atoi(row[0]);
|
||||
tempMercType.ClientVersion = atoi(row[1]);
|
||||
tempMercType.Type = Strings::ToInt(row[0]);
|
||||
tempMercType.ClientVersion = Strings::ToInt(row[1]);
|
||||
|
||||
mercTypeList.push_back(tempMercType);
|
||||
}
|
||||
@@ -6154,12 +6154,12 @@ void NPC::LoadMercs() {
|
||||
{
|
||||
MercData tempMerc;
|
||||
|
||||
tempMerc.MercTemplateID = atoi(row[0]);
|
||||
tempMerc.MercType = atoi(row[1]);
|
||||
tempMerc.MercSubType = atoi(row[2]);
|
||||
tempMerc.CostFormula = atoi(row[3]);
|
||||
tempMerc.ClientVersion = atoi(row[4]);
|
||||
tempMerc.NPCID = atoi(row[5]);
|
||||
tempMerc.MercTemplateID = Strings::ToInt(row[0]);
|
||||
tempMerc.MercType = Strings::ToInt(row[1]);
|
||||
tempMerc.MercSubType = Strings::ToInt(row[2]);
|
||||
tempMerc.CostFormula = Strings::ToInt(row[3]);
|
||||
tempMerc.ClientVersion = Strings::ToInt(row[4]);
|
||||
tempMerc.NPCID = Strings::ToInt(row[5]);
|
||||
|
||||
mercDataList.push_back(tempMerc);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user