diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
| commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
| tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/game/example | |
| parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) | |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/example')
| -rw-r--r-- | src/game/example/example.cc | 9 | ||||
| -rw-r--r-- | src/game/example/example.h | 4 | ||||
| -rw-r--r-- | src/game/example/spectator.cc | 9 | ||||
| -rw-r--r-- | src/game/example/spectator.h | 7 |
4 files changed, 16 insertions, 13 deletions
diff --git a/src/game/example/example.cc b/src/game/example/example.cc index f368556..a6372da 100644 --- a/src/game/example/example.cc +++ b/src/game/example/example.cc @@ -1,14 +1,15 @@ /* intro/intro.cc - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #include "core/gameserver.h" #include "example/example.h" #include "example/spectator.h" -namespace example { +namespace example +{ core::Module *factory() { @@ -47,7 +48,7 @@ Example::Example() : core::Module("The Osirion Project Example", true) cube->get_color().assign(1, 0, 0); // set RGB color red cube->set_radius(0.25f); // set radius, in game units cube->set_zone(zone); // add the entity to the zone - + core::Entity *sphere = new core::Entity(); // a new entity sphere->set_label("sphere"); sphere->set_name("The Green Sphere"); diff --git a/src/game/example/example.h b/src/game/example/example.h index 64e9e4d..f6d6ff6 100644 --- a/src/game/example/example.h +++ b/src/game/example/example.h @@ -1,7 +1,7 @@ /* intro/example.h - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #ifndef __INCLUDED_EXAMPLE_H__ diff --git a/src/game/example/spectator.cc b/src/game/example/spectator.cc index 5fad0f1..93c6fdd 100644 --- a/src/game/example/spectator.cc +++ b/src/game/example/spectator.cc @@ -1,12 +1,13 @@ /* base/spectator.cc - 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 */ #include "example/spectator.h" -namespace example { +namespace example +{ core::Cvar *Spectator::g_spectatorspeed = 0; core::Cvar *Spectator::g_spectatorrotation = 0; @@ -43,7 +44,7 @@ void Spectator::frame(float elapsed) get_axis().change_direction(target_direction * rotation); get_axis().change_pitch(target_pitch * rotation); get_axis().change_roll(target_roll * rotation); - + // assign speed from thruster float maxspeed = g_spectatorspeed->value(); entity_speed = entity_thrust * maxspeed; diff --git a/src/game/example/spectator.h b/src/game/example/spectator.h index 435c45c..57f223b 100644 --- a/src/game/example/spectator.h +++ b/src/game/example/spectator.h @@ -1,7 +1,7 @@ /* base/spectator.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_EXAMPLE_SPECTATOR_H__ @@ -10,7 +10,8 @@ #include "core/entity.h" #include "core/cvar.h" -namespace example { +namespace example +{ /// A spectator entity class Spectator : public core::EntityControlable |