summaryrefslogtreecommitdiffhomepage
path: root/Stars45/Galaxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/Galaxy.cpp')
-rw-r--r--Stars45/Galaxy.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/Stars45/Galaxy.cpp b/Stars45/Galaxy.cpp
index 29766f9..1b5bb6f 100644
--- a/Stars45/Galaxy.cpp
+++ b/Stars45/Galaxy.cpp
@@ -11,7 +11,6 @@
Galaxy (list of star systems) for a single campaign.
*/
-#include "MemDebug.h"
#include "Galaxy.h"
#include "StarSystem.h"
#include "Starshatter.h"
@@ -47,7 +46,7 @@ void
Galaxy::Initialize()
{
if (galaxy) delete galaxy;
- galaxy = new(__FILE__,__LINE__) Galaxy("Galaxy");
+ galaxy = new Galaxy("Galaxy");
galaxy->Load();
}
@@ -99,7 +98,7 @@ Galaxy::Load(const char* filename)
DataLoader* loader = DataLoader::GetLoader();
loader->LoadBuffer(filename, block, true);
- Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block));
+ Parser parser(new BlockReader((const char*) block));
Term* term = parser.ParseTerm();
@@ -174,11 +173,11 @@ Galaxy::Load(const char* filename)
}
if (sys_name[0]) {
- StarSystem* star_system = new(__FILE__,__LINE__) StarSystem(sys_name, sys_loc, sys_iff, star_class);
+ StarSystem* star_system = new StarSystem(sys_name, sys_loc, sys_iff, star_class);
star_system->Load();
systems.append(star_system);
- Star* star = new(__FILE__,__LINE__) Star(sys_name, sys_loc, star_class);
+ Star* star = new Star(sys_name, sys_loc, star_class);
stars.append(star);
}
}
@@ -227,7 +226,7 @@ Galaxy::Load(const char* filename)
}
if (star_name[0]) {
- Star* star = new(__FILE__,__LINE__) Star(star_name, star_loc, star_class);
+ Star* star = new Star(star_name, star_loc, star_class);
stars.append(star);
}
}