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/client/entitymenu.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/client/entitymenu.h')
-rw-r--r--src/client/entitymenu.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/client/entitymenu.h b/src/client/entitymenu.h
index db69867..0285879 100644
--- a/src/client/entitymenu.h
+++ b/src/client/entitymenu.h
@@ -26,13 +26,17 @@ public:
/* ---- inspectors ----------------------------------------- */
/// entity the current menu was generated for
- inline core::Entity *generated_entity() { return menu_generated_entity; }
+ inline core::Entity *generated_entity() {
+ return menu_generated_entity;
+ }
/// the current generated menu
- inline const std::string & generated_menu() const { return menu_generated_menu; }
+ inline const std::string & generated_menu() const {
+ return menu_generated_menu;
+ }
/* ---- mutators ------------------------------------------- */
-
+
/// generate a menu from menu descriptions
void generate(core::Entity *entity, const char *menulabel);