Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/core/item.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/item.h')
-rw-r--r--src/core/item.h23
1 files changed, 17 insertions, 6 deletions
diff --git a/src/core/item.h b/src/core/item.h
index 8299444..0845c21 100644
--- a/src/core/item.h
+++ b/src/core/item.h
@@ -10,7 +10,8 @@
#include <string>
#include <vector>
-namespace core {
+namespace core
+{
/**
* @brief a specific type of item in the game
@@ -21,11 +22,17 @@ class ItemType
public:
ItemType(const char *label);
- inline const std::string &label() { return itemtype_label; }
+ inline const std::string &label() {
+ return itemtype_label;
+ }
- inline const std::string &name() { return itemtype_name; }
+ inline const std::string &name() {
+ return itemtype_name;
+ }
- inline const float baseprice() { return itemtype_baseprice; }
+ inline const float baseprice() {
+ return itemtype_baseprice;
+ }
void set_name(const std::string &name);
@@ -51,9 +58,13 @@ public:
ItemClass(const char *label);
~ItemClass();
- inline const std::string &label() { return itemclass_label; }
+ inline const std::string &label() {
+ return itemclass_label;
+ }
- inline const std::string &name() { return itemclass_name; }
+ inline const std::string &name() {
+ return itemclass_name;
+ }
ItemType *find_type(const char *label);