aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/dispman.cpp
diff options
context:
space:
mode:
authorStrangerke2015-12-20 17:21:55 +0100
committerWillem Jan Palenstijn2015-12-23 21:35:32 +0100
commitb53735ba064012b3c981d5ef497d5f8c2e974291 (patch)
tree256e3ae0afde08b4cd19bf1e62eeb3b93144c4ab /engines/lab/dispman.cpp
parent2edd0c51425db5e4407d38dbbeea788173f383b5 (diff)
downloadscummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.tar.gz
scummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.tar.bz2
scummvm-rg350-b53735ba064012b3c981d5ef497d5f8c2e974291.zip
LAB: Constify some parameters
Diffstat (limited to 'engines/lab/dispman.cpp')
-rw-r--r--engines/lab/dispman.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 9dbaf8d374..d493e935c5 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -69,7 +69,6 @@ DisplayMan::~DisplayMan() {
delete[] _displayBuffer;
}
-// From readPict.c. Reads in pictures and animations from disk.
void DisplayMan::loadPict(const Common::String filename) {
freePict();
_curBitmap = _vm->_resource->openDataFile(filename);
@@ -89,11 +88,9 @@ void DisplayMan::loadBackPict(const Common::String fileName, uint16 *highPal) {
_vm->_anim->_noPalChange = false;
}
-void DisplayMan::readPict(Common::String filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer, uint16 maxHeight) {
+void DisplayMan::readPict(const Common::String filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer, uint16 maxHeight) {
_vm->_anim->stopDiff();
-
loadPict(filename);
-
_vm->_music->updateMusic();
if (!_vm->_music->_loopSoundEffect)
@@ -544,7 +541,7 @@ void DisplayMan::closeFont(TextFont **font) {
}
}
-uint16 DisplayMan::textLength(TextFont *font, Common::String text) {
+uint16 DisplayMan::textLength(TextFont *font, const Common::String text) {
uint16 length = 0;
if (font) {
@@ -561,7 +558,7 @@ uint16 DisplayMan::textHeight(TextFont *tf) {
return (tf) ? tf->_height : 0;
}
-void DisplayMan::drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, Common::String text) {
+void DisplayMan::drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, const Common::String text) {
byte *vgaTop = getCurrentDrawingBuffer();
int numChars = text.size();
@@ -730,7 +727,7 @@ void DisplayMan::copyPage(uint16 width, uint16 height, uint16 nheight, uint16 st
}
}
-void DisplayMan::doScrollWipe(Common::String filename) {
+void DisplayMan::doScrollWipe(const Common::String filename) {
_vm->_event->mouseHide();
uint16 width = _vm->_utils->vgaScaleX(320);
uint16 height = _vm->_utils->vgaScaleY(149) + _vm->_utils->svgaCord(2);
@@ -824,7 +821,7 @@ void DisplayMan::doScrollBounce() {
_vm->_event->mouseShow();
}
-void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, Common::String filename) {
+void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, const Common::String filename) {
uint16 lastY, linesLast;
if (_vm->_isHiRes) {
@@ -911,7 +908,7 @@ void DisplayMan::doTransWipe(CloseDataPtr *closePtrList, Common::String filename
delete[] bitMapBuffer;
}
-void DisplayMan::doTransition(TransitionType transitionType, CloseDataPtr *closePtrList, Common::String filename) {
+void DisplayMan::doTransition(TransitionType transitionType, CloseDataPtr *closePtrList, const Common::String filename) {
switch (transitionType) {
case kTransitionWipe:
case kTransitionTransporter: