diff --git a/mario/blocks/fireball.hpp b/mario/blocks/fireball.hpp index 27b3d4b..e1e9302 100644 --- a/mario/blocks/fireball.hpp +++ b/mario/blocks/fireball.hpp @@ -9,6 +9,7 @@ public: void custom_move(int ticks) override; void handleVisitor(SDLPP::Visitor &visitor) override; void setMovementDir(bool left); + private: double jump_movement; bool jumping = false; diff --git a/mario/mapobject.hpp b/mario/mapobject.hpp index cf077e3..3f9d5a3 100644 --- a/mario/mapobject.hpp +++ b/mario/mapobject.hpp @@ -11,7 +11,8 @@ public: uint8_t modifier_data, const std::string &modifier_text); MapObject(uint16_t terrain_id, LandType::Value terrain_type, uint8_t character_id, LandType::Value character_type, - uint32_t modifier_id, uint8_t modifier_data, const std::string &modifier_text); + uint32_t modifier_id, uint8_t modifier_data, + const std::string &modifier_text); void setTerrain(uint16_t id, LandType::Value land_type); void setTerrain(uint16_t id, uint8_t land_type); void setCharacter(uint8_t id, LandType::Value land_type); diff --git a/mario/mario.hpp b/mario/mario.hpp index d04a92a..5c0a9b0 100644 --- a/mario/mario.hpp +++ b/mario/mario.hpp @@ -12,8 +12,10 @@ class Mario : public MarioBlock { public: - Mario(int x, int y, const std::shared_ptr &renderer, std::function&, bool)> addObject); - Mario(const std::shared_ptr &renderer, std::function&, bool)> addObject); + Mario(int x, int y, const std::shared_ptr &renderer, + std::function &, bool)> addObject); + Mario(const std::shared_ptr &renderer, + std::function &, bool)> addObject); void walkLeft(); void walkRight(); void setStanding(); @@ -23,8 +25,9 @@ public: void uncrouch(); #ifndef EDITOR void fire(); - void setAddObjFunc(std::function&, bool)> func); - std::function&, bool)> getAddObjFunc(); + void setAddObjFunc( + std::function &, bool)> func); + std::function &, bool)> getAddObjFunc(); #endif void stopJump(); void custom_move(int ticks) override; @@ -65,7 +68,7 @@ public: } private: - std::function&, bool)> _addObject; + std::function &, bool)> _addObject; void setDeath(bool dead = true) { _death = dead; } diff --git a/mario/scenes/editor_scenes.hpp b/mario/scenes/editor_scenes.hpp index bf9f67c..12b23b4 100644 --- a/mario/scenes/editor_scenes.hpp +++ b/mario/scenes/editor_scenes.hpp @@ -19,8 +19,7 @@ createEditorMainMenuScene(std::shared_ptr &renderer, SceneStruct createEditorFileChoiceScene(std::shared_ptr &renderer); -SceneStruct -createTextScene(std::shared_ptr renderer, - std::function finalizer); +SceneStruct createTextScene(std::shared_ptr renderer, + std::function finalizer); #endif \ No newline at end of file