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')
-rw-r--r--src/game/intro/convoy.cc14
-rw-r--r--src/game/intro/intro.cc4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc
index 6671369..9e13ae5 100644
--- a/src/game/intro/convoy.cc
+++ b/src/game/intro/convoy.cc
@@ -59,20 +59,20 @@ void Convoy::add(const std::string &model)
Member *member = new Member(model);
convoy_members.push_back(member);
member->set_zone(zone());
- member->entity_color.assign(color());
- member->entity_color_second.assign(color_second());
+ member->get_color().assign(color());
+ member->get_color_second().assign(color_second());
member->entity_thrust = 1.0f;
member->entity_speed = speed();
- member->entity_location.assign(location());
+ member->get_location().assign(location());
d = ((float) convoy_members.size()) * 0.5f;
- member->entity_location.x += math::randomf((float) convoy_members.size()) -d;
- member->entity_location.y += math::randomf((float) convoy_members.size()) -d;
- member->entity_location.z += (math::randomf((float) convoy_members.size()) -d) * 0.5f;
+ member->get_location().x += math::randomf((float) convoy_members.size()) -d;
+ member->get_location().y += math::randomf((float) convoy_members.size()) -d;
+ member->get_location().z += (math::randomf((float) convoy_members.size()) -d) * 0.5f;
- member->entity_axis.assign(axis());
+ member->get_axis().assign(axis());
}
void Convoy::frame(float seconds)
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index 3fafa0f..05dcec7 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -104,10 +104,10 @@ bool Intro::load_world()
convoy->set_color_second(color);
} else if (ini.got_key_vector3f("location", v)) {
- convoy->entity_location.assign(v);
+ convoy->get_location().assign(v);
} else if (ini.got_key_float("direction", f)) {
- convoy->axis().change_direction(f);
+ convoy->get_axis().change_direction(f);
} else if (ini.got_key_float("speed", f)) {
convoy->entity_speed = f;