From 02b285bf20603bab6fc75d106acbaccead645eb9 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 24 Nov 2010 23:00:28 +0000 Subject: 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 --- src/render/renderext.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/render/renderext.cc') 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(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(""); + } } } } -- cgit v1.2.3