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/gameinterface.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/gameinterface.h')
-rw-r--r--src/core/gameinterface.h28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/core/gameinterface.h b/src/core/gameinterface.h
index dbb235e..44b4230 100644
--- a/src/core/gameinterface.h
+++ b/src/core/gameinterface.h
@@ -27,22 +27,28 @@ public:
/// type definition for the Players collection
typedef std::list<Player *> Players;
-/*----- inspectors ---------------------------------------------- */
+ /*----- inspectors ---------------------------------------------- */
/// return the local player
- inline Player *localplayer() { return &game_localplayer; }
+ inline Player *localplayer() {
+ return &game_localplayer;
+ }
- inline Players & players() { return game_players; }
+ inline Players & players() {
+ return game_players;
+ }
+
+ inline model::VertexArray *vertexarray() {
+ return game_vertexarray;
+ }
- inline model::VertexArray *vertexarray() { return game_vertexarray; }
-
/// find the first player who's id or name matches the search string
Player *find_player(const std::string &search);
-
+
/// show a list of connected players
void list_players();
-/*----- virtual inspectors --------------------------------------- */
+ /*----- virtual inspectors --------------------------------------- */
/// returns true if the game server can run a time frime
virtual bool running() const = 0;
@@ -59,14 +65,14 @@ public:
/// returns an info record
virtual Info *info(const std::string &label) = 0;
-/*----- mutators ------------------------------------------------- */
-
+ /*----- mutators ------------------------------------------------- */
+
/// clear all game variables, game functions and entities
void clear();
-/*----- virtual mutators ------------------------------------------ */
-
+ /*----- virtual mutators ------------------------------------------ */
+
/// run one game time frame
/// @param timestamp current application time
virtual void frame(unsigned long timestamp) = 0;