diff options
author | Stijn Buys <ingar@osirion.org> | 2010-11-24 23:00:28 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-11-24 23:00:28 +0000 |
commit | 02b285bf20603bab6fc75d106acbaccead645eb9 (patch) | |
tree | 7be22d06339e1bb70b7ef5011312c13865976ced /src/render/renderext.cc | |
parent | f66a28a68114f3c9efe109b6948ecec163cdb153 (diff) |
Actually add entities in the intro to their zone,
removed core::EntityControlable::movement(),
cleaned up core::EntityGlobe,
adds support for a per-globe corona,
adds core::EntityControlable::control_flags(),
bumps network protocol version to 21
Diffstat (limited to 'src/render/renderext.cc')
-rw-r--r-- | src/render/renderext.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/render/renderext.cc b/src/render/renderext.cc index 049b3de..8ec31bf 100644 --- a/src/render/renderext.cc +++ b/src/render/renderext.cc @@ -82,12 +82,17 @@ RenderExt::RenderExt(core::Entity *entity) : core::Extension(core::Extension::Re core::EntityGlobe *globe = static_cast<core::EntityGlobe *>(entity); // load globe textures - if (!globe->render_texture && globe->texture().size()) { - std::stringstream texname; - texname << "textures/" << globe->texture(); - globe->render_texture = Textures::load(texname.str()); - if (!globe->render_texture) - globe->entity_texture.clear(); + if (!globe->texture_id() && globe->texturename().size()) { + globe->set_texture_id(Textures::load("textures/" + globe->texturename())); + if (!globe->texture_id()) + globe->set_texturename(""); + } + + if (!globe->corona_id() && globe->coronaname().size()) { + globe->set_corona_id(Textures::bind("textures/corona/" + globe->coronaname())); + if (!globe->corona_id()) { + globe->set_coronaname(""); + } } } } |