From: <ma...@us...> - 2014-06-13 19:44:50
|
Revision: 7474 http://sourceforge.net/p/exult/code/7474 Author: marzojr Date: 2014-06-13 19:44:45 +0000 (Fri, 13 Jun 2014) Log Message: ----------- * objs/egg.cc: Fixing bug #1865 "(Anti magic/sparkle) Weather takes too long to change": weather eggs now reset weather when they are deleted, which matches the original's behavior. * configure.ac: Removed a couple of options in paranoid-warnings. Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/configure.ac exult/trunk/objs/egg.cc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2014-05-16 20:31:22 UTC (rev 7473) +++ exult/trunk/ChangeLog 2014-06-13 19:44:45 UTC (rev 7474) @@ -1,3 +1,9 @@ +2014-06-13 Marzo Sette Torres Junior <ma...@ya...> + * objs/egg.cc: Fixing bug #1865 "(Anti magic/sparkle) Weather takes too long + to change": weather eggs now reset weather when they are deleted, which + matches the original's behavior. + * configure.ac: Removed a couple of options in paranoid-warnings. + 2014-05-10 Dominik Reichardt <do...@us...> * audio/midi_drivers/CoreMidiDriver.cpp: added stdout message when CoreMidi destination is not available and default is used. Modified: exult/trunk/configure.ac =================================================================== --- exult/trunk/configure.ac 2014-05-16 20:31:22 UTC (rev 7473) +++ exult/trunk/configure.ac 2014-06-13 19:44:45 UTC (rev 7474) @@ -789,12 +789,13 @@ # more warnings AC_ARG_ENABLE(paranoid-warnings, AS_HELP_STRING([--enable-paranoid-warnings], [Enable paranoid warnings @<:@default no@:>@]),,enable_paranoid_warnings=no) if test x$enable_paranoid_warnings = xyes; then - WARNINGS="-O -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wredundant-decls -Winline -Wdisabled-optimization -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual" +# WARNINGS="-O -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wredundant-decls -Winline -Wdisabled-optimization -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual" + WARNINGS="-O -Wall -Wextra -Wcast-qual -Wwrite-strings -Wredundant-decls -Wdisabled-optimization -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual" # DEBUG_FLAGS="$DEBUG_FLAGS -Wall -O -Wunused -Wuninitialized -Woverloaded-virtual -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Winline" - DEBUG_FLAGS="$DEBUG_FLAGS -O -Wall -Wextra -Wcast-qual -Wwrite-strings -Wconversion -Wredundant-decls -Winline -Wdisabled-optimization -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual -Wpointer-arith" + DEBUG_FLAGS="$DEBUG_FLAGS $WARNINGS" WARNING_LEVEL="paranoid" elif test x$enable_warnings = xyes; then - DEBUG_FLAGS="$DEBUG_FLAGS -O -Wall -Wunused -Wuninitialized -Woverloaded-virtual -Wpointer-arith -Wcast-qual -Wwrite-strings" + DEBUG_FLAGS="$DEBUG_FLAGS -O -Wall -Wextra -Wunused -Wuninitialized -Woverloaded-virtual -Wpointer-arith -Wcast-qual -Wwrite-strings" WARNING_LEVEL="all" fi Modified: exult/trunk/objs/egg.cc =================================================================== --- exult/trunk/objs/egg.cc 2014-05-16 20:31:22 UTC (rev 7473) +++ exult/trunk/objs/egg.cc 2014-06-13 19:44:45 UTC (rev 7474) @@ -379,6 +379,9 @@ if (!len) // Means continuous. len = 120; // How about a couple game hours? } + virtual ~Weather_egg() { + set_weather(0, 1, 0); + } virtual void hatch_now(Game_object *obj, bool must) { set_weather(weather, len, this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |