[Scummvm-cvs-logs] scummvm master -> 459752f20b28882f4960f8b67b1683d629cbab9d

[digitall]

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

Summary:
459752f20b TONY: Fixed scripted exit to use engine method, rather than error().


Commit: 459752f20b28882f4960f8b67b1683d629cbab9d
    https://github.com/scummvm/scummvm/commit/459752f20b28882f4960f8b67b1683d629cbab9d
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-14T01:37:19-08:00

Commit Message:
TONY: Fixed scripted exit to use engine method, rather than error().

This fixes bug #3586252 ("TONY: Game errors out when exiting via the
menu").

Changed paths:
    engines/tony/custom.cpp



diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index 425899f..f5c580c 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -1292,7 +1292,8 @@ void autoSave(CORO_PARAM, uint32, uint32, uint32, uint32) {
 }
 
 void abortGame(CORO_PARAM, uint32, uint32, uint32, uint32) {
-	error("script called abortGame");
+	debug(1, "script called abortGame");
+	g_vm->quitGame();
 }
 
 void shakeScreen(CORO_PARAM, uint32 nScosse, uint32, uint32, uint32) {