aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJames Brown2002-09-17 04:52:50 +0000
committerJames Brown2002-09-17 04:52:50 +0000
commit79857fd7e8b7d0a3585d699fc5c422841838e1d0 (patch)
tree913407cad3540d426304fcdae739333dee3a3b00 /scumm
parente4ce428bddb7cf53c91cc1f5374ca3928b631245 (diff)
downloadscummvm-rg350-79857fd7e8b7d0a3585d699fc5c422841838e1d0.tar.gz
scummvm-rg350-79857fd7e8b7d0a3585d699fc5c422841838e1d0.tar.bz2
scummvm-rg350-79857fd7e8b7d0a3585d699fc5c422841838e1d0.zip
Replace some exit()'s with a call to the OSystem quit method, as per 610251.
svn-id: r4956
Diffstat (limited to 'scumm')
-rw-r--r--scumm/debug.cpp2
-rw-r--r--scumm/scummvm.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/debug.cpp b/scumm/debug.cpp
index 2ee1878678..22c46d003d 100644
--- a/scumm/debug.cpp
+++ b/scumm/debug.cpp
@@ -140,7 +140,7 @@ bool ScummDebugger::do_command()
}
return true;
case CMD_QUIT:
- exit(1);
+ _s->_system->quit();
default: /* this line is never reached */
error("Unknown debug command");
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 499e9bab27..59189d5328 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1261,7 +1261,7 @@ void NORETURN CDECL error(const char *s, ...)
#endif
}
// Doesn't wait for any keypress!! Is it intended to?
- exit(1);
+ g_scumm->_system->quit();
}
void CDECL warning(const char *s, ...)