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>2010-09-17 15:19:34 +0000
committerStijn Buys <ingar@osirion.org>2010-09-17 15:19:34 +0000
commitc62fe609a69058e2e30f757e9a06f72a98464232 (patch)
tree53f6a671bd84924ddf7d278cf10a3e527670088e /src/core/entity.cc
parent0c509866a37ab47ff0e48d357ca55e31658c37c2 (diff)
Bump network protocol version to 19, menudescriptions use the info infrastructure, client-side lazy info update requests.
Updated ROADMAP
Diffstat (limited to 'src/core/entity.cc')
-rw-r--r--src/core/entity.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc
index baefcea..fdcce59 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -343,11 +343,13 @@ void Entity::receive_server_create(std::istream &is)
set_modelname(n);
// read info id
- is >> o;
- if (o)
- set_info(game()->info(o));
- else
- set_info(0);
+ if(is >> o) {
+ entity_info = Info::find(o);
+ if (o && !entity_info)
+ entity_info = new Info(o);
+ } else {
+ entity_info = 0;
+ }
entity_dirty = false;
}