diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-24 20:59:43 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2020-10-24 21:00:59 +0200 |
| commit | 6cae9c75b5d993116681d00950fdf6896f7ec2d9 (patch) | |
| tree | 561007a55df0e4a4b66b1a2dbe2ea5ff21d0f9fc /src/KingSystem/Map/mapMubinIter.cpp | |
| parent | f8862135935d8a80e2e971f82f8ab30f15e501bc (diff) | |
Use sead::SafeString overload of HashCRC32::calcStringHash
Diffstat (limited to 'src/KingSystem/Map/mapMubinIter.cpp')
| -rw-r--r-- | src/KingSystem/Map/mapMubinIter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/KingSystem/Map/mapMubinIter.cpp b/src/KingSystem/Map/mapMubinIter.cpp index 450100f9..a18eb7a2 100644 --- a/src/KingSystem/Map/mapMubinIter.cpp +++ b/src/KingSystem/Map/mapMubinIter.cpp @@ -69,7 +69,7 @@ MubinIter::MubinIter() : ByamlIter() {} MubinIter::MubinIter(const u8* data) : ByamlIter(data) {} bool MubinIter::tryGetParamUInt8ByKey(u8* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.SRTHash == hash || sHashes.Index == hash) { s32 x = 0; @@ -90,7 +90,7 @@ bool MubinIter::tryGetParamUInt8ByKey(u8* value, const sead::SafeString& key) co } bool MubinIter::tryGetParamIntByKey(s32* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.SRTHash == hash || sHashes.Index == hash) return tryGetIntByKey(value, key.cstr()); @@ -99,7 +99,7 @@ bool MubinIter::tryGetParamIntByKey(s32* value, const sead::SafeString& key) con } bool MubinIter::tryGetParamUIntByKey(u32* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.HashId == hash || sHashes.DestUnitHashId == hash) return tryGetUIntByKey(value, key.cstr()); @@ -108,7 +108,7 @@ bool MubinIter::tryGetParamUIntByKey(u32* value, const sead::SafeString& key) co } bool MubinIter::tryGetParamFloatByKey(f32* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.LocationPosX == hash || sHashes.LocationPosZ == hash || sHashes.NextDistance == hash || sHashes.PrevDistance == hash) { return tryGetFloatByKey(value, key.cstr()); @@ -119,7 +119,7 @@ bool MubinIter::tryGetParamFloatByKey(f32* value, const sead::SafeString& key) c } bool MubinIter::tryGetParamBoolByKey(bool* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.IsClosed == hash || sHashes.OnlyOne == hash) return tryGetBoolByKey(value, key.cstr()); @@ -128,7 +128,7 @@ bool MubinIter::tryGetParamBoolByKey(bool* value, const sead::SafeString& key) c } bool MubinIter::tryGetParamStringByKey(const char** value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.RailType == hash || sHashes.UniqueName == hash || sHashes.UnitConfigName == hash || sHashes.CheckPointName == hash || sHashes.EntryPointName == hash || sHashes.DefinitionName == hash) { @@ -144,7 +144,7 @@ bool MubinIter::tryGetIterByIndex(MubinIter* iter, s32 index) const { } bool MubinIter::tryGetParamIterByKey(MubinIter* value, const sead::SafeString& key) const { - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.Objs == hash || sHashes.Rails == hash || sHashes.LinksToObj == hash || sHashes.LinksToRail == hash || sHashes.Rotate == hash || sHashes.Scale == hash || sHashes.Translate == hash || sHashes.RailPoints == hash || sHashes.ControlPoints == hash || @@ -166,7 +166,7 @@ bool MubinIter::isValid() const { bool MubinIter::tryGetFloatArrayByKey(f32* value, const sead::SafeString& key) const { al::ByamlIter iter; - const u32 hash = sead::HashCRC32::calcStringHash(key.cstr()); + const u32 hash = sead::HashCRC32::calcStringHash(key); if (sHashes.Objs == hash || sHashes.Rails == hash || sHashes.LinksToObj == hash || sHashes.LinksToRail == hash || sHashes.Rotate == hash || sHashes.Scale == hash || sHashes.Translate == hash || sHashes.RailPoints == hash || sHashes.ControlPoints == hash || |
