diff options
author | Strangerke | 2015-12-20 15:27:23 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:35:31 +0100 |
commit | a4d3bda5c179fd1019f0812f04e6913fba863c28 (patch) | |
tree | 68b325979059f2b68f3066e4af904e9b9e508278 /engines/lab/dispman.cpp | |
parent | a41f9076c597714075b0ecd5f41cd6f6cfd2add2 (diff) | |
download | scummvm-rg350-a4d3bda5c179fd1019f0812f04e6913fba863c28.tar.gz scummvm-rg350-a4d3bda5c179fd1019f0812f04e6913fba863c28.tar.bz2 scummvm-rg350-a4d3bda5c179fd1019f0812f04e6913fba863c28.zip |
LAB: Use an array of Common::Strings instead of bytes in Action
Diffstat (limited to 'engines/lab/dispman.cpp')
-rw-r--r-- | engines/lab/dispman.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index f570493e99..bb07ba3f66 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -730,7 +730,7 @@ void DisplayMan::copyPage(uint16 width, uint16 height, uint16 nheight, uint16 st } } -void DisplayMan::doScrollWipe(char *filename) { +void DisplayMan::doScrollWipe(Common::String filename) { _vm->_event->mouseHide(); uint16 width = _vm->_utils->vgaScaleX(320); uint16 height = _vm->_utils->vgaScaleY(149) + _vm->_utils->svgaCord(2); @@ -740,7 +740,7 @@ void DisplayMan::doScrollWipe(char *filename) { _vm->waitTOF(); } - readPict(filename, true, true); + readPict(filename.c_str(), true, true); setPalette(_vm->_anim->_diffPalette, 256); byte *mem = _vm->_anim->_rawDiffBM._planes[0]; @@ -824,7 +824,7 @@ void DisplayMan::doScrollBounce() { _vm->_event->mouseShow(); } -void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, char *filename) { +void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, Common::String filename) { uint16 lastY, linesLast; if (_vm->_isHiRes) { @@ -860,7 +860,7 @@ void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, char *filename) { setPen(0); } // for j - if (!filename) + if (!filename.size()) _vm->_curFileName = _vm->getPictName(closePtrList); else if (filename[0] > ' ') _vm->_curFileName = filename; @@ -911,7 +911,7 @@ void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, char *filename) { delete[] bitMapBuffer; } -void DisplayMan::doTransition(TransitionType transitionType, CloseDataPtr *closePtrList, char *filename) { +void DisplayMan::doTransition(TransitionType transitionType, CloseDataPtr *closePtrList, Common::String filename) { switch (transitionType) { case kTransitionWipe: case kTransitionTransporter: |