diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/objdef.h | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/objdef.h')
| -rw-r--r-- | src/objdef.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/objdef.h b/src/objdef.h index 7b3ae186f..e40324a88 100644 --- a/src/objdef.h +++ b/src/objdef.h @@ -33,8 +33,7 @@ class NodeDefManager; typedef u32 ObjDefHandle; -enum ObjDefType -{ +enum ObjDefType { OBJDEF_GENERIC, OBJDEF_BIOME, OBJDEF_ORE, @@ -42,8 +41,7 @@ enum ObjDefType OBJDEF_SCHEMATIC, }; -class ObjDef -{ +class ObjDef { public: virtual ~ObjDef() = default; @@ -69,8 +67,7 @@ protected: // added/set to. Note that ObjDefs managed by ObjDefManager are NOT refcounted, // so the same ObjDef instance must not be referenced multiple // TODO: const correctness for getter methods -class ObjDefManager -{ +class ObjDefManager { public: ObjDefManager(IGameDef *gamedef, ObjDefType type); virtual ~ObjDefManager(); @@ -102,11 +99,11 @@ public: u32 validateHandle(ObjDefHandle handle) const; static ObjDefHandle createHandle(u32 index, ObjDefType type, u32 uid); - static bool decodeHandle( - ObjDefHandle handle, u32 *index, ObjDefType *type, u32 *uid); + static bool decodeHandle(ObjDefHandle handle, u32 *index, + ObjDefType *type, u32 *uid); protected: - ObjDefManager(){}; + ObjDefManager() {}; // Helper for child classes to implement clone() void cloneTo(ObjDefManager *mgr) const; |