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/auxiliary/functions.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/auxiliary/functions.h')
-rw-r--r--src/auxiliary/functions.h25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/auxiliary/functions.h b/src/auxiliary/functions.h
index d5b590d..aeaa201 100644
--- a/src/auxiliary/functions.h
+++ b/src/auxiliary/functions.h
@@ -18,18 +18,33 @@ namespace aux
const std::string plural(const char * word, size_t n);
/// append an "s" to a word, depending on the amount
-inline const std::string plural(const std::string & word, size_t n) { return plural(word.c_str(), n); }
+inline const std::string plural(const std::string & word, size_t n)
+{
+ return plural(word.c_str(), n);
+}
/// prepend the "a" or "an" article to a word
const std::string article(const char * word);
-inline const std::string article(const std::string & word) { return article(word.c_str()); }
+inline const std::string article(const std::string & word)
+{
+ return article(word.c_str());
+}
-inline bool is_base_color_code(char const *c) { return ((*c == '^') && (*(c+1) >= '0') && (*(c+1) <= '7')); }
+inline bool is_base_color_code(char const *c)
+{
+ return ((*c == '^') && (*(c + 1) >= '0') && (*(c + 1) <= '7'));
+}
-inline bool is_core_color_code(char const *c) { return ((*c == '^') && (*(c+1) >= 'A') && (*(c+1) <= 'Z')); }
+inline bool is_core_color_code(char const *c)
+{
+ return ((*c == '^') && (*(c + 1) >= 'A') && (*(c + 1) <= 'Z'));
+}
-inline bool is_color_code(char const *c) { return (is_base_color_code(c) || is_core_color_code(c)); }
+inline bool is_color_code(char const *c)
+{
+ return (is_base_color_code(c) || is_core_color_code(c));
+}
/// length of a string, excluding color codes
size_t text_length(const std::string &text);