diff options
| author | Colin Snover | 2016-07-25 13:40:51 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-01 10:37:14 -0500 |
| commit | 0f535e79f59c24545f40d52cf0cf25a3818cfffd (patch) | |
| tree | 9587fc745e617b982b534b668907cce5bb05eec4 /engines/sci/engine | |
| parent | 156c68fe58eb9f8d923d1f9dc1c3dac8436c9d82 (diff) | |
| download | scummvm-rg350-0f535e79f59c24545f40d52cf0cf25a3818cfffd.tar.gz scummvm-rg350-0f535e79f59c24545f40d52cf0cf25a3818cfffd.tar.bz2 scummvm-rg350-0f535e79f59c24545f40d52cf0cf25a3818cfffd.zip | |
SCI32: Add 6-argument signature of kAddPicAt
This is used by Torin in room 50900.
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics32.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 7d622d16d1..e0e4dcc233 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -823,7 +823,7 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(Robot), SIG_EVERYWHERE, "(.*)", NULL, NULL }, { MAP_CALL(Save), SIG_EVERYWHERE, "i(.*)", kSave_subops, NULL }, { MAP_CALL(Text), SIG_SINCE_SCI21MID, SIGFOR_ALL, "i(.*)", kText_subops, NULL }, - { MAP_CALL(AddPicAt), SIG_EVERYWHERE, "oiii", NULL, NULL }, + { MAP_CALL(AddPicAt), SIG_EVERYWHERE, "oiii(i)(i)", NULL, NULL }, { MAP_CALL(GetWindowsOption), SIG_EVERYWHERE, "i", NULL, NULL }, { MAP_CALL(WinHelp), SIG_EVERYWHERE, "(.*)", NULL, NULL }, { MAP_CALL(GetConfig), SIG_EVERYWHERE, "ro", NULL, NULL }, diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 40c048bdeb..44085da6e7 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -124,8 +124,9 @@ reg_t kAddPicAt(EngineState *s, int argc, reg_t *argv) { int16 x = argv[2].toSint16(); int16 y = argv[3].toSint16(); bool mirrorX = argc > 4 ? argv[4].toSint16() : false; + bool deleteDuplicate = argc > 5 ? argv[5].toSint16() : true; - g_sci->_gfxFrameout->kernelAddPicAt(planeObj, pictureId, x, y, mirrorX); + g_sci->_gfxFrameout->kernelAddPicAt(planeObj, pictureId, x, y, mirrorX, deleteDuplicate); return s->r_acc; } |