aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-31 02:09:57 +0000
committerMax Horn2002-12-31 02:09:57 +0000
commit166ea5bcee36aaab30ea6b7764bdc9872fc2dcf2 (patch)
tree50a5201e6cc80a9a7480c797b49458cd46d27b97 /scumm/object.cpp
parent1ce31266a981a94cdcdbf5831d0d02720b56ca71 (diff)
downloadscummvm-rg350-166ea5bcee36aaab30ea6b7764bdc9872fc2dcf2.tar.gz
scummvm-rg350-166ea5bcee36aaab30ea6b7764bdc9872fc2dcf2.tar.bz2
scummvm-rg350-166ea5bcee36aaab30ea6b7764bdc9872fc2dcf2.zip
get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping
svn-id: r6284
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 22b1b68155..43c28b0576 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -440,16 +440,15 @@ void Scumm::loadRoomObjects()
else
od->obj_nr = READ_LE_UINT16(&(cdhd->v5.obj_id));
-#ifdef DUMP_SCRIPTS
- do {
+ if (_dumpScripts) {
char buf[32];
sprintf(buf, "roomobj-%d-", _roomResource);
if (_features & GF_AFTER_V8)
// TODO - maybe V8 is not the only that needs this?
ptr = findResource(MKID('VERB'), ptr, 0);
dumpResource(buf, od->obj_nr, ptr);
- } while (0);
-#endif
+ }
+
searchptr = NULL;
}
@@ -514,13 +513,12 @@ void Scumm::loadRoomObjectsSmall()
od->OBCDoffset = ptr - room;
od->obj_nr = READ_LE_UINT16(ptr + 6);
-#ifdef DUMP_SCRIPTS
- do {
+ if (_dumpScripts) {
char buf[32];
sprintf(buf, "roomobj-%d-", _roomResource);
dumpResource(buf, od->obj_nr, ptr);
- } while (0);
-#endif
+ }
+
searchptr = NULL;
}