[Scummvm-cvs-logs] scummvm master -> ec03857d7dd7614675b41cfc412be20b733b469a

bluegr bluegr at gmail.com
Thu Apr 9 13:09:47 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec03857d7d MADS: Fix a regression in V2 games


Commit: ec03857d7dd7614675b41cfc412be20b733b469a
    https://github.com/scummvm/scummvm/commit/ec03857d7dd7614675b41cfc412be20b733b469a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-04-09T14:08:48+03:00

Commit Message:
MADS: Fix a regression in V2 games

Changed paths:
    engines/mads/scene_data.cpp



diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index e594406..e48bcd8 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -451,8 +451,6 @@ void SceneInfo::loadMadsV2Background(int sceneId, const Common::String &resName,
 
 		fab.decompress(compressedTileData, compressedTileDataSize, (byte*)newTile->getPixels(), tileWidth * tileHeight);
 		tileSet.push_back(TileSetList::value_type(newTile));
-		newTile->free();
-		delete newTile;
 		delete[] compressedTileData;
 	}
 
@@ -471,6 +469,7 @@ void SceneInfo::loadMadsV2Background(int sceneId, const Common::String &resName,
 			for (int i = 0; i < tileIndex; i++)
 				++tile;
 			((*tile).get())->copyTo(&bgSurface, Common::Point(x * tileWidth, y * tileHeight));
+			((*tile).get())->free();
 		}
 	}
 	tileSet.clear();






More information about the Scummvm-git-logs mailing list