aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.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/scummvm.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/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index c7e733ed59..055461675b 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1244,9 +1244,9 @@ void Scumm::startScene(int room, Actor * a, int objectNr) {
void Scumm::initRoomSubBlocks() {
int i, offs;
- byte *ptr;
+ const byte *ptr;
byte *roomptr, *searchptr, *roomResPtr;
- RoomHeader *rmhd;
+ const RoomHeader *rmhd;
_ENCD_offs = 0;
_EXCD_offs = 0;
@@ -1274,9 +1274,9 @@ void Scumm::initRoomSubBlocks() {
// Determine the room dimensions (width/height)
//
if (_features & GF_OLD_BUNDLE)
- rmhd = (RoomHeader *)(roomptr + 4);
+ rmhd = (const RoomHeader *)(roomptr + 4);
else
- rmhd = (RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
+ rmhd = (const RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
if (_features & GF_AFTER_V8) {
_roomWidth = READ_LE_UINT32(&(rmhd->v8.width));
@@ -1610,7 +1610,7 @@ void Scumm::setScaleSlot(int slot, int x1, int y1, int scale1, int x2, int y2, i
_scaleSlots[slot-1].scale1 = scale1;
}
-void Scumm::dumpResource(const char *tag, int idx, byte *ptr, int length) {
+void Scumm::dumpResource(const char *tag, int idx, const byte *ptr, int length) {
char buf[256];
File out;