diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/core/info.h | |
parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/info.h')
-rw-r--r-- | src/core/info.h | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/core/info.h b/src/core/info.h index 1bc62a9..8395954 100644 --- a/src/core/info.h +++ b/src/core/info.h @@ -31,15 +31,25 @@ public: typedef std::deque<std::string> Text; - inline const std::string & label() const { return info_label; } + inline const std::string & label() const { + return info_label; + } - inline const std::string & name() const { return info_name; } + inline const std::string & name() const { + return info_name; + } - inline const std::string & modelname() const { return info_modelname; } + inline const std::string & modelname() const { + return info_modelname; + } - inline const unsigned long ×tamp() const { return info_timestamp; } + inline const unsigned long ×tamp() const { + return info_timestamp; + } - inline Text & text() { return info_text; } + inline Text & text() { + return info_text; + } void set_name(const std::string & name); @@ -73,7 +83,7 @@ public: /// receive a server-to-client update from a stream void receive_server_update(std::istream &is); -/* ---- static info registry --------------------------------------- */ + /* ---- static info registry --------------------------------------- */ typedef std::map<std::string, Info*> Registry; @@ -93,7 +103,9 @@ public: static void list(); /// the info registry - static inline Registry & registry() { return info_registry; } + static inline Registry & registry() { + return info_registry; + } private: std::string info_label; |