SeanOMik
/
SimpleEngine
mirror of https://github.com/SeanOMik/SimpleEngine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes

This commit is contained in:
SeanOMik 2020-07-12 22:46:27 -05:00
parent 5427f85c0a
commit 7808b7dbf7
No known key found for this signature in database
GPG Key ID: FA4D55AC05268A88
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/simpleengine/components/hitbox_component.h
View File

@ -23,7 +23,7 @@ namespace simpleengine {
HitboxComponent(Entity& owning_entity, sf::Sprite& sprite, float sprite_offset_x, float sprite_offset_y, HitboxComponent(Entity& owning_entity, sf::Sprite& sprite, float sprite_offset_x, float sprite_offset_y,
float width, float height); float width, float height);
sf::RectangleShape& GetHitbox() const; sf::RectangleShape& GetHitbox();
bool DoesIntersect(const sf::FloatRect& rect); bool DoesIntersect(const sf::FloatRect& rect);

4
include/simpleengine/components/ssma_component.h
View File

@ -36,8 +36,8 @@ namespace simpleengine {
void Update(const float& delta_time) override; void Update(const float& delta_time) override;
simpleengine::AnimationComponent GetAnimationComponent(); simpleengine::AnimationComponent& GetAnimationComponent();
simpleengine::MovementComponent GetMovementComponent(); simpleengine::MovementComponent& GetMovementComponent();
private: private:
std::string MovementAnimationTypeToStr(const MovementAnimationType& type); std::string MovementAnimationTypeToStr(const MovementAnimationType& type);

2
src/components/hitbox_component.cpp
View File

@ -24,7 +24,7 @@ simpleengine::HitboxComponent::HitboxComponent(Entity& owning_entity, sf::Sprite
} }
} }
sf::RectangleShape &simpleengine::HitboxComponent::GetHitbox() const { sf::RectangleShape &simpleengine::HitboxComponent::GetHitbox() {
return hitbox; return hitbox;
} }

4
src/components/ssma_component.cpp
View File

@ -111,10 +111,10 @@ std::string simpleengine::SideScrollerMovementAnimationComponent::MovementAnimat
} }
} }
simpleengine::AnimationComponent simpleengine::SideScrollerMovementAnimationComponent::GetAnimationComponent() { simpleengine::AnimationComponent& simpleengine::SideScrollerMovementAnimationComponent::GetAnimationComponent() {
return anim_component; return anim_component;
} }
simpleengine::MovementComponent simpleengine::SideScrollerMovementAnimationComponent::GetMovementComponent() { simpleengine::MovementComponent& simpleengine::SideScrollerMovementAnimationComponent::GetMovementComponent() {
return move_component; return move_component;
} }