Merge remote-tracking branch 'sync/master' into prince-malik

1 files changed, 22 insertions, 2 deletions

diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 435a06d63b..a67a4d7b19 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -58,6 +58,8 @@ Bitmap::Bitmap(Bitmap *src) {
 Bitmap::~Bitmap() {
 	if (_pixels)
 		free(_pixels);
+
+	_pixels = 0;
 }
 
 void Bitmap::load(Common::ReadStream *s) {
@@ -87,6 +89,10 @@ Background::Background() {
 	_palette = 0;
 }
 
+Background::~Background() {
+	warning("STUB: Background::~Background()");
+}
+
 bool Background::load(MfcArchive &file) {
 	debug(5, "Background::load()");
 	_bgname = file.readPascalString();
@@ -152,6 +158,10 @@ PictureObject::PictureObject() {
 	_objtype = kObjTypePictureObject;
 }
 
+PictureObject::~PictureObject() {
+	warning("STUB: PictureObject::~PictureObject()");
+}
+
 PictureObject::PictureObject(PictureObject *src) : GameObject(src) {
 	_picture = src->_picture;
 	_ox2 = _ox;
@@ -222,7 +232,7 @@ void PictureObject::drawAt(int x, int y) {
 
 bool PictureObject::setPicAniInfo(PicAniInfo *picAniInfo) {
 	if (!(picAniInfo->type & 2) || (picAniInfo->type & 1)) {
-		error("Picture::setPicAniInfo(): Wrong type: %d", picAniInfo->type);
+		error("PictureObject::setPicAniInfo(): Wrong type: %d", picAniInfo->type);
 
 		return false;
 	}
@@ -269,6 +279,11 @@ bool PictureObject::isPixelHitAtPos(int x, int y) {
 	return res;
 }
 
+void PictureObject::setOXY2() {
+	_ox2 = _ox;
+	_oy2 = _oy;
+}
+
 GameObject::GameObject() {
 	_okeyCode = 0;
 	_flags = 0;
@@ -469,7 +484,7 @@ void Picture::freePicture() {
 	if (_bitmap) {
 		if (testFlags() && !_field_54) {
 			freeData();
-			delete _bitmap;
+			free(_bitmap);
 			_bitmap = 0;
 		}
 	}
@@ -486,6 +501,11 @@ void Picture::freePicture() {
 	}
 }
 
+void Picture::freePixelData() {
+	freePicture();
+	freeData();
+}
+
 bool Picture::load(MfcArchive &file) {
 	debug(5, "Picture::load()");
 	MemoryObject::load(file);