diff options
Diffstat (limited to 'Stars45/Font.cpp')
| -rw-r--r-- | Stars45/Font.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Stars45/Font.cpp b/Stars45/Font.cpp index fdb710c..c3ba23b 100644 --- a/Stars45/Font.cpp +++ b/Stars45/Font.cpp @@ -11,7 +11,6 @@ Font Resource class implementation */ -#include "MemDebug.h" #include "Font.h" #include "Polygon.h" #include "Bitmap.h" @@ -103,7 +102,7 @@ Font::Load(const char* name) height = bitmap.Height(); int imgsize = bitmap.Width() * bitmap.Height(); - image = new(__FILE__,__LINE__) BYTE[imgsize]; + image = new BYTE[imgsize]; if (image) { if (bitmap.Pixels()) { @@ -116,7 +115,7 @@ Font::Load(const char* name) } } - material = new(__FILE__,__LINE__) Material; + material = new Material; material->tex_diffuse = &bitmap; } else { @@ -160,7 +159,7 @@ Font::LoadDef(char* defname, char* imgname) if (!block || blocklen < 4) return; - Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block, blocklen)); + Parser parser(new BlockReader((const char*) block, blocklen)); Term* term = parser.ParseTerm(); if (!term) { @@ -428,7 +427,7 @@ static bool nokern(char c) void Font::AutoKern() { - FontKernData* data = new(__FILE__,__LINE__) FontKernData[256]; + FontKernData* data = new FontKernData[256]; if (!data) return; @@ -1085,7 +1084,7 @@ Font::DrawString(const char* str, int len, int x1, int y1, const Rect& clip, Bit // allocate verts, if necessary int nverts = 4*len; if (!vset) { - vset = new(__FILE__,__LINE__) VertexSet(nverts); + vset = new VertexSet(nverts); if (!vset) return false; @@ -1202,7 +1201,7 @@ Font::DrawString(const char* str, int len, int x1, int y1, const Rect& clip, Bit delete [] polys; npolys = count; - polys = new(__FILE__,__LINE__) Poly[npolys]; + polys = new Poly[npolys]; Poly* p = polys; int index = 0; |