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/descriptions.h')
-rw-r--r--src/core/descriptions.h26
1 files changed, 10 insertions, 16 deletions
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