Mario: added destructible modifier to editor

This commit is contained in:
2021-05-26 00:46:19 +02:00
parent 6fe283bb34
commit c2fb78b0a6
12 changed files with 100 additions and 33 deletions
+5 -2
View File
@@ -119,7 +119,6 @@ const std::vector< uint64_t > possibleBlocks = {
MUSHROOM_PLATFORM_TOP_LEFT_ID,
MUSHROOM_PLATFORM_TOP_MIDDLE_ID,
MUSHROOM_PLATFORM_TOP_RIGHT_ID,
TREE_PLATFORM_BARK_ID,
MUSHROOM_PLATFORM_BARK_TOP_ID,
TREE_LEAVES_TOP_ID,
@@ -131,6 +130,7 @@ const std::vector< uint64_t > possibleBlocks = {
CANNON_PEDESTAL_ID,
CANNON_ID,
MARIO_ID,
DESTRUCTIBLE_ID,
};
const std::unordered_map< uint64_t, const SDL_Rect * > block_mapping = {
@@ -192,7 +192,8 @@ const std::unordered_map< uint64_t, const SDL_Rect * > block_mapping = {
{ CANNON_TOWER_ID, &CANNON_TOWER_SRC },
{ CANNON_PEDESTAL_ID, &CANNON_PEDESTAL_SRC },
{ CANNON_ID, &CANNON_SRC },
{ MARIO_ID, &MARIO_STANDING_SRC }
{ MARIO_ID, &MARIO_STANDING_SRC },
{ DESTRUCTIBLE_ID, &DESTRUCTIBLE_SRC },
};
std::shared_ptr< SDLPP::RectangleRender >
@@ -281,6 +282,8 @@ enum BlockRole::Value getBlockRole( uint64_t id ) {
return BlockRole::TERRAIN;
if ( id == MARIO_ID )
return BlockRole::MARIO;
if ( id < MARIO_ID )
return BlockRole::MODIFIER;
// TODO modifier/character
return BlockRole::MODIFIER;
}