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/client.h
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/client/client.h')
-rw-r--r--src/client/client.h29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/client/client.h b/src/client/client.h
index dbb2c44..fd762c6 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,7 +1,7 @@
/*
client/client.h
- This file is part of the Osirion project and is distributed under
- the terms and conditions of the GNU General Public License version 2
+ This file is part of the Osirion project and is distributed under
+ the terms and conditions of the GNU General Public License version 2
*/
#ifndef __INCLUDED_CLIENT_H__
@@ -16,7 +16,8 @@
#include "render/renderext.h"
/// client part of the engine
-namespace client {
+namespace client
+{
/// run the client application
void run(int count, char **arguments);
@@ -62,7 +63,9 @@ public:
virtual void notify_disconnect();
/// the main client widget
- inline WorldView *worldview() { return client_worldview; }
+ inline WorldView *worldview() {
+ return client_worldview;
+ }
protected:
/// run a client frame
@@ -95,14 +98,20 @@ private:
Client *client();
-inline ClientExt *ext_client(core::Entity *entity)
- { return static_cast<ClientExt *>(entity->extension(core::Extension::Client)); }
+inline ClientExt *ext_client(core::Entity *entity)
+{
+ return static_cast<ClientExt *>(entity->extension(core::Extension::Client));
+}
-inline SoundExt *ext_sound(core::Entity *entity)
- { return static_cast<SoundExt *>(entity->extension(core::Extension::Sound)); }
+inline SoundExt *ext_sound(core::Entity *entity)
+{
+ return static_cast<SoundExt *>(entity->extension(core::Extension::Sound));
+}
-inline render::RenderExt *ext_render(core::Entity *entity)
- { return static_cast<render::RenderExt *>(entity->extension(core::Extension::Render)); }
+inline render::RenderExt *ext_render(core::Entity *entity)
+{
+ return static_cast<render::RenderExt *>(entity->extension(core::Extension::Render));
+}
}