From fd9232b3d3a3aee28a5965a5ebc4077f8db7c652 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 20 Apr 2022 00:28:48 +0200 Subject: Streamlined enemy composition --- FallingAndOscillating.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'FallingAndOscillating.cpp') diff --git a/FallingAndOscillating.cpp b/FallingAndOscillating.cpp index d3de3c5..366b26b 100644 --- a/FallingAndOscillating.cpp +++ b/FallingAndOscillating.cpp @@ -1,5 +1,7 @@ #include "FallingAndOscillating.h" +#include + #include #include "Falling.h" @@ -7,9 +9,16 @@ #include "Oscillating.h" +FallingAndOscillating::FallingAndOscillating(std::shared_ptr position, std::shared_ptr generator) : + Falling {position, generator}, + Oscillating {position} +{ +} + + void -FallingAndOscillating::update(const float dt, Vector2& position, Generator& generator) +FallingAndOscillating::update(const float dt) { - Falling::update(dt, position, generator); - Oscillating::update(dt, position, generator); + Falling::update(dt); + Oscillating::update(dt); } -- cgit v1.1