aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorTravis Howell2004-08-22 09:38:18 +0000
committerTravis Howell2004-08-22 09:38:18 +0000
commitbb3cc5b0779711bc317d68b74f835f94a68350b2 (patch)
treefb6133c580151a7d3fbd3fe6797abcaaf4815d7d /scumm/scumm.h
parenta13966d64ce15497f2bb6d16b000283e7caa297a (diff)
downloadscummvm-rg350-bb3cc5b0779711bc317d68b74f835f94a68350b2.tar.gz
scummvm-rg350-bb3cc5b0779711bc317d68b74f835f94a68350b2.tar.bz2
scummvm-rg350-bb3cc5b0779711bc317d68b74f835f94a68350b2.zip
Make function protected again
svn-id: r14679
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index c25e8e9c25..cb4b187c7e 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -574,7 +574,6 @@ protected:
public:
void runScript(int script, bool freezeResistant, bool recursive, int *lvarptr);
void stopScript(int script);
- bool isScriptRunning(int script) const; // FIXME - should be protected, used by Sound::startTalkSound
void nukeArrays(int script);
protected:
@@ -592,6 +591,7 @@ protected:
bool isScriptInUse(int script) const;
bool isRoomScriptRunning(int script) const;
+ bool isScriptRunning(int script) const;
void killAllScriptsExceptCurrent();
void killScriptsAndResources();