aboutsummaryrefslogtreecommitdiff
path: root/scumm/verbs.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-28 20:01:47 +0000
committerMax Horn2003-05-28 20:01:47 +0000
commit1f70da01556164c5b39bb0e804e2c919dd7b3c83 (patch)
tree3b39f7df442c0cc00fb9bf93dd33808e7982f89b /scumm/verbs.cpp
parent01ac371c6afd94b4987528a49ee2bfe8c1cf84ea (diff)
downloadscummvm-rg350-1f70da01556164c5b39bb0e804e2c919dd7b3c83.tar.gz
scummvm-rg350-1f70da01556164c5b39bb0e804e2c919dd7b3c83.tar.bz2
scummvm-rg350-1f70da01556164c5b39bb0e804e2c919dd7b3c83.zip
const as const can!
svn-id: r8058
Diffstat (limited to 'scumm/verbs.cpp')
-rw-r--r--scumm/verbs.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 2138ac458f..a8dbabe5e1 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -287,12 +287,13 @@ void Scumm::restoreVerbBG(int verb) {
void Scumm::drawVerbBitmap(int verb, int x, int y) {
VirtScreen *vs;
VerbSlot *vst;
- byte twobufs, *imptr = 0;
+ byte twobufs;
+ const byte *imptr = 0;
int ydiff, xstrip;
int imgw, imgh;
int i, tmp;
byte *obim;
- ImageHeader *imhd;
+ const ImageHeader *imhd;
uint32 size;
if ((vs = findVirtScreen(y)) == NULL)
@@ -319,7 +320,7 @@ void Scumm::drawVerbBitmap(int verb, int x, int y) {
imgh = (*(obim + size + 17)) >> 3;
imptr = (obim + 8);
} else {
- imhd = (ImageHeader *)findResourceData(MKID('IMHD'), obim);
+ imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
if (_features & GF_AFTER_V7) {
imgw = READ_LE_UINT16(&imhd->v7.width) >> 3;
imgh = READ_LE_UINT16(&imhd->v7.height) >> 3;
@@ -393,8 +394,8 @@ void Scumm::killVerb(int slot) {
}
void Scumm::setVerbObject(uint room, uint object, uint verb) {
- byte *obimptr;
- byte *obcdptr;
+ const byte *obimptr;
+ const byte *obcdptr;
uint32 size, size2;
FindObjectInRoom foir;
int i;