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

Compare commits

base: zv0n:4109cfe1af380cfc57c468243f8eb3cb1962b7e8
Branches Tags
zv0n:master
zv0n:dev
...
compare: zv0n:f137f6609f27b7b3d0137764fbdee0bf8de9506c
Branches Tags
zv0n:dev
zv0n:master

2 Commits
4109cfe1af ... f137f6609f

Author SHA1 Message Date
zv0n
f137f6609f Formatting
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-09-28 13:57:13 +02:00
zv0n
59e09f77fd Fix CI/CD build 2022-09-28 13:56:29 +02:00
3 changed files with 5 additions and 8 deletions
Show Stats Expand all files Collapse all files

1
mario/mario.hpp
View File

@ -4,7 +4,6 @@
#include "../sdlpp/sdlpp_rectrenderer.hpp" #include "../sdlpp/sdlpp_rectrenderer.hpp"
#include "sprites.hpp" #include "sprites.hpp"
#include "blocks.hpp" #include "blocks.hpp"
#include <_types/_uint8_t.h>
#define BIG_FLAG 0x0001 #define BIG_FLAG 0x0001
#define FIRE_FLAG 0x0002 #define FIRE_FLAG 0x0002

9
mario/visitors/mario_visitor.hpp
View File

@ -8,13 +8,12 @@
class MarioVisitor : public SDLPP::Visitor { class MarioVisitor : public SDLPP::Visitor {
public: public:
MarioVisitor(bool is_jumping, SDLPP::Scene &scene, MarioVisitor(bool is_jumping, SDLPP::Scene &scene, int &coin_count,
int &coin_count,
std::vector<std::shared_ptr<MarioBlock>> &moving_objects, std::vector<std::shared_ptr<MarioBlock>> &moving_objects,
bool is_big, bool has_star) bool is_big, bool has_star)
: jumping(is_jumping), _scene(scene), : jumping(is_jumping), _scene(scene), _coin_count(coin_count),
_coin_count(coin_count), _moving_objects(moving_objects), _moving_objects(moving_objects), _is_big(is_big),
_is_big(is_big), _has_star(has_star) {} _has_star(has_star) {}
void visit(const SDLPP::RenderObject &obj) override; void visit(const SDLPP::RenderObject &obj) override;
bool isOnGround() const { bool isOnGround() const {
return onGround; return onGround;

3
mario/visitors/visitor_generator.hpp
View File

@ -4,8 +4,7 @@
#include "../blocks.hpp" #include "../blocks.hpp"
std::shared_ptr<SDLPP::Visitor> std::shared_ptr<SDLPP::Visitor>
getVisitor(const MarioBlock &block, SDLPP::Scene &scene, getVisitor(const MarioBlock &block, SDLPP::Scene &scene, int &coin_count,
int &coin_count,
std::vector<std::shared_ptr<MarioBlock>> &moving_objects); std::vector<std::shared_ptr<MarioBlock>> &moving_objects);
#endif #endif