cleaned working tree

1 files changed, 0 insertions, 59 deletions

diff --git a/AmpelJonas/cObject.cpp b/AmpelJonas/cObject.cpp
deleted file mode 100644
index 8b18e41..0000000
--- a/AmpelJonas/cObject.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "cObject.h"
-
-cObject::cObject(int _sx, int _sy)
-{
-	bBlockRender = true; //Block inherited render capabilities of parent
-
-	sizeX = _sx;
-	sizeY = _sy;
-
-	//Initialize 2D array
-	cScreen = (char**) malloc(sizeof *cScreen * _sx);
-	for (int i = 0; i < _sx; i++)
-		cScreen[i] = (char*)malloc(sizeof *cScreen[i] * _sy);
-
-	wColor = (WORD**)malloc(sizeof *wColor * _sx);
-	for (int i = 0; i < _sx; i++)
-		wColor[i] = (WORD*)malloc(sizeof *wColor[i] * _sy);
-
-	for (int i = 0; i < sizeY; i++) {
-		for (int o = 0; o < sizeX; o++) {
-			cScreen[o][i] = NULL;
-			wColor[o][i] = _COL_DEFAULT;
-		}
-	}
-}
-
-cObject::~cObject()
-{
-	for (int i = 0; i < sizeX; i++) {
-		free(cScreen[i]);
-		free(wColor[i]);
-	}
-
-	free(cScreen);
-	free(wColor);
-}
-
-sPos cObject::getPosition()
-{
-	return pos;
-}
-
-void cObject::setPosition(sPos _pos)
-{
-	pos = _pos;
-}
-
-
-void cObject::setPosition(int _x, int _y)
-{
-	pos.x = _x;
-	pos.y = _y;
-}
-
-
-sObject cObject::getObject()
-{
-	return sObject{pos, wColor, cScreen, sizeX, sizeY};
-}