mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Move fourCC to a separate file

Browse source
This commit is contained in:
elsid 2022-10-09 20:26:20 +02:00
parent 45e673564f
commit baa39c06bb
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/esm/defs.hpp
View file

@ -8,6 +8,7 @@
#include <osg/Vec3f> #include <osg/Vec3f>
#include "components/esm/fourcc.hpp"
#include <components/esm4/common.hpp> #include <components/esm4/common.hpp>
namespace ESM namespace ESM

2
components/esm/format.hpp
View file

@ -1,7 +1,7 @@
#ifndef COMPONENT_ESM_FORMAT_H #ifndef COMPONENT_ESM_FORMAT_H
#define COMPONENT_ESM_FORMAT_H #define COMPONENT_ESM_FORMAT_H
#include "defs.hpp" #include "components/esm/fourcc.hpp"
#include <cstdint> #include <cstdint>
#include <iosfwd> #include <iosfwd>

13
components/esm/fourcc.hpp Normal file
View file

@ -0,0 +1,13 @@
#ifndef OPENMW_COMPONENTS_ESM_FOURCC_H
#define OPENMW_COMPONENTS_ESM_FOURCC_H
namespace ESM
{
inline constexpr unsigned int fourCC(const char (&name)[5])
{
return static_cast<unsigned char>(name[0]) | (static_cast<unsigned char>(name[1]) << 8)
| (static_cast<unsigned char>(name[2]) << 16) | (static_cast<unsigned char>(name[3]) << 24);
}
}
#endif // OPENMW_COMPONENTS_ESM_FOURCC_H

13
components/esm4/common.hpp
View file

@ -30,18 +30,9 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "formid.hpp" #include "components/esm/fourcc.hpp"
namespace ESM #include "formid.hpp"
{
template <std::size_t len>
constexpr unsigned int fourCC(const char (&name)[len])
{
static_assert(len == 5, "Constant must be 4 characters long. (Plus null terminator)");
return static_cast<unsigned char>(name[0]) | (static_cast<unsigned char>(name[1]) << 8)
| (static_cast<unsigned char>(name[2]) << 16) | (static_cast<unsigned char>(name[3]) << 24);
}
}
namespace ESM4 namespace ESM4
{ {