[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.444,1.445

Travis Howell kirben at users.sourceforge.net
Sun Aug 22 02:39:11 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18663/scumm

Modified Files:
	scumm.h 
Log Message:

Make function protected again


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -d -r1.444 -r1.445
--- scumm.h	22 Aug 2004 09:14:18 -0000	1.444
+++ scumm.h	22 Aug 2004 09:38:18 -0000	1.445
@@ -574,7 +574,6 @@
 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 @@
 
 	bool isScriptInUse(int script) const;
 	bool isRoomScriptRunning(int script) const;
+	bool isScriptRunning(int script) const;
 
 	void killAllScriptsExceptCurrent();
 	void killScriptsAndResources();





More information about the Scummvm-git-logs mailing list