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/action.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/client/action.h')
-rw-r--r--src/client/action.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/client/action.h b/src/client/action.h
index c7086c8..778c40d 100644
--- a/src/client/action.h
+++ b/src/client/action.h
@@ -9,26 +9,33 @@
#include <string>
-namespace client {
+namespace client
+{
/// an Action that can be bound to a key
class Action
{
public:
/// actions
- enum Identifier {None=0};
+ enum Identifier {None = 0};
/// define a new action
Action(const char *name, Identifier action, const char *info = 0);
~Action();
-
+
/// name of the Action
- inline std::string const & name() const { return action_name; }
+ inline std::string const & name() const {
+ return action_name;
+ }
/// Action Identifier
- inline Identifier id() const { return action_id; }
+ inline Identifier id() const {
+ return action_id;
+ }
- inline std::string const & info() const { return action_info; }
+ inline std::string const & info() const {
+ return action_info;
+ }
/// set info
void set_info(const char *info);