diff options
| -rw-r--r-- | source/game/StarCollisionBlock.cpp | 3 | ||||
| -rw-r--r-- | source/game/StarCollisionBlock.hpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/game/StarCollisionBlock.cpp b/source/game/StarCollisionBlock.cpp index dfe3204..cbcba54 100644 --- a/source/game/StarCollisionBlock.cpp +++ b/source/game/StarCollisionBlock.cpp @@ -2,6 +2,9 @@ namespace Star { +CollisionSet const DefaultCollisionSet({CollisionKind::Null, CollisionKind::Slippery, CollisionKind::Dynamic, CollisionKind::Block}); +CollisionSet const BlockCollisionSet({CollisionKind::Block, CollisionKind::Slippery}); + EnumMap<TileCollisionOverride> const TileCollisionOverrideNames = { {TileCollisionOverride::None, "None"}, {TileCollisionOverride::Empty, "Empty"}, diff --git a/source/game/StarCollisionBlock.hpp b/source/game/StarCollisionBlock.hpp index b24f650..bce745d 100644 --- a/source/game/StarCollisionBlock.hpp +++ b/source/game/StarCollisionBlock.hpp @@ -53,10 +53,10 @@ private: }; // The default CollisionSet consists of Null, Slippery, Dynamic and Block -CollisionSet const DefaultCollisionSet({CollisionKind::Null, CollisionKind::Slippery, CollisionKind::Dynamic, CollisionKind::Block}); +extern CollisionSet const DefaultCollisionSet; // Defines what can be "blocks" e.g. for tile rendering: Block and Slippery -CollisionSet const BlockCollisionSet({CollisionKind::Block, CollisionKind::Slippery}); +extern CollisionSet const BlockCollisionSet; extern EnumMap<TileCollisionOverride> const TileCollisionOverrideNames; |