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

Compare commits

base: zv0n:aa5043a81156bd6b31262f0ddea021efc72a3d7f
Branches Tags
zv0n:master
zv0n:dev
..
compare: zv0n:45ab92c31f61fb1f355f63dcd61f3f83d4b4e40d
Branches Tags
zv0n:dev
zv0n:master

No commits in common. "aa5043a81156bd6b31262f0ddea021efc72a3d7f" and "45ab92c31f61fb1f355f63dcd61f3f83d4b4e40d" have entirely different histories.
aa5043a811 ... 45ab92c31f

2 changed files with 0 additions and 25 deletions
Show Stats Expand all files Collapse all files

17
mario/blocks/simpleblocks.cpp
View File

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

8
mario/main.cpp
View File

@ -1,5 +1,4 @@
#include "../sdlpp/sdlpp.hpp"
#include "SDL2/SDL_keycode.h"
#include "sprites.hpp"
#include <memory>
#ifdef _WIN32
@ -45,20 +44,16 @@ std::mutex gamescene_mutex;
void handleKeyDown(SDL_Keycode key, SDLPP::Scene &scene) {
switch (key) {
case SDLK_a:
case SDLK_LEFT:
mario->walkLeft();
break;
case SDLK_d:
case SDLK_RIGHT:
mario->walkRight();
break;
case SDLK_SPACE:
case SDLK_w:
case SDLK_UP:
mario->jump();
break;
case SDLK_s:
case SDLK_DOWN:
break;
case SDLK_r:
scene.getRenderer().setRenderColiders(
@ -81,16 +76,13 @@ void handleKeyUp(SDL_Keycode key) {
createGameMainMenuScene(renderer, false, true, true));
} break;
case SDLK_a:
case SDLK_LEFT:
mario->walkRight();
break;
case SDLK_d:
case SDLK_RIGHT:
mario->walkLeft();
break;
case SDLK_SPACE:
case SDLK_w:
case SDLK_UP:
mario->stopJump();
default:
break;