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/render.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/render.cc')
-rw-r--r--src/render/render.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/render/render.cc b/src/render/render.cc
index 794d777..bf14e7d 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -154,9 +154,13 @@ void unload()
globe->set_texture_id(0);
}
if (globe->corona_id()) {
- render::Textures::unload("textures/corona/" + globe->coronaname());
+ render::Textures::unload("textures/" + globe->coronaname());
globe->set_corona_id(0);
}
+ if (globe->rings_id()) {
+ render::Textures::unload("textures/" + globe->ringsname());
+ globe->set_rings_id(0);
+ }
}
if (ext_render(entity)) {
@@ -182,9 +186,13 @@ void clear()
globe->set_texture_id(0);
}
if (globe->corona_id()) {
- render::Textures::unload("textures/corona/" + globe->coronaname());
+ render::Textures::unload("textures/" + globe->coronaname());
globe->set_corona_id(0);
}
+ if (globe->rings_id()) {
+ render::Textures::unload("textures/" + globe->ringsname());
+ globe->set_rings_id(0);
+ }
}
if (ext_render(entity)) {