AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-10-04 18:39:35 +00:00
Code Issues Projects Releases Wiki Activity

FourCC type addition

Browse Source
This commit is contained in:
Jack Andersen 2015-08-09 16:04:56 -10:00
parent 44a804e2c4
commit bd5825954f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit 9f0cb1327bad28ca727f1181baeba99cc1f3b7d9 Subproject commit f49a6a6e82b3bbca4006eddfdae7ccadae9ed4d4

2
hecl/extern/RetroCommon vendored

@ -1 +1 @@
Subproject commit 2d18e95a91e17d1352d2779c71d01da4155a164e Subproject commit 99bb5df7f3457de0953723188ffa5cecbc40a1fd

5
hecl/include/HECL/HECL.hpp
View File

@ -317,12 +317,17 @@ public:
{num = other.num;} {num = other.num;}
FourCC(const char* name) FourCC(const char* name)
: num(*(uint32_t*)name) {} : num(*(uint32_t*)name) {}
FourCC(uint32_t n)
: num(n) {}
inline bool operator==(const FourCC& other) const {return num == other.num;} inline bool operator==(const FourCC& other) const {return num == other.num;}
inline bool operator!=(const FourCC& other) const {return num != other.num;} inline bool operator!=(const FourCC& other) const {return num != other.num;}
inline bool operator==(const char* other) const {return num == *(uint32_t*)other;} inline bool operator==(const char* other) const {return num == *(uint32_t*)other;}
inline bool operator!=(const char* other) const {return num != *(uint32_t*)other;} inline bool operator!=(const char* other) const {return num != *(uint32_t*)other;}
inline bool operator==(uint32_t other) const {return num == other;}
inline bool operator!=(uint32_t other) const {return num != other;}
inline std::string toString() const {return std::string(fcc, 4);} inline std::string toString() const {return std::string(fcc, 4);}
inline uint32_t toUint32() const {return num;} inline uint32_t toUint32() const {return num;}
inline operator uint32_t() const {return num;}
}; };
/** /**