[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.53,1.54 smush_player.h,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Thu Oct 2 15:43:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv16448/smush

Modified Files:
	smush_player.cpp smush_player.h 
Log Message:
renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- smush_player.cpp	24 Sep 2003 06:33:59 -0000	1.53
+++ smush_player.cpp	2 Oct 2003 22:42:03 -0000	1.54
@@ -196,7 +196,7 @@
 SmushPlayer *player;
 
 void SmushPlayer::timerCallback(void *refCon) {
-	Scumm *scumm = (Scumm *)refCon;
+	ScummEngine *scumm = (ScummEngine *)refCon;
 	if (!scumm->_smushPlay)
 		return;
 
@@ -205,7 +205,7 @@
 	player->_smushProcessFrame = false;
 }
 
-SmushPlayer::SmushPlayer(Scumm *scumm, int speed, bool subtitles) {
+SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed, bool subtitles) {
 	player = this;
 
 	_scumm = scumm;

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smush_player.h	11 Sep 2003 10:32:15 -0000	1.10
+++ smush_player.h	2 Oct 2003 22:42:03 -0000	1.11
@@ -34,7 +34,7 @@
 
 class SmushPlayer {
 private:
-	Scumm *_scumm;
+	ScummEngine *_scumm;
 	int _version;
 	int32 _nbframes;
 	SmushMixer *_smixer;
@@ -68,7 +68,7 @@
 	volatile bool _smushProcessFrame;
 
 public:
-	SmushPlayer(Scumm *, int, bool);
+	SmushPlayer(ScummEngine *, int, bool);
 	~SmushPlayer();
 
 	void play(const char *filename, const char *directory);





More information about the Scummvm-git-logs mailing list