mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Use raw string literal for error marker definition

Browse Source
This commit is contained in:
elsid 2022-09-12 15:03:34 +02:00
parent 6ae15f08e0
commit 409f83a149
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
6 changed files with 1418 additions and 1405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/CMakeLists.txt
View File

@ -50,7 +50,7 @@ add_component_dir (vfs
add_component_dir (resource add_component_dir (resource
scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem
resourcemanager stats animation foreachbulletobject resourcemanager stats animation foreachbulletobject errormarker
) )
add_component_dir (shader add_component_dir (shader
@ -197,7 +197,7 @@ add_component_dir (esm4
add_component_dir (misc add_component_dir (misc
constants utf8stream resourcehelpers rng messageformatparser weakcache thread constants utf8stream resourcehelpers rng messageformatparser weakcache thread
compression osguservalues errorMarker color tuplemeta tuplehelpers compression osguservalues color tuplemeta tuplehelpers
) )
add_component_dir (stereo add_component_dir (stereo

1390
components/misc/errorMarker.cpp
View File

File diff suppressed because it is too large Load Diff

11
components/misc/errorMarker.hpp
View File

@ -1,11 +0,0 @@
#ifndef OPENMW_COMPONENTS_MISC_ERRORMARKER_H
#define OPENMW_COMPONENTS_MISC_ERRORMARKER_H
#include <string>
namespace Misc
{
extern const std::string errorMarker;
}
#endif

1400
components/resource/errormarker.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

14
components/resource/errormarker.hpp Normal file
View File

@ -0,0 +1,14 @@
#ifndef OPENMW_COMPONENTS_RESOURCE_ERRORMARKER_H
#define OPENMW_COMPONENTS_RESOURCE_ERRORMARKER_H
#include <string_view>
namespace Resource
{
struct ErrorMarker
{
static const std::string_view sValue;
};
}
#endif

4
components/resource/scenemanager.cpp
View File

@ -28,7 +28,6 @@
#include <components/misc/pathhelpers.hpp> #include <components/misc/pathhelpers.hpp>
#include <components/misc/strings/algorithm.hpp> #include <components/misc/strings/algorithm.hpp>
#include <components/misc/algorithm.hpp> #include <components/misc/algorithm.hpp>
#include <components/misc/errorMarker.hpp>
#include <components/misc/osguservalues.hpp> #include <components/misc/osguservalues.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
@ -53,6 +52,7 @@
#include "imagemanager.hpp" #include "imagemanager.hpp"
#include "niffilemanager.hpp" #include "niffilemanager.hpp"
#include "objectcache.hpp" #include "objectcache.hpp"
#include "errormarker.hpp"
namespace namespace
{ {
@ -759,7 +759,7 @@ namespace Resource
if (mVFS->exists(normalized)) if (mVFS->exists(normalized))
return load(normalized, mVFS, mImageManager, mNifFileManager); return load(normalized, mVFS, mImageManager, mNifFileManager);
} }
Files::IMemStream file(Misc::errorMarker.data(), Misc::errorMarker.size()); Files::IMemStream file(ErrorMarker::sValue.data(), ErrorMarker::sValue.size());
return loadNonNif("error_marker.osgt", file, mImageManager); return loadNonNif("error_marker.osgt", file, mImageManager);
}(); }();