From 2f2e401559dd2ea25cf53dbbb1c210b0d1457fed Mon Sep 17 00:00:00 2001 From: fteppe Date: Mon, 3 Oct 2022 19:49:20 +0200 Subject: [PATCH] is Hidden marker now takes a const RefId& instead of a string_view --- apps/openmw/mwlua/object.cpp | 2 +- apps/openmw/mwlua/types/types.cpp | 2 +- apps/openmw/mwrender/objectpaging.cpp | 2 +- apps/openmw/mwworld/scene.cpp | 2 +- components/esmloader/load.cpp | 2 +- components/misc/resourcehelpers.cpp | 7 ++++--- components/misc/resourcehelpers.hpp | 7 ++++++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp index d54daa7ea8..0a069f35c7 100644 --- a/apps/openmw/mwlua/object.cpp +++ b/apps/openmw/mwlua/object.cpp @@ -14,7 +14,7 @@ namespace MWLua bool isMarker(const MWWorld::Ptr& ptr) { - return Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId().getRefIdString()); + return Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId()); } std::string ptrToString(const MWWorld::Ptr& ptr) diff --git a/apps/openmw/mwlua/types/types.cpp b/apps/openmw/mwlua/types/types.cpp index 5a308fa619..9e04868fbd 100644 --- a/apps/openmw/mwlua/types/types.cpp +++ b/apps/openmw/mwlua/types/types.cpp @@ -68,7 +68,7 @@ namespace MWLua const ESM::RefId& id = ref->mRef.getRefId(); if (id == ESM::RefId::stringRefId("player")) return ESM::REC_INTERNAL_PLAYER; - if (Misc::ResourceHelpers::isHiddenMarker(id.getRefIdString())) + if (Misc::ResourceHelpers::isHiddenMarker(id)) return ESM::REC_INTERNAL_MARKER; return ref->getType(); } diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp index 421cac3c10..2140bd5412 100644 --- a/apps/openmw/mwrender/objectpaging.cpp +++ b/apps/openmw/mwrender/objectpaging.cpp @@ -599,7 +599,7 @@ namespace MWRender continue; } - if (Misc::ResourceHelpers::isHiddenMarker(ref.mRefID.getRefIdString())) + if (Misc::ResourceHelpers::isHiddenMarker(ref.mRefID)) continue; int type = store.findStatic(ref.mRefID); diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index f99f01e4d2..8d5672f7ce 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -92,7 +92,7 @@ namespace std::string getModel(const MWWorld::Ptr& ptr, const VFS::Manager* vfs) { - if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId().getRefIdString())) + if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId())) return {}; bool useAnim = ptr.getClass().useAnim(); std::string model = ptr.getClass().getModel(ptr); diff --git a/components/esmloader/load.cpp b/components/esmloader/load.cpp index c3d9c280ba..6b516898ca 100644 --- a/components/esmloader/load.cpp +++ b/components/esmloader/load.cpp @@ -82,7 +82,7 @@ namespace EsmLoader T record; bool deleted = false; record.load(reader, deleted); - if (Misc::ResourceHelpers::isHiddenMarker(record.mId.getRefIdString())) + if (Misc::ResourceHelpers::isHiddenMarker(record.mId)) return; records.emplace_back(deleted, std::move(record)); } diff --git a/components/misc/resourcehelpers.cpp b/components/misc/resourcehelpers.cpp index 3127789d52..059f7976b6 100644 --- a/components/misc/resourcehelpers.cpp +++ b/components/misc/resourcehelpers.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -157,10 +158,10 @@ std::string Misc::ResourceHelpers::correctSoundPath(std::string_view resPath, co return vfs->normalizeFilename(resPath); } -bool Misc::ResourceHelpers::isHiddenMarker(std::string_view id) +bool Misc::ResourceHelpers::isHiddenMarker(const ESM::RefId& id) { - return Misc::StringUtils::ciEqual(id, "prisonmarker") || Misc::StringUtils::ciEqual(id, "divinemarker") - || Misc::StringUtils::ciEqual(id, "templemarker") || Misc::StringUtils::ciEqual(id, "northmarker"); + return id == ESM::RefId::stringRefId("prisonmarker") ||id == ESM::RefId::stringRefId("divinemarker") + || id == ESM::RefId::stringRefId("templemarker") || id == ESM::RefId::stringRefId("northmarker"); } namespace diff --git a/components/misc/resourcehelpers.hpp b/components/misc/resourcehelpers.hpp index 355bd67885..bc11064654 100644 --- a/components/misc/resourcehelpers.hpp +++ b/components/misc/resourcehelpers.hpp @@ -9,6 +9,11 @@ namespace VFS class Manager; } +namespace ESM +{ + struct RefId; +} + namespace Misc { // Workarounds for messy resource handling in vanilla morrowind @@ -30,7 +35,7 @@ namespace Misc std::string correctSoundPath(std::string_view resPath, const VFS::Manager* vfs); /// marker objects that have a hardcoded function in the game logic, should be hidden from the player - bool isHiddenMarker(std::string_view id); + bool isHiddenMarker(const ESM::RefId& id); std::string getLODMeshName(int esmVersion, std::string resPath, const VFS::Manager* vfs, unsigned char lod = 0); } }