aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2009-03-09 03:45:23 +0000
committerMax Horn2009-03-09 03:45:23 +0000
commite080a593378bcaf44a7b44c297dcb291a2b584a8 (patch)
tree6a565b0e712d7f6a8b2d8151d9701d17d9922f63 /engines/scumm
parent93240b003adb08d83703b03e192bd5905aa61884 (diff)
downloadscummvm-rg350-e080a593378bcaf44a7b44c297dcb291a2b584a8.tar.gz
scummvm-rg350-e080a593378bcaf44a7b44c297dcb291a2b584a8.tar.bz2
scummvm-rg350-e080a593378bcaf44a7b44c297dcb291a2b584a8.zip
Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks
svn-id: r39255
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/animation_he.cpp2
-rw-r--r--engines/scumm/he/animation_he.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 4a64f16f42..0cc4419778 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -33,7 +33,7 @@
namespace Scumm {
MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer)
- : SMKPlayer(mixer), _vm(vm), _mixer(mixer) {
+ : SmackerDecoder(mixer), _vm(vm), _mixer(mixer) {
_flags = 0;
_wizResNum = 0;
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index 93acc2253c..966db0e3f7 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -36,7 +36,7 @@ namespace Scumm {
class ScummEngine_v90he;
-class MoviePlayer : public Graphics::SMKPlayer {
+class MoviePlayer : public Graphics::SmackerDecoder {
ScummEngine_v90he *_vm;
Audio::Mixer *_mixer;