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

6
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;

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);
}; };