diff options
| author | Max Horn | 2002-09-22 00:38:02 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-22 00:38:02 +0000 |
| commit | 45ce1d111312ec413d6d680092f98a4f49e31556 (patch) | |
| tree | 6e15eb4c301b308b168b4f26708a04caf631d730 | |
| parent | b5a4edf00cea0449a544f6a5989c661ec5da0df9 (diff) | |
| download | scummvm-rg350-45ce1d111312ec413d6d680092f98a4f49e31556.tar.gz scummvm-rg350-45ce1d111312ec413d6d680092f98a4f49e31556.tar.bz2 scummvm-rg350-45ce1d111312ec413d6d680092f98a4f49e31556.zip | |
don't tolerate warnings
svn-id: r4994
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 11 |
2 files changed, 10 insertions, 3 deletions
@@ -13,7 +13,7 @@ RM_REC = $(RM) -r ZIP = zip -q CP = cp -CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar +CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Werror DEFINES = LDFLAGS := INCLUDES:= -I. -Icommon diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 674d9228aa..a95ed7c34c 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1259,8 +1259,15 @@ void NORETURN CDECL error(const char *s, ...) #endif #endif } - // Doesn't wait for any keypress!! Is it intended to? + + // Finally exit. quit() will terminate the program g_scumm->_system->quit(); + + + // This point should never be reached. However, since virtual methods (like quit() is) + // can't be marked as noreturn, gcc will complain at this point. Thus we add in this + // call to exit(0) even though it is never reached. + exit(0); } ScummDebugger g_debugger; @@ -1501,7 +1508,7 @@ byte Scumm::getDefaultGUIColor(int color) void Scumm::setupGUIColors() { /* FIXME: strange IF line? */ - if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) { + if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) { _gui->_bgcolor = getDefaultGUIColor(0); _gui->_color = getDefaultGUIColor(1); _gui->_textcolor = getDefaultGUIColor(2); |