diff options
Diffstat (limited to 'Stars45/DataLoader.cpp')
| -rw-r--r-- | Stars45/DataLoader.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Stars45/DataLoader.cpp b/Stars45/DataLoader.cpp index 9c58608..22ac803 100644 --- a/Stars45/DataLoader.cpp +++ b/Stars45/DataLoader.cpp @@ -7,7 +7,6 @@ */ -#include "MemDebug.h" #include "DataLoader.h" #include "Archive.h" #include "Color.h" @@ -45,7 +44,7 @@ DataLoader::UseVideo(Video* v) void DataLoader::Initialize() { - def_loader = new(__FILE__,__LINE__) DataLoader; + def_loader = new DataLoader; loader = def_loader; archives.destroy(); @@ -95,7 +94,7 @@ DataLoader::EnableDatafile(const char* name) if (f) { ::fclose(f); - DataArchive* a = new(__FILE__,__LINE__) DataArchive(name); + DataArchive* a = new DataArchive(name); if (a && a->NumFiles() >= 1) { status = DATAFILE_OK; @@ -360,13 +359,13 @@ DataLoader::LoadBuffer(const char* name, BYTE*& buf, bool null_terminate, bool o ::fseek(f, 0, SEEK_SET); if (null_terminate) { - buf = new(__FILE__,__LINE__) BYTE[len+1]; + buf = new BYTE[len+1]; if (buf) buf[len] = 0; } else { - buf = new(__FILE__,__LINE__) BYTE[len]; + buf = new BYTE[len]; } if (buf) @@ -431,7 +430,7 @@ DataLoader::LoadPartialFile(const char* name, BYTE*& buf, int max_load, bool opt len = max_load; } - buf = new(__FILE__,__LINE__) BYTE[len]; + buf = new BYTE[len]; if (buf) ::fread(buf, len, 1, f); @@ -476,7 +475,7 @@ DataLoader::CacheBitmap(const char* name, Bitmap*& bitmap, int type, bool option if (bitmap) return 1; // not in cache yet: - bitmap = new(__FILE__,__LINE__) Bitmap; + bitmap = new Bitmap; if (bitmap) result = LoadBitmap(name, *bitmap, type, optional); @@ -533,7 +532,7 @@ DataLoader::LoadTexture(const char* name, Bitmap*& bitmap, int type, bool preloa if (bitmap) return 1; // not in cache yet: - bitmap = new(__FILE__,__LINE__) Bitmap; + bitmap = new Bitmap; if (bitmap) { result = LoadHiColor(name, *bitmap, type); |