aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-24 01:15:50 +0200
committerFilippos Karapetis2015-12-24 01:32:22 +0200
commit7a7a25c91d2c51c465c7d4131c90b6114f715940 (patch)
treeae0857167b8ad6b23c5a798890885cc259dd2207
parentb67b39038bb307a7fd384f6ab985919c32f79d73 (diff)
downloadscummvm-rg350-7a7a25c91d2c51c465c7d4131c90b6114f715940.tar.gz
scummvm-rg350-7a7a25c91d2c51c465c7d4131c90b6114f715940.tar.bz2
scummvm-rg350-7a7a25c91d2c51c465c7d4131c90b6114f715940.zip
LAB: The maxHeight parameter of readPict() is no longer used
-rw-r--r--engines/lab/dispman.cpp4
-rw-r--r--engines/lab/dispman.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index f490503145..0f2bc933e8 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -88,7 +88,7 @@ void DisplayMan::loadBackPict(const Common::String fileName, uint16 *highPal) {
_vm->_anim->_noPalChange = false;
}
-void DisplayMan::readPict(const Common::String filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer, uint16 maxHeight) {
+void DisplayMan::readPict(const Common::String filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer) {
_vm->_anim->stopDiff();
loadPict(filename);
_vm->updateMusicAndEvents();
@@ -813,7 +813,7 @@ void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, const Common::String fi
_vm->_curFileName = _vm->getPictName(closePtrList);
byte *bitMapBuffer = new byte[_screenWidth * (lastY + 5)];
- readPict(_vm->_curFileName, true, false, bitMapBuffer, lastY + 5);
+ readPict(_vm->_curFileName, true, false, bitMapBuffer);
setPalette(_vm->_anim->_diffPalette, 256);
diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h
index 3761e31be9..8e9cfdff51 100644
--- a/engines/lab/dispman.h
+++ b/engines/lab/dispman.h
@@ -85,7 +85,7 @@ public:
/**
* Reads in a picture into the display bitmap.
*/
- void readPict(const Common::String filename, bool playOnce = true, bool onlyDiffData = false, byte *memoryBuffer = nullptr, uint16 maxHeight = 0);
+ void readPict(const Common::String filename, bool playOnce = true, bool onlyDiffData = false, byte *memoryBuffer = nullptr);
void freePict();
/**