diff options
| author | Lars Skovlund | 2019-01-05 20:08:47 +0100 |
|---|---|---|
| committer | Filippos Karapetis | 2019-01-05 22:25:31 +0200 |
| commit | b94ef3dab08fb123dd54e80a4ba17a19840e2b09 (patch) | |
| tree | aea1a34c9843e0b12e8cf935651c08a813af6685 /engines/sci/engine | |
| parent | 939f9d12850215ce2d6b0e907cca7f6171c360d8 (diff) | |
| download | scummvm-rg350-b94ef3dab08fb123dd54e80a4ba17a19840e2b09.tar.gz scummvm-rg350-b94ef3dab08fb123dd54e80a4ba17a19840e2b09.tar.bz2 scummvm-rg350-b94ef3dab08fb123dd54e80a4ba17a19840e2b09.zip | |
SCI: Rename kRestartGame to kRestartGame16
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index bac0e9e375..3cd3f0ef7f 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -317,7 +317,7 @@ reg_t kMapKeyToDir(EngineState *s, int argc, reg_t *argv); reg_t kGlobalToLocal(EngineState *s, int argc, reg_t *argv); reg_t kLocalToGlobal(EngineState *s, int argc, reg_t *argv); reg_t kWait(EngineState *s, int argc, reg_t *argv); -reg_t kRestartGame(EngineState *s, int argc, reg_t *argv); +reg_t kRestartGame16(EngineState *s, int argc, reg_t *argv); reg_t kDeviceInfo(EngineState *s, int argc, reg_t *argv); reg_t kGetEvent(EngineState *s, int argc, reg_t *argv); reg_t kCheckFreeSpace(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 672edd8c23..4d2b3b4108 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -786,7 +786,7 @@ static SciKernelMapEntry s_kernelMap[] = { #endif { MAP_CALL(ResCheck), SIG_EVERYWHERE, "ii(iiii)", NULL, kResCheck_workarounds }, { MAP_CALL(RespondsTo), SIG_EVERYWHERE, ".i", NULL, NULL }, - { MAP_CALL(RestartGame), SIG_SCI16, SIGFOR_ALL, "", NULL, NULL }, + { "RestartGame", kRestartGame16, SIG_SCI16, SIGFOR_ALL, "", NULL, NULL }, #ifdef ENABLE_SCI32 { MAP_EMPTY(RestartGame), SIG_SCI32, SIGFOR_ALL, "", NULL, NULL }, { "RestoreGame", kRestoreGame32, SIG_THRU_SCI21EARLY, SIGFOR_ALL, "ri[r0]", NULL, NULL }, diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index f8b41a2b71..e02590aa3a 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -38,7 +38,7 @@ namespace Sci { -reg_t kRestartGame(EngineState *s, int argc, reg_t *argv) { +reg_t kRestartGame16(EngineState *s, int argc, reg_t *argv) { s->shrinkStackToBase(); s->abortScriptProcessing = kAbortRestartGame; // Force vm to abort ASAP |