From 5ddb64795cc959916eeedbec8dc3f65c06f49698 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 12 Nov 2009 20:53:35 +0000
Subject: initial commodities and entity inventory, bump network proto version
to 18
---
src/render/render.cc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'src/render')
diff --git a/src/render/render.cc b/src/render/render.cc
index 03c5c87..66b7d42 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -189,6 +189,12 @@ void clear()
delete ext_render(entity);
}
}
+
+ // clear info models
+ for (core::Info::Registry::iterator it = core::Info::registry().begin(); it != core::Info::registry().end(); it++) {
+ core::Info *info = (*it);
+ info->set_model(0);
+ }
// clear model registry
model::Model::clear();
@@ -214,9 +220,11 @@ void load()
// load info models
for (core::Info::Registry::iterator it = core::Info::registry().begin(); it != core::Info::registry().end(); it++) {
- core::Info *info = (*it).second;
+ core::Info *info = (*it);
if (info->modelname().size()) {
- model::Model::load(info->modelname());
+ info->set_model(model::Model::load(info->modelname()));
+ } else {
+ info->set_model(0);
}
}
}
--
cgit v1.2.3