diff options
author | Colin Snover | 2016-07-02 22:23:33 -0500 |
---|---|---|
committer | Colin Snover | 2016-07-10 10:18:30 -0500 |
commit | 19f90177b72f4b18311cc4cff488c6567434a5fe (patch) | |
tree | 68243d71b3da9f19a966c46dd48f7f752a089d7e /engines/sci/engine | |
parent | b6dbc79021be137367372faa3b53081e7a332efd (diff) | |
download | scummvm-rg350-19f90177b72f4b18311cc4cff488c6567434a5fe.tar.gz scummvm-rg350-19f90177b72f4b18311cc4cff488c6567434a5fe.tar.bz2 scummvm-rg350-19f90177b72f4b18311cc4cff488c6567434a5fe.zip |
SCI32: Clean up Video32/VMDPlayer
Diffstat (limited to 'engines/sci/engine')
-rw-r--r-- | engines/sci/engine/kernel.h | 4 | ||||
-rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
-rw-r--r-- | engines/sci/engine/kvideo.cpp | 12 |
3 files changed, 3 insertions, 15 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index d49f0649c1..845e63af79 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -447,9 +447,7 @@ reg_t kPlayVMDInit(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMDClose(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMDPlayUntilEvent(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMDShowCursor(EngineState *s, int argc, reg_t *argv); -reg_t kPlayVMDStartBlob(EngineState *s, int argc, reg_t *argv); -reg_t kPlayVMDStopBlobs(EngineState *s, int argc, reg_t *argv); -reg_t kPlayVMDBlack(EngineState *s, int argc, reg_t *argv); +reg_t kPlayVMDSetBlackoutArea(EngineState *s, int argc, reg_t *argv); reg_t kPlayVMDRestrictPalette(EngineState *s, int argc, reg_t *argv); reg_t kIsHiRes(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 6e5add15e2..31a9938514 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -423,7 +423,7 @@ static const SciKernelMapSubEntry kPlayVMD_subops[] = { { SIG_SINCE_SCI21, 16, MAP_CALL(PlayVMDShowCursor), "i", NULL }, { SIG_SINCE_SCI21, 17, MAP_DUMMY(PlayVMDStartBlob), "", NULL }, { SIG_SINCE_SCI21, 18, MAP_DUMMY(PlayVMDStopBlobs), "", NULL }, - { SIG_SINCE_SCI21, 21, MAP_CALL(PlayVMDBlack), "iiii", NULL }, + { SIG_SINCE_SCI21, 21, MAP_CALL(PlayVMDSetBlackoutArea), "iiii", NULL }, { SIG_SINCE_SCI21, 23, MAP_CALL(PlayVMDRestrictPalette), "ii", NULL }, SCI_SUBOPENTRY_TERMINATOR }; diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index aa37da6ea0..1096e78cca 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -342,17 +342,7 @@ reg_t kPlayVMDShowCursor(EngineState *s, int argc, reg_t *argv) { return s->r_acc; } -reg_t kPlayVMDStartBlob(EngineState *s, int argc, reg_t *argv) { - debug("kPlayVMDStartBlob"); - return s->r_acc; -} - -reg_t kPlayVMDStopBlobs(EngineState *s, int argc, reg_t *argv) { - debug("kPlayVMDStopBlobs"); - return s->r_acc; -} - -reg_t kPlayVMDBlack(EngineState *s, int argc, reg_t *argv) { +reg_t kPlayVMDSetBlackoutArea(EngineState *s, int argc, reg_t *argv) { const int16 scriptWidth = g_sci->_gfxFrameout->getCurrentBuffer().scriptWidth; const int16 scriptHeight = g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight; |