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/gameconnection.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/gameconnection.h')
-rw-r--r--src/core/gameconnection.h27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/core/gameconnection.h b/src/core/gameconnection.h
index 22af910..52885f4 100644
--- a/src/core/gameconnection.h
+++ b/src/core/gameconnection.h
@@ -20,13 +20,17 @@ public:
GameConnection(std::string const &connectionstr);
virtual ~GameConnection();
-/*----- inspectors ------------------------------------------------ */
+ /*----- inspectors ------------------------------------------------ */
/// returns true if the game connection can run a time frime
- inline bool running() const { return connection_running; }
+ inline bool running() const {
+ return connection_running;
+ }
/// returns true if the game connection can not run a time frime
- inline bool error() const { return !connection_running; }
+ inline bool error() const {
+ return !connection_running;
+ }
/// returns true if the game is running an interactive module
virtual bool interactive() const;
@@ -37,7 +41,7 @@ public:
/// return the current game time
virtual unsigned long timestamp() const;
-/*----- mutators -------------------------------------------------- */
+ /*----- mutators -------------------------------------------------- */
/// run a game connection time frame
void frame(unsigned long timestamp);
@@ -57,10 +61,12 @@ public:
/// returns an info record
Info *info(const std::string &label);
-/*----- static ---------------------------------------------------- */
-
+ /*----- static ---------------------------------------------------- */
+
/// return the current game connection
- static inline GameConnection *instance() { return connection_instance; }
+ static inline GameConnection *instance() {
+ return connection_instance;
+ }
protected:
/// abort runing
@@ -72,10 +78,13 @@ private:
unsigned long connection_netframe; // last network frame timestamp
NetConnection *connection_network;
- static GameConnection *connection_instance;
+ static GameConnection *connection_instance;
};
-inline GameConnection *connection() { return GameConnection::instance(); }
+inline GameConnection *connection()
+{
+ return GameConnection::instance();
+}
}