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

Formatting
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
zv0n 2022-11-19 23:10:33 +01:00
parent 411f00e468
commit c453c2fe9a
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mario/blocks/fireball.hpp
View File

@ -9,6 +9,7 @@ public:
void custom_move(int ticks) override; void custom_move(int ticks) override;
void handleVisitor(SDLPP::Visitor &visitor) override; void handleVisitor(SDLPP::Visitor &visitor) override;
void setMovementDir(bool left); void setMovementDir(bool left);
private: private:
double jump_movement; double jump_movement;
bool jumping = false; bool jumping = false;

3
mario/mapobject.hpp
View File

@ -11,7 +11,8 @@ public:
uint8_t modifier_data, const std::string &modifier_text); uint8_t modifier_data, const std::string &modifier_text);
MapObject(uint16_t terrain_id, LandType::Value terrain_type, MapObject(uint16_t terrain_id, LandType::Value terrain_type,
uint8_t character_id, LandType::Value character_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, LandType::Value land_type);
void setTerrain(uint16_t id, uint8_t land_type); void setTerrain(uint16_t id, uint8_t land_type);
void setCharacter(uint8_t id, LandType::Value land_type); void setCharacter(uint8_t id, LandType::Value land_type);

13
mario/mario.hpp
View File

@ -12,8 +12,10 @@
class Mario : public MarioBlock { class Mario : public MarioBlock {
public: public:
Mario(int x, int y, const std::shared_ptr<SDLPP::Renderer> &renderer, std::function<void(std::shared_ptr<MarioBlock>&, bool)> addObject); Mario(int x, int y, const std::shared_ptr<SDLPP::Renderer> &renderer,
Mario(const std::shared_ptr<SDLPP::Renderer> &renderer, std::function<void(std::shared_ptr<MarioBlock>&, bool)> addObject); std::function<void(std::shared_ptr<MarioBlock> &, bool)> addObject);
Mario(const std::shared_ptr<SDLPP::Renderer> &renderer,
std::function<void(std::shared_ptr<MarioBlock> &, bool)> addObject);
void walkLeft(); void walkLeft();
void walkRight(); void walkRight();
void setStanding(); void setStanding();
@ -23,8 +25,9 @@ public:
void uncrouch(); void uncrouch();
#ifndef EDITOR #ifndef EDITOR
void fire(); void fire();
void setAddObjFunc(std::function<void(std::shared_ptr<MarioBlock>&, bool)> func); void setAddObjFunc(
std::function<void(std::shared_ptr<MarioBlock>&, bool)> getAddObjFunc(); std::function<void(std::shared_ptr<MarioBlock> &, bool)> func);
std::function<void(std::shared_ptr<MarioBlock> &, bool)> getAddObjFunc();
#endif #endif
void stopJump(); void stopJump();
void custom_move(int ticks) override; void custom_move(int ticks) override;
@ -65,7 +68,7 @@ public:
} }
private: private:
std::function<void(std::shared_ptr<MarioBlock>&, bool)> _addObject; std::function<void(std::shared_ptr<MarioBlock> &, bool)> _addObject;
void setDeath(bool dead = true) { void setDeath(bool dead = true) {
_death = dead; _death = dead;
} }

5
mario/scenes/editor_scenes.hpp
View File

@ -19,8 +19,7 @@ createEditorMainMenuScene(std::shared_ptr<SDLPP::Renderer> &renderer,
SceneStruct SceneStruct
createEditorFileChoiceScene(std::shared_ptr<SDLPP::Renderer> &renderer); createEditorFileChoiceScene(std::shared_ptr<SDLPP::Renderer> &renderer);
SceneStruct SceneStruct createTextScene(std::shared_ptr<SDLPP::Renderer> renderer,
createTextScene(std::shared_ptr<SDLPP::Renderer> renderer, std::function<void(const std::string &)> finalizer);
std::function<void(const std::string &)> finalizer);
#endif #endif