Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/intro/convoy.h')
-rw-r--r--src/game/intro/convoy.h24
1 files changed, 6 insertions, 18 deletions
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;
};
}