diff options
| -rw-r--r-- | engines/sci/console.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/seq_decoder.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/seq_decoder.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index fc49e2de22..0aefbadda6 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -216,7 +216,7 @@ void Console::postEnter() { _vm->_gamestate->_gui->hideCursor(); if (_videoFile.hasSuffix(".seq")) { - Graphics::SeqDecoder *seqDecoder = new Graphics::SeqDecoder(); + SeqDecoder *seqDecoder = new SeqDecoder(); Graphics::VideoPlayer *player = new Graphics::VideoPlayer(seqDecoder); if (seqDecoder->loadFile(_videoFile.c_str(), _videoFrameDelay)) player->playVideo(); diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 7c3763740d..25685ee448 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1027,7 +1027,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { Common::String filename = s->_segMan->getString(argv[0]); int delay = argv[1].toUint16(); // Time between frames in ticks - Graphics::SeqDecoder *seqDecoder = new Graphics::SeqDecoder(); + SeqDecoder *seqDecoder = new SeqDecoder(); Graphics::VideoPlayer *player = new Graphics::VideoPlayer(seqDecoder); if (seqDecoder->loadFile(filename.c_str(), delay)) player->playVideo(); diff --git a/engines/sci/seq_decoder.cpp b/engines/sci/seq_decoder.cpp index 634a8aeed7..b980103def 100644 --- a/engines/sci/seq_decoder.cpp +++ b/engines/sci/seq_decoder.cpp @@ -33,7 +33,7 @@ #include "sci/seq_decoder.h" -namespace Graphics { +namespace Sci { enum seqPalTypes { kSeqPalVariable = 0, @@ -238,4 +238,4 @@ bool SeqDecoder::decodeFrame(byte *rleData, int rleSize, byte *litData, int litS return true; } -} // End of namespace Graphics +} // End of namespace Sci diff --git a/engines/sci/seq_decoder.h b/engines/sci/seq_decoder.h index 30695ca0ff..7c810db05d 100644 --- a/engines/sci/seq_decoder.h +++ b/engines/sci/seq_decoder.h @@ -28,12 +28,12 @@ #include "graphics/video/video_player.h" -namespace Graphics { +namespace Sci { /** * Implementation of the Sierra SEQ decoder, used in KQ6 DOS floppy/CD and GK1 DOS */ -class SeqDecoder : public VideoDecoder { +class SeqDecoder : public Graphics::VideoDecoder { public: SeqDecoder() {} virtual ~SeqDecoder(); @@ -62,6 +62,6 @@ private: bool decodeFrame(byte *rleData, int rleSize, byte *litData, int litSize, byte *dest, int left, int width, int height, int colorKey); }; -} // End of namespace Graphics +} // End of namespace Sci #endif |