thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Remove non-virtual destructor which prevents the superclass one from execution.

Browse source
This commit is contained in:
Eugene Sandulenko 2016-05-16 16:53:26 +02:00
parent f6d8e0f5ed
commit cbb403ff55
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sherlock/image_file.cpp
View file

@ -302,12 +302,6 @@ ImageFile3DO::ImageFile3DO(Common::SeekableReadStream &stream, bool isRoomData)
} }
} }
ImageFile3DO::~ImageFile3DO() {
// already done in ImageFile destructor
//for (uint idx = 0; idx < size(); ++idx)
// (*this)[idx]._frame.free();
}
void ImageFile3DO::load(Common::SeekableReadStream &stream, bool isRoomData) { void ImageFile3DO::load(Common::SeekableReadStream &stream, bool isRoomData) {
uint32 headerId = 0; uint32 headerId = 0;
@ -380,7 +374,7 @@ void ImageFile3DO::loadAnimationFile(Common::SeekableReadStream &stream) {
if (streamLeft < celDataSize) if (streamLeft < celDataSize)
error("load3DOAnimationFile: expected cel data, not enough bytes"); error("load3DOAnimationFile: expected cel data, not enough bytes");
// //
// Load data for frame and decompress it // Load data for frame and decompress it
byte *data = new byte[celDataSize]; byte *data = new byte[celDataSize];
stream.read(data, celDataSize); stream.read(data, celDataSize);
@ -683,7 +677,7 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) {
if (ccbFlags & 0x200) // bit 9 if (ccbFlags & 0x200) // bit 9
ccbFlags_compressed = true; ccbFlags_compressed = true;
// PRE0 first 3 bits define how many bits per encoded pixel are used // PRE0 first 3 bits define how many bits per encoded pixel are used
ccbPRE0_bitsPerPixel = imagefile3DO_cel_bitsPerPixelLookupTable[ccbPRE0 & 0x07]; ccbPRE0_bitsPerPixel = imagefile3DO_cel_bitsPerPixelLookupTable[ccbPRE0 & 0x07];
if (!ccbPRE0_bitsPerPixel) if (!ccbPRE0_bitsPerPixel)
@ -713,7 +707,7 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) {
stream.read(celDataPtr, celDataSize); stream.read(celDataPtr, celDataSize);
streamLeft -= celDataSize; streamLeft -= celDataSize;
// Set up frame // Set up frame
{ {
ImageFrame imageFrame; ImageFrame imageFrame;

1
engines/sherlock/image_file.h
View file

@ -155,7 +155,6 @@ private:
public: public:
ImageFile3DO(const Common::String &name, ImageFile3DOType imageFile3DOType); ImageFile3DO(const Common::String &name, ImageFile3DOType imageFile3DOType);
ImageFile3DO(Common::SeekableReadStream &stream, bool isRoomData = false); ImageFile3DO(Common::SeekableReadStream &stream, bool isRoomData = false);
~ImageFile3DO();
static void setVm(SherlockEngine *vm); static void setVm(SherlockEngine *vm);
}; };