evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deduplicate const CollisionBlock sets

Browse Source 
when i dumped the symbols, these two and their initializers had over 150 duplicates
This commit is contained in:
Kae 2024-04-13 16:15:17 +10:00
parent dab179e355
commit 772b0585c2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/game/StarCollisionBlock.cpp
View File

@ -2,6 +2,9 @@
namespace Star { namespace Star {
CollisionSet const DefaultCollisionSet({CollisionKind::Null, CollisionKind::Slippery, CollisionKind::Dynamic, CollisionKind::Block});
CollisionSet const BlockCollisionSet({CollisionKind::Block, CollisionKind::Slippery});
EnumMap<TileCollisionOverride> const TileCollisionOverrideNames = { EnumMap<TileCollisionOverride> const TileCollisionOverrideNames = {
{TileCollisionOverride::None, "None"}, {TileCollisionOverride::None, "None"},
{TileCollisionOverride::Empty, "Empty"}, {TileCollisionOverride::Empty, "Empty"},

4
source/game/StarCollisionBlock.hpp
View File

@ -53,10 +53,10 @@ private:
}; };
// The default CollisionSet consists of Null, Slippery, Dynamic and Block // 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 // 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; extern EnumMap<TileCollisionOverride> const TileCollisionOverrideNames;