diff options
author | Colin Snover | 2016-01-20 16:12:56 -0600 |
---|---|---|
committer | Colin Snover | 2016-01-20 16:12:56 -0600 |
commit | 5b6b20f421c3f88b6cbd28e735a7496705c2ef7e (patch) | |
tree | 6442619d8e2e55fd33d59638a389ebafbac3a619 /engines | |
parent | 19a5265647af68ed36767ddd341f221eee19c4c8 (diff) | |
download | scummvm-rg350-5b6b20f421c3f88b6cbd28e735a7496705c2ef7e.tar.gz scummvm-rg350-5b6b20f421c3f88b6cbd28e735a7496705c2ef7e.tar.bz2 scummvm-rg350-5b6b20f421c3f88b6cbd28e735a7496705c2ef7e.zip |
SCI: Fix SCI32 kPalVary subops 1, 4, 5, 7, 8, 9 using wrong indexes
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/engine/kgraphics32.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index e87849201e..8d41393a9e 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -766,8 +766,8 @@ reg_t kPalVarySetVary(EngineState *s, int argc, reg_t *argv) { } reg_t kPalVarySetPercent(EngineState *s, int argc, reg_t *argv) { - int time = argc > 1 ? argv[1].toSint16() * 60 : 0; - int16 percent = argc > 2 ? argv[2].toSint16() : 0; + int time = argc > 0 ? argv[0].toSint16() * 60 : 0; + int16 percent = argc > 1 ? argv[1].toSint16() : 0; g_sci->_gfxPalette32->setVaryPercent(percent, time, -1, -1); return NULL_REG; } @@ -782,31 +782,31 @@ reg_t kPalVaryOff(EngineState *s, int argc, reg_t *argv) { } reg_t kPalVaryMergeTarget(EngineState *s, int argc, reg_t *argv) { - GuiResourceId paletteId = argv[1].toUint16(); + GuiResourceId paletteId = argv[0].toUint16(); g_sci->_gfxPalette32->kernelPalVaryMergeTarget(paletteId); return make_reg(0, g_sci->_gfxPalette32->getVaryPercent()); } reg_t kPalVarySetTime(EngineState *s, int argc, reg_t *argv) { - int time = argv[1].toSint16() * 60; + int time = argv[0].toSint16() * 60; g_sci->_gfxPalette32->setVaryTime(time); return NULL_REG; } reg_t kPalVarySetTarget(EngineState *s, int argc, reg_t *argv) { - GuiResourceId paletteId = argv[1].toUint16(); + GuiResourceId paletteId = argv[0].toUint16(); g_sci->_gfxPalette32->kernelPalVarySetTarget(paletteId); return make_reg(0, g_sci->_gfxPalette32->getVaryPercent()); } reg_t kPalVarySetStart(EngineState *s, int argc, reg_t *argv) { - GuiResourceId paletteId = argv[1].toUint16(); + GuiResourceId paletteId = argv[0].toUint16(); g_sci->_gfxPalette32->kernelPalVarySetStart(paletteId); return make_reg(0, g_sci->_gfxPalette32->getVaryPercent()); } reg_t kPalVaryMergeStart(EngineState *s, int argc, reg_t *argv) { - GuiResourceId paletteId = argv[1].toUint16(); + GuiResourceId paletteId = argv[0].toUint16(); g_sci->_gfxPalette32->kernelPalVaryMergeStart(paletteId); return make_reg(0, g_sci->_gfxPalette32->getVaryPercent()); } |