thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't tolerate warnings

Browse source 
svn-id: r4994
This commit is contained in:
Max Horn 2002-09-22 00:38:02 +00:00
parent b5a4edf00c
commit 45ce1d1113
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -13,7 +13,7 @@ RM_REC = $(RM) -r
ZIP = zip -q ZIP = zip -q
CP = cp 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 = DEFINES =
LDFLAGS := LDFLAGS :=
INCLUDES:= -I. -Icommon INCLUDES:= -I. -Icommon

11
scumm/scummvm.cpp
View file

@ -1259,8 +1259,15 @@ void NORETURN CDECL error(const char *s, ...)
#endif #endif
#endif #endif
} }
// Doesn't wait for any keypress!! Is it intended to?
// Finally exit. quit() will terminate the program
g_scumm->_system->quit(); 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; ScummDebugger g_debugger;
@ -1501,7 +1508,7 @@ byte Scumm::getDefaultGUIColor(int color)
void Scumm::setupGUIColors() { void Scumm::setupGUIColors() {
/* FIXME: strange IF line? */ /* 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->_bgcolor = getDefaultGUIColor(0);
_gui->_color = getDefaultGUIColor(1); _gui->_color = getDefaultGUIColor(1);
_gui->_textcolor = getDefaultGUIColor(2); _gui->_textcolor = getDefaultGUIColor(2);