? ' ? Debug ? Release ? ginge.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 20 Oct 2002 10:18:55 -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" @@ -644,14 +644,6 @@ # End Source File # Begin Source File -SOURCE=.\src\worldmap\node.cxx -# End Source File -# Begin Source File - -SOURCE=.\src\worldmap\node_data.cxx -# End Source File -# Begin Source File - SOURCE=.\src\worldmap\pingus.cxx # End Source File # Begin Source File @@ -1047,6 +1039,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.19 diff -u -r1.19 action_button.cxx --- src/action_button.cxx 17 Oct 2002 00:10:46 -0000 1.19 +++ src/action_button.cxx 20 Oct 2002 10:19:03 -0000 @@ -249,7 +249,8 @@ pressed = true; } - if(x); if(y); + UNUSED_ARG(x); + UNUSED_ARG(y); } ForwardButton::ForwardButton (TrueServer* s, int x, int y) @@ -297,7 +298,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/indexed_canvas.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/indexed_canvas.cxx,v retrieving revision 1.2 diff -u -r1.2 indexed_canvas.cxx --- src/indexed_canvas.cxx 16 Oct 2002 10:27:31 -0000 1.2 +++ src/indexed_canvas.cxx 20 Oct 2002 10:19:03 -0000 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "indexed_canvas.hxx" +#include IndexedCanvas::IndexedCanvas(int w, int h) : width(w), Index: src/pingus.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus.hxx,v retrieving revision 1.4 diff -u -r1.4 pingus.hxx --- src/pingus.hxx 14 Oct 2002 11:15:15 -0000 1.4 +++ src/pingus.hxx 20 Oct 2002 10:19:04 -0000 @@ -37,6 +37,8 @@ //sadly this does not actually work on 6.0, but it does in .NET # pragma warning(disable:4355) //this used in constructor base + +# pragma warning(disable:4800) //'int' : forcing value to bool 'true' or 'false' (performance warning) #endif #define UNUSED_ARG(a) do {/* null */} while (&a == 0) Index: src/usb_mouse_controller.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/usb_mouse_controller.cxx,v retrieving revision 1.2 diff -u -r1.2 usb_mouse_controller.cxx --- src/usb_mouse_controller.cxx 28 Sep 2002 11:52:22 -0000 1.2 +++ src/usb_mouse_controller.cxx 20 Oct 2002 10:19:05 -0000 @@ -17,6 +17,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#ifndef WIN32 + #include #include "pingus_error.hxx" #include "usb_mouse_controller.hxx" @@ -97,6 +99,8 @@ else if (mouse.y > CL_Display::get_height () - 1) mouse.y = CL_Display::get_height () - 1; } } + +#endif //WIN32 /* EOF */ Index: src/worldmap/drawable.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/drawable.hxx,v retrieving revision 1.5 diff -u -r1.5 drawable.hxx --- src/worldmap/drawable.hxx 13 Oct 2002 20:25:00 -0000 1.5 +++ src/worldmap/drawable.hxx 20 Oct 2002 10:19:07 -0000 @@ -72,7 +72,7 @@ private: Drawable (const Drawable&); - Drawable operator= (const Drawable&); + Drawable& operator= (const Drawable&); }; } // namespace WorldMapNS Index: src/worldmap/graph.hxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/graph.hxx,v retrieving revision 1.19 diff -u -r1.19 graph.hxx --- src/worldmap/graph.hxx 15 Oct 2002 15:48:49 -0000 1.19 +++ src/worldmap/graph.hxx 20 Oct 2002 10:19:08 -0000 @@ -149,6 +149,7 @@ } std::cout << "couldn't resolve edge: source=" << source << " destination=" << destination << std::endl; assert(false); + return *((Edge*) 0); } /* FIXME: This might give problems under MSVC, so it could be better to not use it */ Index: src/worldmap/path.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path.cxx,v retrieving revision 1.4 diff -u -r1.4 path.cxx --- src/worldmap/path.cxx 17 Oct 2002 16:06:21 -0000 1.4 +++ src/worldmap/path.cxx 20 Oct 2002 10:19:08 -0000 @@ -19,6 +19,7 @@ #include #include +#include #include "path.hxx" namespace WorldMapNS { Index: src/worldmap/path_graph.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path_graph.cxx,v retrieving revision 1.15 diff -u -r1.15 path_graph.cxx --- src/worldmap/path_graph.cxx 16 Oct 2002 09:14:45 -0000 1.15 +++ src/worldmap/path_graph.cxx 20 Oct 2002 10:19:09 -0000 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include +#include #include "../xml_helper.hxx" #include "../pingus_error.hxx" #include "dot.hxx" Index: src/worldmap/sprite_drawable.cxx =================================================================== RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/sprite_drawable.cxx,v retrieving revision 1.1 diff -u -r1.1 sprite_drawable.cxx --- src/worldmap/sprite_drawable.cxx 12 Oct 2002 23:37:23 -0000 1.1 +++ src/worldmap/sprite_drawable.cxx 20 Oct 2002 10:19:10 -0000 @@ -28,6 +28,11 @@ } +SpriteDrawable::~SpriteDrawable() +{ + +} + void SpriteDrawable::draw(GraphicContext& gc) {