aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
authorMax Horn2003-06-25 23:25:52 +0000
committerMax Horn2003-06-25 23:25:52 +0000
commit870ce2879e934a4bb559c2a9fb3ff14e9fb6be99 (patch)
tree40047757bcbe2b5c382ac24b31bfdca878c7cc4e /scumm/script.cpp
parent3351f4257b56118a87901f491e74af4fd952c0b7 (diff)
downloadscummvm-rg350-870ce2879e934a4bb559c2a9fb3ff14e9fb6be99.tar.gz
scummvm-rg350-870ce2879e934a4bb559c2a9fb3ff14e9fb6be99.tar.bz2
scummvm-rg350-870ce2879e934a4bb559c2a9fb3ff14e9fb6be99.zip
added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
svn-id: r8648
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 57eb81e49f..a61f07fcba 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -969,27 +969,27 @@ void Scumm::decreaseScriptDelay(int amount) {
}
}
-bool Scumm::isScriptInUse(int script) {
+bool Scumm::isScriptInUse(int script) const {
int i;
- ScriptSlot *ss = vm.slot;
+ const ScriptSlot *ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
if (ss->number == script)
return true;
return false;
}
-bool Scumm::isScriptRunning(int script) {
+bool Scumm::isScriptRunning(int script) const {
int i;
- ScriptSlot *ss = vm.slot;
+ const ScriptSlot *ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
if (ss->number == script && (ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL) && ss->status != ssDead)
return true;
return false;
}
-bool Scumm::isRoomScriptRunning(int script) {
+bool Scumm::isRoomScriptRunning(int script) const {
int i;
- ScriptSlot *ss = vm.slot;
+ const ScriptSlot *ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
if (ss->number == script && ss->where == WIO_ROOM && ss->status != ssDead)
return true;