mirror of
https://github.com/brues-code/ClassicAPI.git
synced 2026-11-16 16:10:36 +00:00
refactor: share ASCII case-insensitive compare + DBC reverse token lookup
Add baselib/Ascii.h (header-only Ascii::ToLower / Ascii::EqualCI) and replace the two hand-rolled case-insensitive compares (frame/Attributes' EqI, taxi/Map's IEqual + AsciiLower). Add DBC::ClassIdForToken / RaceIdForToken (token -> ChrClasses/ChrRaces id, the reverse of ClassToken/RaceToken) backed by a shared IdForStringField walk using Ascii::EqualCI, and replace player/NameCache's two near-identical ResolveClassToken / ResolveRaceToken loops.
This commit is contained in:
@@ -15,9 +15,37 @@
|
||||
|
||||
#include "Lookup.h"
|
||||
#include "Offsets.h"
|
||||
#include "baselib/Ascii.h"
|
||||
|
||||
namespace DBC {
|
||||
|
||||
namespace {
|
||||
|
||||
// Reverse lookup shared by ClassIdForToken / RaceIdForToken: the id whose
|
||||
// single-string field at `offset` matches `token` (case-insensitive), or 0.
|
||||
uint32_t IdForStringField(uintptr_t recordsVar, uintptr_t countVar, int offset,
|
||||
const char *token) {
|
||||
if (token == nullptr || *token == '\0')
|
||||
return 0;
|
||||
const int count = *reinterpret_cast<const int *>(countVar);
|
||||
const uint8_t *const *records =
|
||||
*reinterpret_cast<const uint8_t *const *const *>(recordsVar);
|
||||
if (records == nullptr)
|
||||
return 0;
|
||||
for (int i = 1; i <= count; ++i) {
|
||||
const uint8_t *rec = records[i];
|
||||
if (rec == nullptr)
|
||||
continue;
|
||||
const char *field =
|
||||
*reinterpret_cast<const char *const *>(rec + offset);
|
||||
if (field != nullptr && Ascii::EqualCI(field, token))
|
||||
return static_cast<uint32_t>(i);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
const char *ClassName(uint32_t classID) {
|
||||
if (classID == 0)
|
||||
return nullptr;
|
||||
@@ -50,6 +78,18 @@ const char *RaceToken(uint32_t raceID) {
|
||||
Offsets::OFF_CHRRACES_FILENAME);
|
||||
}
|
||||
|
||||
uint32_t ClassIdForToken(const char *token) {
|
||||
return IdForStringField(Offsets::VAR_CHRCLASSES_RECORDS,
|
||||
Offsets::VAR_CHRCLASSES_COUNT,
|
||||
Offsets::OFF_CHRCLASSES_FILENAME, token);
|
||||
}
|
||||
|
||||
uint32_t RaceIdForToken(const char *token) {
|
||||
return IdForStringField(Offsets::VAR_CHRRACES_RECORDS,
|
||||
Offsets::VAR_CHRRACES_COUNT,
|
||||
Offsets::OFF_CHRRACES_FILENAME, token);
|
||||
}
|
||||
|
||||
const char *AreaName(uint32_t areaID, bool resolveToParent) {
|
||||
if (areaID == 0)
|
||||
return nullptr;
|
||||
|
||||
Reference in New Issue
Block a user