astyle cleanup, corrects not loading of material textures

1 files changed, 11 insertions, 10 deletions

diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc
index ac52c38..4a21071 100644
--- a/src/game/intro/convoy.cc
+++ b/src/game/intro/convoy.cc
@@ -1,12 +1,13 @@
 /*
    intro/convoy.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
 */
 
 #include "intro/convoy.h"
 
-namespace intro {
+namespace intro
+{
 
 
 /* ---- class Member ----------------------------------------------- */
@@ -34,10 +35,10 @@ void Member::frame(float seconds)
 
 Convoy::Convoy(core::Zone *zone) : core::EntityDynamic()
 {
-	set_zone(zone);	
+	set_zone(zone);
 	set_label("convoy");
 	set_name("Convoy");
-	
+
 	entity_speed = 1.0f;
 	set_serverside();
 }
@@ -68,20 +69,20 @@ void Convoy::add(const std::string &model)
 	member->get_location().assign(location());
 	d = ((float) convoy_members.size()) * 0.5f;
 
-	member->get_location().get_x() += math::randomf((float) convoy_members.size()) -d;
-	member->get_location().get_y() += math::randomf((float) convoy_members.size()) -d;
-	member->get_location().get_z() += (math::randomf((float) convoy_members.size()) -d) * 0.5f;
+	member->get_location().get_x() += math::randomf((float) convoy_members.size()) - d;
+	member->get_location().get_y() += math::randomf((float) convoy_members.size()) - d;
+	member->get_location().get_z() += (math::randomf((float) convoy_members.size()) - d) * 0.5f;
 
 	member->get_axis().assign(axis());
 }
 
 void Convoy::frame(float seconds)
 {
-	for (Members::iterator it = convoy_members.begin(); it != convoy_members.end(); ) {
+	for (Members::iterator it = convoy_members.begin(); it != convoy_members.end();) {
 		Member *member = (*it);
 		if (member->location().length() > 64.0f) {
 			std::string model(member->model()->name());
- 			member->die();
+			member->die();
 			convoy_members.erase(it++);
 			add(model);
 		} else {