Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-12-28 22:55:35 +0000
committerStijn Buys <ingar@osirion.org>2012-12-28 22:55:35 +0000
commitf416e6b792e5dda143f60b7a2724db6b3ec33d75 (patch)
tree553ddcaa6c60489904a8db818eff688c0b85a437 /src/render/renderext.cc
parentfe96eee5db2acbef1ea0f360b180fd9f8f990444 (diff)
Support for rendering globes with rings,
removed hardcoded 'corona' prefix for corona textures, added support for projectile fire sounds.
Diffstat (limited to 'src/render/renderext.cc')
-rw-r--r--src/render/renderext.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/render/renderext.cc b/src/render/renderext.cc
index 0f781c5..1dc82f8 100644
--- a/src/render/renderext.cc
+++ b/src/render/renderext.cc
@@ -95,11 +95,18 @@ RenderExt::RenderExt(core::Entity *entity) : core::Extension(core::Extension::Re
}
if (!globe->corona_id() && globe->coronaname().size()) {
- globe->set_corona_id(Textures::bind("textures/corona/" + globe->coronaname()));
+ globe->set_corona_id(Textures::load("textures/" + globe->coronaname()));
if (!globe->corona_id()) {
globe->set_coronaname("");
}
}
+
+ if (!globe->rings_id() && globe->ringsname().size()) {
+ globe->set_rings_id(Textures::load("textures/" + globe->ringsname()));
+ if (!globe->rings_id()) {
+ globe->set_ringsname("");
+ }
+ }
}
}