diff options
Diffstat (limited to 'src/game/base/collision.h')
| -rw-r--r-- | src/game/base/collision.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/game/base/collision.h b/src/game/base/collision.h index 8203669..d74e6d6 100644 --- a/src/game/base/collision.h +++ b/src/game/base/collision.h @@ -1,7 +1,7 @@ /* base/collision.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_BASE_COLLISION_H__ @@ -9,10 +9,12 @@ #include "core/zone.h" -namespace game { +namespace game +{ /// collision detection functions -class Collision { +class Collision +{ public: /// do collision detection static void frame(const float elapsed); @@ -20,7 +22,7 @@ public: private: /// do collision detection for a single zone static void frame_zone(core::Zone *zone); - + /// do a distance test between two entities static void distance_test(core::EntityControlable *first, core::Entity *second); }; |