From 4e1f82c05cc2c22861eb126a7bacc192671e096f Mon Sep 17 00:00:00 2001 From: neptunium Date: Fri, 20 Oct 2023 05:31:07 +0200 Subject: [PATCH] tweak(resources): changes for retail builds this is required for upcoming internal changes --- .../citizen-resources-core/src/Resource.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/components/citizen-resources-core/src/Resource.cpp b/code/components/citizen-resources-core/src/Resource.cpp index 82772ad0db..ede4763563 100644 --- a/code/components/citizen-resources-core/src/Resource.cpp +++ b/code/components/citizen-resources-core/src/Resource.cpp @@ -15,6 +15,12 @@ #include +#if __has_include() +#include +#else +#define INTERNAL_RESOURCE_GET_NAME GetName +#endif + namespace fx { ResourceImpl::ResourceImpl(const std::string& name, ResourceManagerImpl* manager) @@ -42,11 +48,13 @@ bool ResourceImpl::LoadFrom(const std::string& rootPath, std::string* errorState } else { - trace("Resource loading for %s failed:\n%s\n", m_name.c_str(), retval->c_str()); + trace("Resource loading for %s failed:\n%s\n", INTERNAL_RESOURCE_GET_NAME().c_str(), retval->c_str()); } } +#if !defined(INTERNAL_RESOURCE_IMPL) m_rootPath = rootPath; +#endif m_state = ResourceState::Stopped; @@ -142,7 +150,7 @@ void ResourceImpl::Run(std::function&& fn) // save data in case we need to trace this back from dumps char resourceNameBit[128]; - memcpy(resourceNameBit, GetName().c_str(), std::min(std::size(resourceNameBit), GetName().length() + 1)); + memcpy(resourceNameBit, INTERNAL_RESOURCE_GET_NAME().c_str(), std::min(std::size(resourceNameBit), INTERNAL_RESOURCE_GET_NAME().length() + 1)); debug::Alias(resourceNameBit); OnEnter();