From 7808b7dbf7df6cbef238f820958abdc16bcc39c3 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Sun, 12 Jul 2020 22:46:27 -0500 Subject: [PATCH] Some fixes --- include/simpleengine/components/hitbox_component.h | 2 +- include/simpleengine/components/ssma_component.h | 4 ++-- src/components/hitbox_component.cpp | 2 +- src/components/ssma_component.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/simpleengine/components/hitbox_component.h b/include/simpleengine/components/hitbox_component.h index f52694d..c003fc0 100644 --- a/include/simpleengine/components/hitbox_component.h +++ b/include/simpleengine/components/hitbox_component.h @@ -23,7 +23,7 @@ namespace simpleengine { HitboxComponent(Entity& owning_entity, sf::Sprite& sprite, float sprite_offset_x, float sprite_offset_y, float width, float height); - sf::RectangleShape& GetHitbox() const; + sf::RectangleShape& GetHitbox(); bool DoesIntersect(const sf::FloatRect& rect); diff --git a/include/simpleengine/components/ssma_component.h b/include/simpleengine/components/ssma_component.h index 1913944..30d0b6d 100644 --- a/include/simpleengine/components/ssma_component.h +++ b/include/simpleengine/components/ssma_component.h @@ -36,8 +36,8 @@ namespace simpleengine { void Update(const float& delta_time) override; - simpleengine::AnimationComponent GetAnimationComponent(); - simpleengine::MovementComponent GetMovementComponent(); + simpleengine::AnimationComponent& GetAnimationComponent(); + simpleengine::MovementComponent& GetMovementComponent(); private: std::string MovementAnimationTypeToStr(const MovementAnimationType& type); diff --git a/src/components/hitbox_component.cpp b/src/components/hitbox_component.cpp index e55e89c..7112a28 100644 --- a/src/components/hitbox_component.cpp +++ b/src/components/hitbox_component.cpp @@ -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; } diff --git a/src/components/ssma_component.cpp b/src/components/ssma_component.cpp index bfe6287..d2d6913 100644 --- a/src/components/ssma_component.cpp +++ b/src/components/ssma_component.cpp @@ -111,10 +111,10 @@ std::string simpleengine::SideScrollerMovementAnimationComponent::MovementAnimat } } -simpleengine::AnimationComponent simpleengine::SideScrollerMovementAnimationComponent::GetAnimationComponent() { +simpleengine::AnimationComponent& simpleengine::SideScrollerMovementAnimationComponent::GetAnimationComponent() { return anim_component; } -simpleengine::MovementComponent simpleengine::SideScrollerMovementAnimationComponent::GetMovementComponent() { +simpleengine::MovementComponent& simpleengine::SideScrollerMovementAnimationComponent::GetMovementComponent() { return move_component; }