From 164e3c5b1cd9e6d6f7ca26964df4c54394eb1c84 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 21 Dec 2008 18:03:58 +0000
Subject: multiple introductions

---
 src/game/intro/convoy.h | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/game/intro/convoy.h')

diff --git a/src/game/intro/convoy.h b/src/game/intro/convoy.h
index 20eb0e1..14016f4 100644
--- a/src/game/intro/convoy.h
+++ b/src/game/intro/convoy.h
@@ -14,6 +14,8 @@
 
 namespace intro {
 
+/* ---- class Member ----------------------------------------------- */
+
 class Member : public core::EntityControlable
 {
 public:
@@ -23,7 +25,9 @@ public:
 	void frame(float seconds);
 };
 
-class Convoy 
+/* ---- class Convoy ----------------------------------------------- */
+
+class Convoy : public core::EntityDynamic
 {
 public:
 	Convoy(core::Zone *zone);
@@ -32,27 +36,11 @@ public:
 	void add(const char *model);
 	void add(const std::string &model);
 
-	void frame(float seconds);
-
-	void set_color(const math::Color &color);
-	void set_color_second(const math::Color &color);
-
-	void set_location(math::Vector3f const &location);
-
-	void set_speed(const float speed);
-
-	void change_direction(float angle);
+	virtual void frame(float seconds);
 
 private:
 	typedef std::list<Member *> Members;
 	Members		convoy_members;
-	core::Zone	*convoy_zone;
-	math::Color	convoy_color;
-	math::Color	convoy_color_second;
-
-	math::Vector3f	convoy_location;
-	math::Axis	convoy_axis;
-	float		convoy_speed;
 };
 
 }
-- 
cgit v1.2.3