mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

Correct declarations of utility methods

Browse Source
This commit is contained in:
Capostrophic 2020-02-02 18:40:11 +03:00
parent e363d5df21
commit 0479311c25
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/nif/nifstream.cpp
View File

@ -38,7 +38,7 @@ namespace Nif
}
// Convenience utility functions: get the versions of the currently read file
unsigned int NIFStream::getVersion() { return file->getVersion(); }
unsigned int NIFStream::getUserVersion() { return file->getBethVersion(); }
unsigned int NIFStream::getBethVersion() { return file->getBethVersion(); }
unsigned int NIFStream::getVersion() const { return file->getVersion(); }
unsigned int NIFStream::getUserVersion() const { return file->getBethVersion(); }
unsigned int NIFStream::getBethVersion() const { return file->getBethVersion(); }
}

8
components/nif/nifstream.hpp
View File

@ -159,12 +159,12 @@ public:
std::string getString();
unsigned int getVersion();
unsigned int getUserVersion();
unsigned int getBethVersion();
unsigned int getVersion() const;
unsigned int getUserVersion() const;
unsigned int getBethVersion() const;
// Convert human-readable version numbers into a number that can be compared.
uint32_t generateVersion(uint8_t major, uint8_t minor, uint8_t patch, uint8_t rev)
static constexpr uint32_t generateVersion(uint8_t major, uint8_t minor, uint8_t patch, uint8_t rev)
{
return (major << 24) + (minor << 16) + (patch << 8) + rev;
}