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/game/base/jumppoint.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/base/jumppoint.cc')
-rw-r--r--src/game/base/jumppoint.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc
index 9017f1c..5b4e689 100644
--- a/src/game/base/jumppoint.cc
+++ b/src/game/base/jumppoint.cc
@@ -1,7 +1,7 @@
/*
base/jumppoint.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 "base/game.h"
@@ -28,7 +28,7 @@ JumpPoint::~JumpPoint()
{
}
-void JumpPoint::set_targetlabel(const std::string &label)
+void JumpPoint::set_targetlabel(const std::string &label)
{
jumppoint_targetlabel.assign(label);
}
@@ -42,13 +42,13 @@ void JumpPoint::validate()
return;
}
size_t pos = targetlabel().find(':');
- if ((pos < 1 ) || (pos >= (targetlabel().size()-1))) {
+ if ((pos < 1) || (pos >= (targetlabel().size() - 1))) {
con_warn << " Jumppoint with invalid target label '" << targetlabel() << "'\n";
return;
}
std::string zonelabel(targetlabel().substr(0, pos));
- std::string entitylabel(targetlabel().substr(pos+1, targetlabel().size()-pos));
+ std::string entitylabel(targetlabel().substr(pos + 1, targetlabel().size() - pos));
core::Zone *targetzone = core::Zone::find(zonelabel);
if (!targetzone) {
@@ -68,7 +68,7 @@ void JumpPoint::validate()
}
jumppoint_target = static_cast<JumpPoint *>(targetentity);
-
+
//con_debug << " Jumppoint " << zone->label() << ":" << label() << " with target " << targetlabel() << std::endl;
}
@@ -132,7 +132,7 @@ void JumpGate::dock(core::Entity *entity)
if (ship->owner())
ship->owner()->send("Jumpgate inactive");
return;
- }
+ }
}
void JumpGate::activate()