zv0n/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mario: add option to make a block collision-less

Browse Source
This commit is contained in:
zv0n
2021-06-21 19:40:29 +02:00
parent a54d079fd2
commit b423ac7b8c
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mario/blocks.cpp
+5 -2
View File
@@ -155,6 +155,7 @@ const std::vector< uint64_t > possibleBlocks = {
const std::vector< uint64_t > possibleMods = {
DESTRUCTIBLE_MODIFIER_ID,
BACKGROUND_MODIFIER_ID,
};
const std::vector< uint64_t > possibleCharacters = {
@@ -229,6 +230,7 @@ const std::unordered_map< uint64_t, const SDL_Rect * > block_mapping = {
{ CANNON_ID, &CANNON_SRC },
{ MARIO_ID, &MARIO_STANDING_SRC },
{ DESTRUCTIBLE_MODIFIER_ID, &DESTRUCTIBLE_SRC },
{ BACKGROUND_MODIFIER_ID, &BACKGROUND_SRC },
};
const std::unordered_map< uint64_t, uint64_t > block_flags = {
@@ -264,8 +266,8 @@ const std::unordered_map< uint64_t, uint64_t > block_flags = {
{ POLE_BOTTOM_ID, HAS_COLLISION },
{ FLAG_ID, 0 },
{ STEP_ID, CAN_BE_DESTROYED_FLAG | HAS_COLLISION },
{ BRICK_ID, 0 },
{ BRICK_TOP_ID, 0 },
{ BRICK_ID, CAN_BE_DESTROYED_FLAG | HAS_COLLISION },
{ BRICK_TOP_ID, CAN_BE_DESTROYED_FLAG | HAS_COLLISION },
{ SIDEWAY_PIPE_END_TOP_ID, HAS_COLLISION },
{ SIDEWAY_PIPE_END_BOTTOM_ID, HAS_COLLISION },
{ SIDEWAY_PIPE_MIDDLE_TOP_ID, HAS_COLLISION },
@@ -292,6 +294,7 @@ const std::unordered_map< uint64_t, uint64_t > block_flags = {
{ CANNON_ID, HAS_COLLISION },
{ MARIO_ID, 0 },
{ DESTRUCTIBLE_MODIFIER_ID, 0 },
{ BACKGROUND_MODIFIER_ID, 0 },
};
bool blockCanBeDestroyed(uint64_t id) {