diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-17 23:37:52 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-17 23:37:52 +0000 |
| commit | 9f1c9694199969e1cd1fb9bf731d0e8ef2d8c184 (patch) | |
| tree | 8d8b603680db00b628e7d8b916b4a1e4d3c03e90 /src/core | |
| parent | ee017172af06f4b247038510e5ef7f8ac3596f66 (diff) | |
Removed core::Info.model(), info record models must be referenced through Info::modelname().
Prevent the loading of all info record models in render::load().
Added r_loadmodels engine function, which can be used to load all referenced models at once.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/info.cc | 8 | ||||
| -rw-r--r-- | src/core/info.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/core/info.cc b/src/core/info.cc index 2ff6669..60a88f9 100644 --- a/src/core/info.cc +++ b/src/core/info.cc @@ -81,7 +81,6 @@ Info::Info(const InfoType *type, const char *label) : Label(label) info_type = type; info_registry.push_back(this); - info_model = 0; info_timestamp = 0; info_price = 0; info_volume = 0; @@ -94,7 +93,6 @@ Info::Info(const unsigned int id) info_type = 0; info_registry.push_back(this); - info_model = 0; info_price = 0; info_timestamp = 1; @@ -108,7 +106,6 @@ Info::~Info() info_modelname.clear(); info_text.clear(); info_timestamp = 0; - info_model = 0; info_type = 0; } @@ -132,11 +129,6 @@ void Info::set_modelname(const char *modelname) info_modelname.assign(modelname); } -void Info::set_model(const model::Model *model) -{ - info_model = model; -} - void Info::set_price(const long price) { info_price = price; diff --git a/src/core/info.h b/src/core/info.h index d32ccab..dfec17c 100644 --- a/src/core/info.h +++ b/src/core/info.h @@ -94,10 +94,6 @@ public: inline const std::string & modelname() const { return info_modelname; } - - inline const model::Model *model() const { - return info_model; - } inline const long price() const { return info_price; @@ -133,8 +129,6 @@ public: void set_modelname(const char *modelname); - void set_model(const model::Model *model); - /** * @brief associated price, in credits */ @@ -184,8 +178,6 @@ private: unsigned long info_timestamp; std::string info_modelname; - const model::Model* info_model; - Text info_text; /* ---- static info registry --------------------------------------- */ |