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

Mario: disable bouncing on some blocks
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
zv0n 2022-09-24 20:45:21 +02:00
parent f9a32bdb72
commit aa5043a811
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mario/blocks/simpleblocks.cpp
View File

@ -189,6 +189,7 @@ VineTopBlock::VineTopBlock(int x, int y,
: MarioBlock(x, y, renderer, g_terrain_texture, VINE_TOP_SRC, false) { : MarioBlock(x, y, renderer, g_terrain_texture, VINE_TOP_SRC, false) {
ensureCollision(); ensureCollision();
setId(VINE_TOP_ID); setId(VINE_TOP_ID);
setBouncable(false);
} }
VineBottomBlock::VineBottomBlock(int x, int y, VineBottomBlock::VineBottomBlock(int x, int y,
@ -197,6 +198,7 @@ VineBottomBlock::VineBottomBlock(int x, int y,
false) { false) {
ensureCollision(); ensureCollision();
setId(VINE_BOTTOM_ID); setId(VINE_BOTTOM_ID);
setBouncable(false);
} }
PoleTopBlock::PoleTopBlock(int x, int y, PoleTopBlock::PoleTopBlock(int x, int y,
@ -295,6 +297,7 @@ TreePlatformTopLeftBlock::TreePlatformTopLeftBlock(
TREE_PLATFORM_TOP_LEFT_SRC, false) { TREE_PLATFORM_TOP_LEFT_SRC, false) {
ensureCollision(); ensureCollision();
setId(TREE_PLATFORM_TOP_LEFT_ID); setId(TREE_PLATFORM_TOP_LEFT_ID);
setBouncable(false);
} }
TreePlatformTopMiddleBlock::TreePlatformTopMiddleBlock( TreePlatformTopMiddleBlock::TreePlatformTopMiddleBlock(
@ -303,6 +306,7 @@ TreePlatformTopMiddleBlock::TreePlatformTopMiddleBlock(
TREE_PLATFORM_TOP_MIDDLE_SRC, false) { TREE_PLATFORM_TOP_MIDDLE_SRC, false) {
ensureCollision(); ensureCollision();
setId(TREE_PLATFORM_TOP_MIDDLE_ID); setId(TREE_PLATFORM_TOP_MIDDLE_ID);
setBouncable(false);
} }
TreePlatformTopRightBlock::TreePlatformTopRightBlock( TreePlatformTopRightBlock::TreePlatformTopRightBlock(
@ -311,6 +315,7 @@ TreePlatformTopRightBlock::TreePlatformTopRightBlock(
TREE_PLATFORM_TOP_RIGHT_SRC, false) { TREE_PLATFORM_TOP_RIGHT_SRC, false) {
ensureCollision(); ensureCollision();
setId(TREE_PLATFORM_TOP_RIGHT_ID); setId(TREE_PLATFORM_TOP_RIGHT_ID);
setBouncable(false);
} }
TreePlatformBarkBlock::TreePlatformBarkBlock( TreePlatformBarkBlock::TreePlatformBarkBlock(
@ -319,6 +324,7 @@ TreePlatformBarkBlock::TreePlatformBarkBlock(
false) { false) {
ensureCollision(); ensureCollision();
setId(TREE_PLATFORM_BARK_ID); setId(TREE_PLATFORM_BARK_ID);
setBouncable(false);
} }
WaterTopBlock::WaterTopBlock(int x, int y, WaterTopBlock::WaterTopBlock(int x, int y,
@ -326,6 +332,7 @@ WaterTopBlock::WaterTopBlock(int x, int y,
: MarioBlock(x, y, renderer, g_terrain_texture, WATER_TOP_SRC, false) { : MarioBlock(x, y, renderer, g_terrain_texture, WATER_TOP_SRC, false) {
ensureCollision(); ensureCollision();
setId(WATER_TOP_ID); setId(WATER_TOP_ID);
setBouncable(false);
} }
WaterFillBlock::WaterFillBlock(int x, int y, WaterFillBlock::WaterFillBlock(int x, int y,
@ -333,6 +340,7 @@ WaterFillBlock::WaterFillBlock(int x, int y,
: MarioBlock(x, y, renderer, g_terrain_texture, WATER_FILL_SRC, false) { : MarioBlock(x, y, renderer, g_terrain_texture, WATER_FILL_SRC, false) {
ensureCollision(); ensureCollision();
setId(WATER_FILL_ID); setId(WATER_FILL_ID);
setBouncable(false);
} }
MushroomPlatformTopLeftBlock::MushroomPlatformTopLeftBlock( MushroomPlatformTopLeftBlock::MushroomPlatformTopLeftBlock(
@ -341,6 +349,7 @@ MushroomPlatformTopLeftBlock::MushroomPlatformTopLeftBlock(
MUSHROOM_PLATFORM_TOP_LEFT_SRC, false) { MUSHROOM_PLATFORM_TOP_LEFT_SRC, false) {
ensureCollision(); ensureCollision();
setId(MUSHROOM_PLATFORM_TOP_LEFT_ID); setId(MUSHROOM_PLATFORM_TOP_LEFT_ID);
setBouncable(false);
} }
MushroomPlatformTopMiddleBlock::MushroomPlatformTopMiddleBlock( MushroomPlatformTopMiddleBlock::MushroomPlatformTopMiddleBlock(
@ -349,6 +358,7 @@ MushroomPlatformTopMiddleBlock::MushroomPlatformTopMiddleBlock(
MUSHROOM_PLATFORM_TOP_MIDDLE_SRC, false) { MUSHROOM_PLATFORM_TOP_MIDDLE_SRC, false) {
ensureCollision(); ensureCollision();
setId(MUSHROOM_PLATFORM_TOP_MIDDLE_ID); setId(MUSHROOM_PLATFORM_TOP_MIDDLE_ID);
setBouncable(false);
} }
MushroomPlatformTopRightBlock::MushroomPlatformTopRightBlock( MushroomPlatformTopRightBlock::MushroomPlatformTopRightBlock(
@ -357,6 +367,7 @@ MushroomPlatformTopRightBlock::MushroomPlatformTopRightBlock(
MUSHROOM_PLATFORM_TOP_RIGHT_SRC, false) { MUSHROOM_PLATFORM_TOP_RIGHT_SRC, false) {
ensureCollision(); ensureCollision();
setId(MUSHROOM_PLATFORM_TOP_RIGHT_ID); setId(MUSHROOM_PLATFORM_TOP_RIGHT_ID);
setBouncable(false);
} }
MushroomPlatformBarkTopBlock::MushroomPlatformBarkTopBlock( MushroomPlatformBarkTopBlock::MushroomPlatformBarkTopBlock(
@ -365,6 +376,7 @@ MushroomPlatformBarkTopBlock::MushroomPlatformBarkTopBlock(
MUSHROOM_PLATFORM_BARK_TOP_SRC, false) { MUSHROOM_PLATFORM_BARK_TOP_SRC, false) {
ensureCollision(); ensureCollision();
setId(MUSHROOM_PLATFORM_BARK_TOP_ID); setId(MUSHROOM_PLATFORM_BARK_TOP_ID);
setBouncable(false);
} }
MushroomPlatformBarkBottomBlock::MushroomPlatformBarkBottomBlock( MushroomPlatformBarkBottomBlock::MushroomPlatformBarkBottomBlock(
@ -373,6 +385,7 @@ MushroomPlatformBarkBottomBlock::MushroomPlatformBarkBottomBlock(
MUSHROOM_PLATFORM_BARK_BOTTOM_SRC, false) { MUSHROOM_PLATFORM_BARK_BOTTOM_SRC, false) {
ensureCollision(); ensureCollision();
setId(MUSHROOM_PLATFORM_BARK_BOTTOM_ID); setId(MUSHROOM_PLATFORM_BARK_BOTTOM_ID);
setBouncable(false);
} }
TreeBarkBlock::TreeBarkBlock(int x, int y, TreeBarkBlock::TreeBarkBlock(int x, int y,
@ -380,6 +393,7 @@ TreeBarkBlock::TreeBarkBlock(int x, int y,
: MarioBlock(x, y, renderer, g_terrain_texture, TREE_BARK_SRC, false) { : MarioBlock(x, y, renderer, g_terrain_texture, TREE_BARK_SRC, false) {
ensureCollision(); ensureCollision();
setId(TREE_BARK_ID); setId(TREE_BARK_ID);
setBouncable(false);
} }
TreeLeavesSmallBlock::TreeLeavesSmallBlock( TreeLeavesSmallBlock::TreeLeavesSmallBlock(
@ -388,6 +402,7 @@ TreeLeavesSmallBlock::TreeLeavesSmallBlock(
false) { false) {
ensureCollision(); ensureCollision();
setId(TREE_LEAVES_SMALL_ID); setId(TREE_LEAVES_SMALL_ID);
setBouncable(false);
} }
TreeLeavesTopBlock::TreeLeavesTopBlock( TreeLeavesTopBlock::TreeLeavesTopBlock(
@ -396,6 +411,7 @@ TreeLeavesTopBlock::TreeLeavesTopBlock(
false) { false) {
ensureCollision(); ensureCollision();
setId(TREE_LEAVES_TOP_ID); setId(TREE_LEAVES_TOP_ID);
setBouncable(false);
} }
TreeLeavesBottomBlock::TreeLeavesBottomBlock( TreeLeavesBottomBlock::TreeLeavesBottomBlock(
@ -404,6 +420,7 @@ TreeLeavesBottomBlock::TreeLeavesBottomBlock(
false) { false) {
ensureCollision(); ensureCollision();
setId(TREE_LEAVES_BOTTOM_ID); setId(TREE_LEAVES_BOTTOM_ID);
setBouncable(false);
} }
CannonTowerBlock::CannonTowerBlock(int x, int y, CannonTowerBlock::CannonTowerBlock(int x, int y,