diff options
author | Paul Gilbert | 2010-06-07 09:19:42 +0000 |
---|---|---|
committer | Paul Gilbert | 2010-06-07 09:19:42 +0000 |
commit | 34f7c05e4dd0e7cd3f84576f57593d034f666d31 (patch) | |
tree | be457ad91a6ec54dc233a6db1981d9558498fcbf /engines/m4/graphics.cpp | |
parent | 43ec405ffe08cef3168c9618be6169e6d81290f8 (diff) | |
download | scummvm-rg350-34f7c05e4dd0e7cd3f84576f57593d034f666d31.tar.gz scummvm-rg350-34f7c05e4dd0e7cd3f84576f57593d034f666d31.tar.bz2 scummvm-rg350-34f7c05e4dd0e7cd3f84576f57593d034f666d31.zip |
Initial conversion of the AnimviewView class to use the expanded MadsAnimation class, rather than the older AAFile skeleton class
svn-id: r49478
Diffstat (limited to 'engines/m4/graphics.cpp')
-rw-r--r-- | engines/m4/graphics.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp index 29aaa184a3..8624f18da1 100644 --- a/engines/m4/graphics.cpp +++ b/engines/m4/graphics.cpp @@ -633,16 +633,6 @@ void M4Surface::rexLoadBackground(Common::SeekableReadStream *source, RGBList ** int sceneWidth = sourceUnc->readUint16LE(); int sceneHeight = sourceUnc->readUint16LE(); int sceneSize = sceneWidth * sceneHeight; - if (sceneWidth > this->width()) { - warning("Background width is %i, too large to fit in screen. Setting it to %i", sceneWidth, this->width()); - sceneWidth = this->width(); - sceneSize = sceneWidth * sceneHeight; - } - if (sceneHeight > this->height()) { - warning("Background height is %i, too large to fit in screen.Setting it to %i", sceneHeight, this->height()); - sceneHeight = this->height(); - sceneSize = sceneWidth * sceneHeight; - } // Set palette if (!palData) { @@ -658,6 +648,7 @@ void M4Surface::rexLoadBackground(Common::SeekableReadStream *source, RGBList ** sourceUnc = packData.getItemStream(1); assert((int)sourceUnc->size() >= sceneSize); + create(sceneWidth, sceneHeight, 1); byte *pData = (byte *)pixels; sourceUnc->read(pData, sceneSize); |