From 69209c38968c6f4066a772e0a51a2928749217de Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 19:00:23 +0000 Subject: Re-indenting the code to use standard tabs. Yes, I know this is pretty pointless, but who cares? --- Stars45/Asteroid.cpp | 142 +++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'Stars45/Asteroid.cpp') diff --git a/Stars45/Asteroid.cpp b/Stars45/Asteroid.cpp index a20a0eb..be9b0bd 100644 --- a/Stars45/Asteroid.cpp +++ b/Stars45/Asteroid.cpp @@ -1,15 +1,15 @@ /* Project Starshatter 4.5 - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: Asteroid.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: Asteroid.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - Asteroid Sprite animation class + OVERVIEW + ======== + Asteroid Sprite animation class */ #include "MemDebug.h" @@ -31,9 +31,9 @@ static Model* asteroid_model[32]; // +--------------------------------------------------------------------+ Asteroid::Asteroid(int t, const Vec3& pos, double m) - : Debris(asteroid_model[t%6], pos, asteroid_velocity, m) +: Debris(asteroid_model[t%6], pos, asteroid_velocity, m) { - life = -1; + life = -1; } // +--------------------------------------------------------------------+ @@ -41,73 +41,73 @@ Asteroid::Asteroid(int t, const Vec3& pos, double m) void Asteroid::Initialize() { - ZeroMemory(asteroid_model, sizeof(asteroid_model)); - - DataLoader* loader = DataLoader::GetLoader(); - Text old_path = loader->GetDataPath(); - loader->SetDataPath("Galaxy/Asteroids/"); - - int n = 0; - - Model* a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a1.mag", 100); - asteroid_model[n++] = a; - } - - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a2.mag", 50); - asteroid_model[n++] = a; - } - - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a1.mag", 8); - asteroid_model[n++] = a; - } - - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a2.mag", 10); - asteroid_model[n++] = a; - } - - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a3.mag", 30); - asteroid_model[n++] = a; - } - - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load("a4.mag", 20); - asteroid_model[n++] = a; - } - - List mod_asteroids; - loader->SetDataPath("Mods/Galaxy/Asteroids/"); - loader->ListFiles("*.mag", mod_asteroids); - - ListIter iter = mod_asteroids; - while (++iter && n < 32) { - a = new(__FILE__,__LINE__) Model; - if (a) { - a->Load(*iter.value(), 50); - asteroid_model[n++] = a; - } - } - - loader->SetDataPath(old_path); + ZeroMemory(asteroid_model, sizeof(asteroid_model)); + + DataLoader* loader = DataLoader::GetLoader(); + Text old_path = loader->GetDataPath(); + loader->SetDataPath("Galaxy/Asteroids/"); + + int n = 0; + + Model* a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a1.mag", 100); + asteroid_model[n++] = a; + } + + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a2.mag", 50); + asteroid_model[n++] = a; + } + + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a1.mag", 8); + asteroid_model[n++] = a; + } + + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a2.mag", 10); + asteroid_model[n++] = a; + } + + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a3.mag", 30); + asteroid_model[n++] = a; + } + + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load("a4.mag", 20); + asteroid_model[n++] = a; + } + + List mod_asteroids; + loader->SetDataPath("Mods/Galaxy/Asteroids/"); + loader->ListFiles("*.mag", mod_asteroids); + + ListIter iter = mod_asteroids; + while (++iter && n < 32) { + a = new(__FILE__,__LINE__) Model; + if (a) { + a->Load(*iter.value(), 50); + asteroid_model[n++] = a; + } + } + + loader->SetDataPath(old_path); } void Asteroid::Close() { - for (int i = 0; i < 32; i++) - delete asteroid_model[i]; + for (int i = 0; i < 32; i++) + delete asteroid_model[i]; - ZeroMemory(asteroid_model, sizeof(asteroid_model)); + ZeroMemory(asteroid_model, sizeof(asteroid_model)); } // +--------------------------------------------------------------------+ -- cgit v1.1