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>2014-12-07 16:12:49 +0000
committerStijn Buys <ingar@osirion.org>2014-12-07 16:12:49 +0000
commit2c98d3eef488233b99a76ca44d69c1c9d53404af (patch)
tree9259bad9533d1de7381b291eee19fd319b8366eb /src/game/base/game.cc
parentacb236d0df275394095ab43e8519aebc4811865d (diff)
Cleanup of the slots code, unified model weapon and dock tags into a single slots list,
load dock tags into entity slots, represent entity slot locations in entity coordinate space, have r_slots render fixed-size slot indicators regardless of model scale.
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r--src/game/base/game.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 201b18c..f802ff2 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -2579,8 +2579,10 @@ bool Game::validate_zone(core::Zone *zone)
}
if (entity->model()) {
+ const float modelscale = entity->radius() / entity->model()->radius();
+
entity->add_slots();
- entity->slots()->load(entity->model());
+ entity->slots()->load(entity->model(), modelscale);
}
}