Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/jumppoint.h')
-rw-r--r--src/game/base/jumppoint.h25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/game/base/jumppoint.h b/src/game/base/jumppoint.h
index 900f1f3..fe29727 100644
--- a/src/game/base/jumppoint.h
+++ b/src/game/base/jumppoint.h
@@ -1,7 +1,7 @@
/*
base/jumppoint.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_JUMPPOINT_H__
@@ -12,7 +12,8 @@
#include <string>
-namespace game {
+namespace game
+{
/// a jumppoint
/**
@@ -21,14 +22,19 @@ namespace game {
* between the current system and the target of the nearest jumppoint.
*
*/
-class JumpPoint : public core::EntityDynamic {
+class JumpPoint : public core::EntityDynamic
+{
public:
JumpPoint();
virtual ~JumpPoint();
- inline std::string const & targetlabel() { return jumppoint_targetlabel; }
+ inline std::string const & targetlabel() {
+ return jumppoint_targetlabel;
+ }
- inline JumpPoint *target() { return jumppoint_target; }
+ inline JumpPoint *target() {
+ return jumppoint_target;
+ }
/// set trget label
void set_targetlabel(const std::string &label);
@@ -42,7 +48,8 @@ private:
};
/// a jumpgate
-class JumpGate : public JumpPoint {
+class JumpGate : public JumpPoint
+{
public:
JumpGate();
virtual ~JumpGate();
@@ -53,7 +60,9 @@ public:
/// entity received a docking request
virtual void dock(core::Entity *entity);
- inline bool activated() const { return (jumpgate_timer > 0); }
+ inline bool activated() const {
+ return (jumpgate_timer > 0);
+ }
void activate();