[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm queen.vcproj,NONE,1.1 bs2.vcproj,1.5,1.6 scumm.vcproj,1.12,1.13 scummvm.sln,1.3,1.4 scummvm.vcproj,1.13,1.14 simon.vcproj,1.4,1.5 sky.vcproj,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.181,1.182 actor.h,1.43,1.44 akos.cpp,1.85,1.86 akos.h,1.24,1.25 base-costume.h,1.13,1.14 bomp.cpp,2.11,2.12 boxes.cpp,1.65,1.66 camera.cpp,2.11,2.12 charset.cpp,2.64,2.65 charset.h,2.20,2.21 costume.cpp,1.114,1.115 costume.h,1.23,1.24 debugger.cpp,1.90,1.91 debugger.h,1.26,1.27 dialogs.cpp,1.72,1.73 dialogs.h,1.23,1.24 gfx.cpp,2.215,2.216 gfx.h,1.46,1.47 imuse.cpp,2.101,2.102 imuse.h,1.46,1.47 imuse_digi.cpp,1.48,1.49 imuse_digi.h,1.14,1.15 imuse_internal.h,2.26,2.27 intern.h,2.113,2.114 nut_renderer.cpp,1.32,1.33 nut_renderer.h,1.13,1.14 object.cpp,1.142,1.143 player_mod.cpp,2.6,2.7 player_mod.h,2.5,2.6 player_v1.cpp,1.10,1.11 player_v1.h,1.7,1.8 player_v2.cpp,2.35,2.36 player_v2.h,2.16,2.17 player_v2a.cpp,2.8,2.9 player_v2a.h,2.1,2.2 player_v3a.cpp,1.12,1.13 player_v3a.h,1.9,1.10 resource.cpp,1.162,1.163 resource_v2.cpp,1.33,1.34 resource_v3.cpp,1.21,1.22 resource_v4.cpp,1.6,1.7 saveload.cpp,1.110,1.111 script.cpp,1.134,1.135 script_v2.cpp,2.203,2.204 script_v5.cpp,1.194,1.195 script_v6.cpp,1.200,1.201 script_v8.cpp,2.197,2.198 scumm.h,1.306,1.307 scummvm.cpp,2.411,2.412 sound.cpp,1.259,1.260 sound.h,1.48,1.49 string.cpp,1.160,1.161 usage_bits.cpp,1.7,1.8 vars.cpp,1.59,1.60 verbs.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm queen.vcproj,NONE,1.1 bs2.vcproj,1.5,1.6 scumm.vcproj,1.12,1.13 scummvm.sln,1.3,1.4 scummvm.vcproj,1.13,1.14 simon.vcproj,1.4,1.5 sky.vcproj,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.181,1.182 actor.h,1.43,1.44 akos.cpp,1.85,1.86 akos.h,1.24,1.25 base-costume.h,1.13,1.14 bomp.cpp,2.11,2.12 boxes.cpp,1.65,1.66 camera.cpp,2.11,2.12 charset.cpp,2.64,2.65 charset.h,2.20,2.21 costume.cpp,1.114,1.115 costume.h,1.23,1.24 debugger.cpp,1.90,1.91 debugger.h,1.26,1.27 dialogs.cpp,1.72,1.73 dialogs.h,1.23,1.24 gfx.cpp,2.215,2.216 gfx.h,1.46,1.47 imuse.cpp,2.101,2.102 imuse.h,1.46,1.47 imuse_digi.cpp,1.48,1.49 imuse_digi.h,1.14,1.15 imuse_internal.h,2.26,2.27 intern.h,2.113,2.114 nut_renderer.cpp,1.32,1.33 nut_renderer.h,1.13,1.14 object.cpp,1.142,1.143 player_mod.cpp,2.6,2.7 player_mod.h,2.5,2.6 player_v1.cpp,1.10,1.11 player_v1.h,1.7,1.8 player_v2.cpp,2.35,2.36 player_v2.h,2.16,2.17 player_v2a.cpp,2.8,2.9 player_v2a.h,2.1,2.2 player_v3a.cpp,1.12,1.13 player_v3a.h,1.9,1.10 resource.cpp,1.162,1.163 resource_v2.cpp,1.33,1.34 resource_v3.cpp,1.21,1.22 resource_v4.cpp,1.6,1.7 saveload.cpp,1.110,1.111 script.cpp,1.134,1.135 script_v2.cpp,2.203,2.204 script_v5.cpp,1.194,1.195 script_v6.cpp,1.200,1.201 script_v8.cpp,2.197,2.198 scumm.h,1.306,1.307 scummvm.cpp,2.411,2.412 sound.cpp,1.259,1.260 sound.h,1.48,1.49 string.cpp,1.160,1.161 usage_bits.cpp,1.7,1.8 vars.cpp,1.59,1.60 verbs.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list