diff options
| author | Colin Snover | 2016-07-03 17:57:58 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-19 14:08:22 -0500 |
| commit | 0f2748b15a630f9d12ff0511d4e4cde79b8e915f (patch) | |
| tree | 28044c339c74b76bb963af54f382dcd5530e40de /engines/sci/sci.cpp | |
| parent | 7da359755d31b6a5a98fc791f795139441c82b56 (diff) | |
| download | scummvm-rg350-0f2748b15a630f9d12ff0511d4e4cde79b8e915f.tar.gz scummvm-rg350-0f2748b15a630f9d12ff0511d4e4cde79b8e915f.tar.bz2 scummvm-rg350-0f2748b15a630f9d12ff0511d4e4cde79b8e915f.zip | |
SCI32: Implement kRobot
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 2c8683ab8c..bca1aaeb12 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -73,17 +73,12 @@ #include "sci/graphics/transitions32.h" #include "sci/graphics/video32.h" #include "sci/sound/audio32.h" -// TODO: Move this to video32 -#include "sci/video/robot_decoder.h" #endif namespace Sci { SciEngine *g_sci = 0; - -class GfxDriver; - SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gameId) : Engine(syst), _gameDescription(desc), _gameId(gameId), _rng("sci") { @@ -132,6 +127,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam DebugMan.addDebugChannel(kDebugLevelScripts, "Scripts", "Notifies when scripts are unloaded"); DebugMan.addDebugChannel(kDebugLevelScriptPatcher, "ScriptPatcher", "Notifies when scripts are patched"); DebugMan.addDebugChannel(kDebugLevelWorkarounds, "Workarounds", "Notifies when workarounds are triggered"); + DebugMan.addDebugChannel(kDebugLevelVideo, "Video", "Video (SEQ, VMD, RBT) debugging"); DebugMan.addDebugChannel(kDebugLevelGC, "GC", "Garbage Collector debugging"); DebugMan.addDebugChannel(kDebugLevelResMan, "ResMan", "Resource manager debugging"); DebugMan.addDebugChannel(kDebugLevelOnStartup, "OnStartup", "Enter debugger at start of game"); @@ -173,7 +169,6 @@ SciEngine::~SciEngine() { delete _gfxControls32; delete _gfxPaint32; delete _gfxText32; - delete _robotDecoder; // GfxFrameout and GfxPalette32 must be deleted after Video32 since // destruction of screen items in the Video32 destructor relies on these // components @@ -708,7 +703,6 @@ void SciEngine::initGraphics() { #ifdef ENABLE_SCI32 _gfxControls32 = 0; _gfxText32 = 0; - _robotDecoder = 0; _gfxFrameout = 0; _gfxPaint32 = 0; _gfxPalette32 = 0; @@ -742,7 +736,6 @@ void SciEngine::initGraphics() { _gfxCursor32 = new GfxCursor32(); _gfxCompare = new GfxCompare(_gamestate->_segMan, _gfxCache, nullptr, _gfxCoordAdjuster); _gfxPaint32 = new GfxPaint32(_gamestate->_segMan); - _robotDecoder = new RobotDecoder(getPlatform() == Common::kPlatformMacintosh); _gfxTransitions32 = new GfxTransitions32(_gamestate->_segMan); _gfxFrameout = new GfxFrameout(_gamestate->_segMan, _resMan, _gfxCoordAdjuster, _gfxPalette32, _gfxTransitions32, _gfxCursor32); _gfxCursor32->init(_gfxFrameout->getCurrentBuffer()); |