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/descriptions.h | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'src/core/descriptions.h')

diff --git a/src/core/descriptions.h b/src/core/descriptions.h
index 2b4b1e0..05e92af 100644
--- a/src/core/descriptions.h
+++ b/src/core/descriptions.h
@@ -17,8 +17,8 @@ class ButtonDescription;
 class MenuDescription;
 }
 
+#include "core/info.h"
 #include "core/entity.h"
-#include "model/model.h"
 #include "filesystem/inifile.h"
 
 namespace core
@@ -52,21 +52,16 @@ public:
 		return button_command;
 	}
 
-	/// button info view model name
-	inline const std::string & modelname() const  {
-		return button_modelname;
-	}
-
-	/// button info view model
-	inline const model::Model *model() {
-		return button_model;
-	}
-
 	/// button text alignment
 	inline Align alignment() const {
 		return button_align;
 	}
 
+	/// button info record
+	inline Info *info() {
+		return button_info;
+	}
+
 	/* -- mutators -------------------------------------------- */
 
 	/// set button text
@@ -75,19 +70,18 @@ public:
 	/// set button command
 	void set_command(const std::string &command, const CommandType command_type);
 
-	/// set button name
-	void set_modelname(const std::string &modelname);
-
 	/// set text alignment
 	void set_alignment(Align align);
+	
+	/// set info record
+	void set_info(Info *info);
 
 private:
 	std::string		button_text;
 	CommandType		button_commandtype;
 	std::string		button_command;
-	std::string		button_modelname;
 	Align			button_align;
-	model::Model 		*button_model;
+	Info			*button_info;
 };
 
 /// description of an entity menu
-- 
cgit v1.2.3