Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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;
}