[Scummvm-git-logs] scummvm master -> b94ef3dab08fb123dd54e80a4ba17a19840e2b09

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
939f9d1285 SCI32: Stub out kRestartGame
b94ef3dab0 SCI: Rename kRestartGame to kRestartGame16


Commit: 939f9d12850215ce2d6b0e907cca7f6171c360d8
    https://github.com/scummvm/scummvm/commit/939f9d12850215ce2d6b0e907cca7f6171c360d8
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2019-01-05T22:25:31+02:00

Commit Message:
SCI32: Stub out kRestartGame

Restarting was only supported in QfG4, GK1 and PQ4. Those three used
makeshift script code. The kernel call was stubbed out in SSCI as
well. Fixes bug #10681.

Changed paths:
    engines/sci/engine/kernel_tables.h


diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 47786e5..672edd8 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -786,8 +786,9 @@ 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_EVERYWHERE,           "",                      NULL,            NULL },
+	{ MAP_CALL(RestartGame),       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 },
 #endif
 	{ MAP_CALL(RestoreGame),       SIG_EVERYWHERE,           "[r0]i[r0]",             NULL,            NULL },


Commit: b94ef3dab08fb123dd54e80a4ba17a19840e2b09
    https://github.com/scummvm/scummvm/commit/b94ef3dab08fb123dd54e80a4ba17a19840e2b09
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2019-01-05T22:25:31+02:00

Commit Message:
SCI: Rename kRestartGame to kRestartGame16

Changed paths:
    engines/sci/engine/kernel.h
    engines/sci/engine/kernel_tables.h
    engines/sci/engine/kmisc.cpp


diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index bac0e9e..3cd3f0e 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 672edd8..4d2b3b4 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 f8b41a2..e02590a 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