[Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.5,1.6 graph.hxx,1.19,1.20 path.cxx,1.4,1.5 path_graph.cxx,1.15,1.16 sprite_drawable.cxx,1.1,1.2

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv21843/src/worldmap

Modified Files:
        drawable.hxx graph.hxx path.cxx path_graph.cxx 
        sprite_drawable.cxx 
Log Message:
applied several patches


Index: drawable.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/drawable.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- drawable.hxx        13 Oct 2002 20:25:00 -0000      1.5
+++ drawable.hxx        20 Oct 2002 18:28:49 -0000      1.6
@@ -72,7 +72,7 @@
   
 private:
   Drawable (const Drawable&);
-  Drawable operator= (const Drawable&);
+  Drawable& operator= (const Drawable&);
 };
 
 } // namespace WorldMapNS

Index: graph.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/graph.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- graph.hxx   15 Oct 2002 15:48:49 -0000      1.19
+++ graph.hxx   20 Oct 2002 18:28:49 -0000      1.20
@@ -149,6 +149,7 @@
       }
     std::cout << "couldn't resolve edge: source=" << source << " destination=" 
<< destination << std::endl;
     assert(false);
+       return *((Edge<EdgeType>*) 0);
   }
   
   /* FIXME: This might give problems under MSVC, so it could be better to not 
use it */

Index: path.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- path.cxx    17 Oct 2002 16:06:21 -0000      1.4
+++ path.cxx    20 Oct 2002 18:28:49 -0000      1.5
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include <assert.h>
 #include "path.hxx"
 
 namespace WorldMapNS {

Index: path_graph.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path_graph.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- path_graph.cxx      16 Oct 2002 09:14:45 -0000      1.15
+++ path_graph.cxx      20 Oct 2002 18:28:49 -0000      1.16
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <math.h>
 #include "../xml_helper.hxx"
 #include "../pingus_error.hxx"
 #include "dot.hxx"

Index: sprite_drawable.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/sprite_drawable.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sprite_drawable.cxx 12 Oct 2002 23:37:23 -0000      1.1
+++ sprite_drawable.cxx 20 Oct 2002 18:28:49 -0000      1.2
@@ -28,6 +28,11 @@
   
 }
 
+SpriteDrawable::~SpriteDrawable()
+{
+
+}
+
 void
 SpriteDrawable::draw(GraphicContext& gc)
 {