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/module.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/module.h')
-rw-r--r--src/core/module.h32
1 files changed, 22 insertions, 10 deletions
diff --git a/src/core/module.h b/src/core/module.h
index 76b1ba4..ac6b380 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -17,26 +17,36 @@ namespace core
class Module
{
public:
- Module(const char *name, bool interactive=true);
+ Module(const char *name, bool interactive = true);
virtual ~Module();
-/*----- inspectors ------------------------------------------------ */
+ /*----- inspectors ------------------------------------------------ */
/// return true if the game module can run a timeframe
- inline bool running() const { return module_running; }
+ inline bool running() const {
+ return module_running;
+ }
/// return true if the game module can not run a timeframe
- inline bool error() const { return !module_running; }
+ inline bool error() const {
+ return !module_running;
+ }
/// label of the module
- inline std::string const & label() const { return module_label; }
+ inline std::string const & label() const {
+ return module_label;
+ }
/// return the name of the module
- inline std::string const & name() const { return module_name; }
+ inline std::string const & name() const {
+ return module_name;
+ }
/// indicates if this is an interactive module or not
- inline bool interactive() const { return module_interactive; }
+ inline bool interactive() const {
+ return module_interactive;
+ }
-/*----- mutators -------------------------------------------------- */
+ /*----- mutators -------------------------------------------------- */
/// run one game frame
virtual void frame(float seconds) = 0;
@@ -50,7 +60,9 @@ public:
/// set the module label
void set_label(const std::string &label);
- static inline Module *instance() { return module_instance; }
+ static inline Module *instance() {
+ return module_instance;
+ }
protected:
/// abort a running module
@@ -61,7 +73,7 @@ private:
bool module_running;
std::string module_label;
- std::string module_name;
+ std::string module_name;
static Module* module_instance;
};