From 4b2708d0a743f74dfc44ea4e4c08344e09c624a6 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 23 Jun 2019 22:35:44 +0300 Subject: [PATCH] Fix initialization issues in the Animate action --- source/animate.cpp | 5 ++++- source/animate.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/animate.cpp b/source/animate.cpp index c7eed38..a7e406d 100644 --- a/source/animate.cpp +++ b/source/animate.cpp @@ -8,14 +8,17 @@ namespace DemoScene { Animate::Animate(): target(0), + target_obj(0), anim(0), stacked(false), player(0) { } -Animate::Animate(GL::Placeable &t, const GL::Animation &a, GL::AnimationPlayer &p): +Animate::Animate(GL::Placeable &t, const GL::Animation &a, GL::AnimationPlayer &p, bool s): target(&t), + target_obj(0), anim(&a), + stacked(s), player(&p) { } diff --git a/source/animate.h b/source/animate.h index 50e279c..7c8165c 100644 --- a/source/animate.h +++ b/source/animate.h @@ -31,7 +31,7 @@ private: public: Animate(); - Animate(Msp::GL::Placeable &, const Msp::GL::Animation &, Msp::GL::AnimationPlayer &); + Animate(Msp::GL::Placeable &, const Msp::GL::Animation &, Msp::GL::AnimationPlayer &, bool = false); virtual void validate() const; -- 2.43.0