From c0c2a0ccc335b00983bf69b99b7a44505ed24b47 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 12 Nov 2010 14:43:49 +0000 Subject: made core::Entity::entity_shape a private attribute --- src/game/intro/convoy.cc | 4 ++-- src/game/intro/intro.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game/intro') diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc index b037b0b..f69dd13 100644 --- a/src/game/intro/convoy.cc +++ b/src/game/intro/convoy.cc @@ -42,7 +42,7 @@ Convoy::Convoy(core::Zone *zone) : core::EntityDynamic() set_label("convoy"); set_name("Convoy"); - entity_speed = 1.0f; + set_speed(1.0f); set_serverside(); } @@ -67,7 +67,7 @@ void Convoy::add(const std::string &model) member->get_color_second().assign(color_second()); member->entity_thrust = 1.0f; - member->entity_speed = speed(); + member->set_speed(speed()); member->get_location().assign(location()); d = ((float) convoy_members.size()) * 0.5f; diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc index 8d5577b..2147d02 100644 --- a/src/game/intro/intro.cc +++ b/src/game/intro/intro.cc @@ -111,7 +111,7 @@ bool Intro::load_world() convoy->get_axis().change_direction(f); } else if (ini.got_key_float("speed", f)) { - convoy->entity_speed = f; + convoy->set_speed(f); } else if (ini.got_key_string("ship", strval)) { convoy->add(strval); -- cgit v1.2.3