From 83d6c17799c4d448a67ab5cdad02954282fa5c94 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 1 Nov 2008 13:33:18 +0000 Subject: server-side model loading, initial @dock function --- src/game/intro/convoy.cc | 2 +- src/game/intro/intro.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/intro') diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc index 226f8fa..c0fba52 100644 --- a/src/game/intro/convoy.cc +++ b/src/game/intro/convoy.cc @@ -16,7 +16,7 @@ Member::Member(std::string const &model) : core::EntityControlable(0, 1) set_name("Convoy member"); set_label(model); - entity_modelname = "ships/" + model; + set_modelname("ships/" + model); entity_thrust = 1.0f; /* diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc index 55f038f..efb3b40 100644 --- a/src/game/intro/intro.cc +++ b/src/game/intro/intro.cc @@ -117,7 +117,7 @@ bool Intro::load_world() } else if (ini.got_key_float("rotationspeed", globe->entity_rotationspeed)) { continue; } else if (ini.got_key_bool("bright", b)) { - if (b) { globe->entity_flags |= core::Entity::Bright; } + if (b) { globe->set_flag(core::Entity::Bright); } } else if (ini.got_key()) { ini.unkown_key(); } -- cgit v1.2.3