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>2007-10-21 23:02:47 +0000
committerStijn Buys <ingar@osirion.org>2007-10-21 23:02:47 +0000
commita237a2d7723b94df6cd3e91401ec28388de6f1a0 (patch)
tree7da376d276d03fced7b94a807c0952fd32bcde08 /src/game/ship.h
parent084c6212afaa6f996091f36d0ff85ac845803a87 (diff)
namespace cleanup
Diffstat (limited to 'src/game/ship.h')
-rw-r--r--src/game/ship.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/ship.h b/src/game/ship.h
index d6a00ba..31266a4 100644
--- a/src/game/ship.h
+++ b/src/game/ship.h
@@ -1,5 +1,7 @@
-/* ship.h
- This file is part of the Osirion project
+/*
+ game/ship.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
*/
#ifndef __INCLUDED_SHIP_H__
@@ -8,6 +10,8 @@
// project headers
#include "common/vector3f.h"
+namespace game {
+
class Ship
{
public:
@@ -18,7 +22,7 @@ public:
void update(float elapsed);
/// location of the ship in space
- Vector3f location;
+ common::Vector3f location;
/// speed vector in units/second
float speed;
@@ -50,5 +54,6 @@ private:
float yaw_offset;
};
-#endif // __INCLUDED_SHIP_H__
+} // namespace game
+#endif // __INCLUDED_SHIP_H__