[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.99,1.100 smush_player.h,1.22,1.23
Max Horn
fingolfin at users.sourceforge.net
Mon Jan 19 11:35:04 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv28494/smush
Modified Files:
smush_player.cpp smush_player.h
Log Message:
smush and insane only work with V6 (this will allow moving some stuff from ScummEngine to ScummEngine_v6)
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- smush_player.cpp 16 Jan 2004 22:18:54 -0000 1.99
+++ smush_player.cpp 19 Jan 2004 19:34:48 -0000 1.100
@@ -211,7 +211,7 @@
((SmushPlayer *)refCon)->parseNextFrame();
}
-SmushPlayer::SmushPlayer(ScummEngine *scumm, int speed) {
+SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
_vm = scumm;
_version = -1;
_nbframes = 0;
Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- smush_player.h 8 Jan 2004 20:37:26 -0000 1.22
+++ smush_player.h 19 Jan 2004 19:34:48 -0000 1.23
@@ -30,6 +30,7 @@
namespace Scumm {
+class ScummEngine_v6;
class SmushFont;
class SmushMixer;
class StringResource;
@@ -37,7 +38,7 @@
class SmushPlayer {
friend class Insane;
private:
- ScummEngine *_vm;
+ ScummEngine_v6 *_vm;
int _version;
int32 _nbframes;
SmushMixer *_smixer;
@@ -71,7 +72,7 @@
bool _middleAudio;
public:
- SmushPlayer(ScummEngine *scumm, int speed);
+ SmushPlayer(ScummEngine_v6 *scumm, int speed);
~SmushPlayer();
void play(const char *filename, const char *directory);
More information about the Scummvm-git-logs
mailing list