summaryrefslogtreecommitdiffhomepage
path: root/Stars45/ActiveWindow.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-03-27 17:42:26 +0200
committerAki <please@ignore.pl>2022-03-27 17:42:26 +0200
commita12e588079700d55a0b788fea2df7727c2e41f52 (patch)
tree690072569624c73af5043b3619acaab4d298b1fa /Stars45/ActiveWindow.cpp
parent72bb517271dad40a440533ad0796a88247011199 (diff)
downloadstarshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/ActiveWindow.cpp')
-rw-r--r--Stars45/ActiveWindow.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/Stars45/ActiveWindow.cpp b/Stars45/ActiveWindow.cpp
index f65a3c3..4c99ef8 100644
--- a/Stars45/ActiveWindow.cpp
+++ b/Stars45/ActiveWindow.cpp
@@ -12,7 +12,6 @@
*/
#include <vector>
-#include "MemDebug.h"
#include "ActiveWindow.h"
#include "EventDispatch.h"
#include "Color.h"
@@ -180,7 +179,7 @@ const std::vector<float>& weight_x,
const std::vector<float>& weight_y)
{
if (!layout)
- layout = new(__FILE__,__LINE__) Layout;
+ layout = new Layout;
if (layout)
layout->SetConstraints(min_x, min_y, weight_x, weight_y);
@@ -193,7 +192,7 @@ const std::vector<float>& weight_x,
const std::vector<float>& weight_y)
{
if (!layout)
- layout = new(__FILE__,__LINE__) Layout;
+ layout = new Layout;
if (layout)
layout->SetConstraints(min_x, min_y, weight_x, weight_y);
@@ -208,7 +207,7 @@ float* weight_x,
float* weight_y)
{
if (!layout)
- layout = new(__FILE__,__LINE__) Layout;
+ layout = new Layout;
if (layout)
layout->SetConstraints(nrows, ncols, min_x, min_y, weight_x, weight_y);
@@ -340,7 +339,7 @@ ActiveWindow::CalcGrid()
tex_w = (float) texture->Width();
tex_h = (float) texture->Height();
- vset = new(__FILE__,__LINE__) VertexSet(nverts);
+ vset = new VertexSet(nverts);
int v = 0;
@@ -365,10 +364,10 @@ ActiveWindow::CalcGrid()
}
}
- mtl = new(__FILE__,__LINE__) Material;
+ mtl = new Material;
mtl->tex_diffuse = texture;
- polys = new(__FILE__,__LINE__) Poly[npolys];
+ polys = new Poly[npolys];
Poly* p = polys;
@@ -602,7 +601,7 @@ ActiveWindow::SetText(const char* t)
int len = strlen(t);
if (len > 0) {
- char* buf = new(__FILE__,__LINE__) char[2*len];
+ char* buf = new char[2*len];
if (buf != 0) {
const char* src = t;
@@ -647,7 +646,7 @@ ActiveWindow::SetText(const Text& t)
int len = t.length();
if (len > 0 && t.contains('\\')) {
- char* buf = new(__FILE__,__LINE__) char[2*len];
+ char* buf = new char[2*len];
if (buf != 0) {
const char* src = t;
@@ -777,7 +776,7 @@ ActiveWindow::DrawText(const char* txt, int count, Rect& txt_rect, DWORD flags)
void
ActiveWindow::RegisterClient(int eid, ActiveWindow* client, PFVAWE callback)
{
- AWMap* map = new(__FILE__,__LINE__) AWMap(eid, client, callback);
+ AWMap* map = new AWMap(eid, client, callback);
if (map != 0)
clients.append(map);