From c62fe609a69058e2e30f757e9a06f72a98464232 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 17 Sep 2010 15:19:34 +0000
Subject: Bump network protocol version to 19, menudescriptions use the info
 infrastructure, client-side lazy info update requests. Updated ROADMAP

---
 src/core/entity.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/core/entity.cc')

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;
 }
-- 
cgit v1.2.3