? Debug ? Release ? ginge.txt ? ginge1_update.txt ? ginge2.txt ? iconv.dll ? libxml2.dll ? pingus.ilk ? pingus.ncb ? pingus.opt ? pingus.pdb ? script ? stat ? zlib.dll Index: pingus.dsp =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/pingus.dsp,v retrieving revision 1.19 diff -u -r1.19 pingus.dsp --- pingus.dsp 9 Oct 2002 10:03:12 -0000 1.19 +++ pingus.dsp 12 Oct 2002 16:58:54 -0000 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Gi /vd0 /GR /GX /I "src" /I "src\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "LIBXML_2" /D "HAVE_LIBCLANVORBIS" /YX /FD /TP /c +# ADD CPP /nologo /MT /W3 /WX /Gi /vd0 /GR /GX /I "src" /I "src\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "LIBXML_2" /D "HAVE_LIBCLANVORBIS" /YX /FD /TP /c # SUBTRACT CPP /Gf /Gy /u /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -73,7 +73,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /Gm /vd0 /GR /GX /ZI /Od /I "src" /I "src\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "LIBXML_2" /D "HAVE_LIBCLANVORBIS" /D "HAVE_LIBCLANMIKMOD" /U "HAVE_LIBCLANMIKMOD" /YX /FD /GZ /TP /c -# SUBTRACT CPP /X /Fr +# SUBTRACT CPP /WX /X /Fr # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x807 /d "_DEBUG" @@ -1047,6 +1047,10 @@ # Begin Source File SOURCE=.\src\globals.cxx +# End Source File +# Begin Source File + +SOURCE=.\src\goal_manager.cxx # End Source File # Begin Source File Index: src/action_button.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v retrieving revision 1.17 diff -u -r1.17 action_button.cxx --- src/action_button.cxx 12 Oct 2002 00:49:09 -0000 1.17 +++ src/action_button.cxx 12 Oct 2002 16:59:06 -0000 @@ -246,8 +246,9 @@ { pressed = true; } - - if(x); if(y); + + UNUSED_ARG(x); + UNUSED_ARG(y); } ForwardButton::ForwardButton (TrueServer* s, int x, int y) @@ -294,7 +295,8 @@ { server->set_fast_forward(!server->get_fast_forward()); - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } PauseButton::PauseButton (TrueServer* s, int x, int y) Index: src/button_panel.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v retrieving revision 1.16 diff -u -r1.16 button_panel.cxx --- src/button_panel.cxx 4 Oct 2002 16:54:03 -0000 1.16 +++ src/button_panel.cxx 12 Oct 2002 16:59:07 -0000 @@ -186,7 +186,8 @@ void ButtonPanel::on_primary_button_release(int x, int y) { - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } /// Select the next action Index: src/config.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/config.cxx,v retrieving revision 1.5 diff -u -r1.5 config.cxx --- src/config.cxx 4 Sep 2002 14:55:11 -0000 1.5 +++ src/config.cxx 12 Oct 2002 16:59:09 -0000 @@ -282,7 +282,9 @@ set_value(valueid, value); } } - catch (ConfigParserEOF a) {} + catch (ConfigParserEOF) + { + } } Config::Config() Index: src/pingu_map.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_map.cxx,v retrieving revision 1.4 diff -u -r1.4 pingu_map.cxx --- src/pingu_map.cxx 16 Sep 2002 20:31:09 -0000 1.4 +++ src/pingu_map.cxx 12 Oct 2002 16:59:10 -0000 @@ -33,7 +33,10 @@ void PinguMap::mark_dirty(int x,int y,int w,int h) { - if (x || y || w || h); // no warnings + UNUSED_ARG(x); + UNUSED_ARG(y); + UNUSED_ARG(w); + UNUSED_ARG(h); } // Return '0' to indicate that the colmap can not be generated Index: src/pingus.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus.hxx,v retrieving revision 1.3 diff -u -r1.3 pingus.hxx --- src/pingus.hxx 27 Sep 2002 11:32:44 -0000 1.3 +++ src/pingus.hxx 12 Oct 2002 16:59:11 -0000 @@ -33,7 +33,10 @@ # define snprintf _snprintf -# pragma warning(disable:4786) +# pragma warning(disable:4786) //over 255 characters in debug indentifier, due to STL instantiation + //sadly this does not actually work on 6.0, but it does in .NET + +# pragma warning(disable:4355) //this used in constructor base #endif #define UNUSED_ARG(a) do {/* null */} while (&a == 0) Index: src/pingus_main.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v retrieving revision 1.24 diff -u -r1.24 pingus_main.cxx --- src/pingus_main.cxx 10 Oct 2002 12:25:53 -0000 1.24 +++ src/pingus_main.cxx 12 Oct 2002 16:59:16 -0000 @@ -930,7 +930,7 @@ std::cout << _("Error caught from Pingus: ") << err.get_message () << std::endl; } - catch (const std::bad_alloc& a) { + catch (const std::bad_alloc&) { std::cout << _("Pingus: Out of memory!") << std::endl; } Index: src/pingus_resource.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_resource.cxx,v retrieving revision 1.17 diff -u -r1.17 pingus_resource.cxx --- src/pingus_resource.cxx 12 Oct 2002 00:49:10 -0000 1.17 +++ src/pingus_resource.cxx 12 Oct 2002 16:59:18 -0000 @@ -243,7 +243,7 @@ default: perr << "PingusResource: Unknown ResDescriptor::type: " << res_desc.type << std::endl; assert (false); - //return CL_Surface(); + return CL_Surface(); } } Index: src/plt_parser.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_parser.cxx,v retrieving revision 1.5 diff -u -r1.5 plt_parser.cxx --- src/plt_parser.cxx 4 Sep 2002 14:55:11 -0000 1.5 +++ src/plt_parser.cxx 12 Oct 2002 16:59:19 -0000 @@ -69,7 +69,7 @@ } } - catch (PLTEOF a) + catch (PLTEOF) { // cout << "PLT: EOF found" << endl; } Index: src/plt_xml.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_xml.cxx,v retrieving revision 1.10 diff -u -r1.10 plt_xml.cxx --- src/plt_xml.cxx 30 Sep 2002 14:20:48 -0000 1.10 +++ src/plt_xml.cxx 12 Oct 2002 16:59:20 -0000 @@ -80,11 +80,11 @@ } else if (XMLhelper::equal_str(cur->name, "stretch-x")) { - background.stretch_x = XMLhelper::parse_float(doc, cur); + background.stretch_x = XMLhelper::parse_bool(doc, cur); } else if (XMLhelper::equal_str(cur->name, "stretch-y")) { - background.stretch_y = XMLhelper::parse_float(doc, cur); + background.stretch_y = XMLhelper::parse_bool(doc, cur); } else { Index: src/smallmap.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v retrieving revision 1.23 diff -u -r1.23 smallmap.cxx --- src/smallmap.cxx 10 Oct 2002 12:25:53 -0000 1.23 +++ src/smallmap.cxx 12 Oct 2002 16:59:22 -0000 @@ -309,7 +309,8 @@ { scroll_mode = false; - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } void Index: src/sprite.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/sprite.cxx,v retrieving revision 1.9 diff -u -r1.9 sprite.cxx --- src/sprite.cxx 1 Oct 2002 21:48:32 -0000 1.9 +++ src/sprite.cxx 12 Oct 2002 16:59:23 -0000 @@ -204,6 +204,7 @@ return sur.get_num_frames ()/2; default: assert (0); + return 0; } } Index: src/story.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v retrieving revision 1.13 diff -u -r1.13 story.cxx --- src/story.cxx 1 Oct 2002 21:48:32 -0000 1.13 +++ src/story.cxx 12 Oct 2002 16:59:24 -0000 @@ -150,7 +150,8 @@ bool Story::is_at (int x, int y) { - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); std::cout << "bla" << std::endl; return true; Index: src/surface_button.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.hxx,v retrieving revision 1.10 diff -u -r1.10 surface_button.hxx --- src/surface_button.hxx 27 Sep 2002 11:26:44 -0000 1.10 +++ src/surface_button.hxx 12 Oct 2002 16:59:25 -0000 @@ -62,7 +62,7 @@ void on_pointer_press (); void on_pointer_release (); - void on_primary_button_click (int x, int y) { on_click (); if(x); if(y); } + void on_primary_button_click (int x, int y) { on_click (); UNUSED_ARG(x); UNUSED_ARG(y); } virtual void on_click () =0; Index: src/wav_provider.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/wav_provider.cxx,v retrieving revision 1.3 diff -u -r1.3 wav_provider.cxx --- src/wav_provider.cxx 23 Aug 2002 15:49:51 -0000 1.3 +++ src/wav_provider.cxx 12 Oct 2002 16:59:26 -0000 @@ -65,7 +65,7 @@ } } #endif /* HAVE_LIBSDL_MIXER */ - if (str.size()); // suppress warning about unused argument + UNUSED_ARG(str); // suppress warning about unused argument return 0; } Index: src/xml_helper.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v retrieving revision 1.23 diff -u -r1.23 xml_helper.cxx --- src/xml_helper.cxx 12 Oct 2002 00:02:14 -0000 1.23 +++ src/xml_helper.cxx 12 Oct 2002 16:59:27 -0000 @@ -91,7 +91,7 @@ if (!retval) return false; - value = strtol(retval, reinterpret_cast(NULL), 10); + value = (strtol(retval, reinterpret_cast(NULL), 10) != 0); xmlFree(retval); return true; } @@ -188,7 +188,7 @@ bool XMLhelper::parse_bool (xmlDocPtr doc, xmlNodePtr cur) { - return static_cast(parse_int(doc, cur)); + return (parse_int(doc, cur) != 0); } int Index: src/xml_pdf.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_pdf.cxx,v retrieving revision 1.4 diff -u -r1.4 xml_pdf.cxx --- src/xml_pdf.cxx 6 Oct 2002 19:29:39 -0000 1.4 +++ src/xml_pdf.cxx 12 Oct 2002 16:59:28 -0000 @@ -25,6 +25,8 @@ #include "path_manager.hxx" #include "xml_pdf.hxx" +#include + XMLPDF::XMLPDF(const std::string& filename) : plf(0) { Index: src/xml_plf.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v retrieving revision 1.30 diff -u -r1.30 xml_plf.cxx --- src/xml_plf.cxx 3 Oct 2002 12:33:09 -0000 1.30 +++ src/xml_plf.cxx 12 Oct 2002 16:59:30 -0000 @@ -360,7 +360,7 @@ } else if (XMLhelper::equal_str(cur->name, "playable")) { - playable = XMLhelper::parse_int(doc, cur); + playable = XMLhelper::parse_bool(doc, cur); } else if (XMLhelper::equal_str(cur->name, "comment")) { Index: src/editor/thumb_cache.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.cxx,v retrieving revision 1.10 diff -u -r1.10 thumb_cache.cxx --- src/editor/thumb_cache.cxx 11 Sep 2002 12:45:58 -0000 1.10 +++ src/editor/thumb_cache.cxx 12 Oct 2002 16:59:32 -0000 @@ -177,7 +177,7 @@ // Canvas will get deleted on the end of the lifetime of this surface return CL_Surface (canvas, true); } - catch (CL_Error& err) + catch (CL_Error&) { perr << "ThumbCache: Couldn't open file for writing: " << filename << std::endl; Index: src/gui/gui_manager.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/gui_manager.cxx,v retrieving revision 1.14 diff -u -r1.14 gui_manager.cxx --- src/gui/gui_manager.cxx 4 Oct 2002 11:38:29 -0000 1.14 +++ src/gui/gui_manager.cxx 12 Oct 2002 16:59:34 -0000 @@ -97,14 +97,14 @@ GUIManager::add (Component* c, bool delete_component) { components.push_back(c); - if(delete_component); + UNUSED_ARG(delete_component); } void GUIManager::remove (Component* c) { /* components.erase(c); */ - if(c); + UNUSED_ARG(c); } Component* Index: src/gui/surface_button.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/surface_button.cxx,v retrieving revision 1.4 diff -u -r1.4 surface_button.cxx --- src/gui/surface_button.cxx 4 Sep 2002 14:55:12 -0000 1.4 +++ src/gui/surface_button.cxx 12 Oct 2002 16:59:35 -0000 @@ -65,7 +65,8 @@ std::cout << "XXXXXXXXX press" << std::endl; pressed = true; - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } void @@ -74,7 +75,8 @@ std::cout << "XXXXXXXXX release" << std::endl; pressed = false; - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } void @@ -96,7 +98,8 @@ { std::cout << "Surfacebutton got click" << std::endl; - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } /* EOF */ Index: src/input/axes/button_axis.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/button_axis.cxx,v retrieving revision 1.2 diff -u -r1.2 button_axis.cxx --- src/input/axes/button_axis.cxx 26 Aug 2002 13:53:04 -0000 1.2 +++ src/input/axes/button_axis.cxx 12 Oct 2002 16:59:35 -0000 @@ -28,9 +28,9 @@ pos(0), angle(angle_), button1(button1_), button2(button2_) { if (angle < 0) - angle = (static_cast(angle) % 360) + 360; + angle = static_cast((static_cast(angle) % 360) + 360); else if (angle > 360) - angle = static_cast(angle) % 360; + angle = static_cast((static_cast(angle) % 360) + 0); } ButtonAxis::~ButtonAxis () Index: src/input/axes/inverted_axis.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/inverted_axis.cxx,v retrieving revision 1.1 diff -u -r1.1 inverted_axis.cxx --- src/input/axes/inverted_axis.cxx 24 Aug 2002 11:37:31 -0000 1.1 +++ src/input/axes/inverted_axis.cxx 12 Oct 2002 16:59:36 -0000 @@ -25,7 +25,7 @@ InvertedAxis::InvertedAxis (Axis* axis_) : axis(axis_) { - angle = (static_cast(axis->get_angle()) + 180) % 360; + angle = static_cast((static_cast(axis->get_angle()) + 180) % 360); } InvertedAxis::~InvertedAxis () Index: src/particles/particle.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle.cxx,v retrieving revision 1.4 diff -u -r1.4 particle.cxx --- src/particles/particle.cxx 29 Sep 2002 20:45:31 -0000 1.4 +++ src/particles/particle.cxx 12 Oct 2002 16:59:37 -0000 @@ -68,7 +68,7 @@ bool Particle::is_alive() { - return livetime; + return (livetime != 0); } /* EOF */ Index: src/worldobjs/rain_generator.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.cxx,v retrieving revision 1.5 diff -u -r1.5 rain_generator.cxx --- src/worldobjs/rain_generator.cxx 1 Oct 2002 19:53:46 -0000 1.5 +++ src/worldobjs/rain_generator.cxx 12 Oct 2002 16:59:37 -0000 @@ -67,9 +67,9 @@ } if (do_thunder) - thunder_count -= 10.0 * 0.025f; + thunder_count -= 10.0f * 0.025f; - waiter_count -= 20.0 * 0.025f; + waiter_count -= 20.0f * 0.025f; get_world()->get_particle_holder()->add_particle(new RainParticle(rand() % world->get_width(), -32)); get_world()->get_particle_holder()->add_particle(new RainParticle(rand() % world->get_width(), -32));