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>2008-09-10 19:17:52 +0000
committerStijn Buys <ingar@osirion.org>2008-09-10 19:17:52 +0000
commit83fb219e62113a9f41888af4f2726e5ce5305970 (patch)
tree3ba9780192fc7aa7d1fe7988b30a85c5ba08d422 /src/render
parent033bd59cfc2dff93529ad448459ad6348ea29c8d (diff)
serverside entities
Diffstat (limited to 'src/render')
-rw-r--r--src/render/draw.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc
index 8bf694f..c74f65f 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -498,7 +498,7 @@ void draw_pass_default()
for (core::Zone::Content::iterator it = zone->content().begin(); it != zone->content().end(); ++it) {
core::Entity *entity = (*it);
- if (!entity->model() && (entity->type() != core::Entity::Globe)) {
+ if (!entity->serverside() && !entity->model() && (entity->type() != core::Entity::Globe)) {
gl::push();
gl::translate(entity->state()->location());
@@ -1086,7 +1086,6 @@ void draw(float seconds)
draw_pass_spacegrid(); // draw the blue spacegrid
Dust::draw(zone_color); // draw spacedust
-
draw_pass_model_fx(seconds); // draw entity lights and engines
gl::enable(GL_LIGHTING);
@@ -1103,7 +1102,7 @@ void draw(float seconds)
gl::disable(GL_COLOR_MATERIAL); // disable color tracking
gl::disable(GL_CULL_FACE); // disable culling
- gl::depthmask(GL_TRUE); // enable depth buffer writing
+ gl::depthmask(GL_TRUE); // enable depth buffer writing
gl::disable(GL_DEPTH_TEST); // disable depth buffer testing
// GL_BLEND must be enabled for the GUI
}