[Pingus-CVS] r3001 - in branches/pingus_0_6/src: . caimagemanipulation editor gui input input/axes input/buttons input/pointers input/scrollers movers particles worldmap worldobjs worldobjsdata

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-18 01:14:41 +0200 (Sat, 18 Aug 2007)
New Revision: 3001

Modified:
   branches/pingus_0_6/src/
   branches/pingus_0_6/src/caimagemanipulation/
   branches/pingus_0_6/src/editor/
   branches/pingus_0_6/src/gui/
   branches/pingus_0_6/src/input/
   branches/pingus_0_6/src/input/axes/
   branches/pingus_0_6/src/input/buttons/
   branches/pingus_0_6/src/input/pointers/
   branches/pingus_0_6/src/input/scrollers/
   branches/pingus_0_6/src/movers/
   branches/pingus_0_6/src/particles/
   branches/pingus_0_6/src/worldmap/
   branches/pingus_0_6/src/worldmap/Makefile.am
   branches/pingus_0_6/src/worldmap/drawable_factory.cxx
   branches/pingus_0_6/src/worldmap/sprite_drawable.hxx
   branches/pingus_0_6/src/worldobjs/
   branches/pingus_0_6/src/worldobjsdata/
   branches/pingus_0_6/src/xml_helper.cxx
Log:
- little compile fix
- svn:ignore


Property changes on: branches/pingus_0_6/src
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/caimagemanipulation
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/editor
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/gui
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/input
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/input/axes
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/input/buttons
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/input/pointers
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/input/scrollers
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/movers
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/particles
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/worldmap
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in


Modified: branches/pingus_0_6/src/worldmap/Makefile.am
===================================================================
--- branches/pingus_0_6/src/worldmap/Makefile.am        2007-08-17 23:11:07 UTC 
(rev 3000)
+++ branches/pingus_0_6/src/worldmap/Makefile.am        2007-08-17 23:14:41 UTC 
(rev 3001)
@@ -42,8 +42,6 @@
 pathfinder.hxx  \
 pingus.cxx   \
 pingus.hxx   \
-sprite_drawable.cxx \
-sprite_drawable.hxx \
 surface_drawable.cxx \
 surface_drawable.hxx \
 worldmap.cxx \

Modified: branches/pingus_0_6/src/worldmap/drawable_factory.cxx
===================================================================
--- branches/pingus_0_6/src/worldmap/drawable_factory.cxx       2007-08-17 
23:11:07 UTC (rev 3000)
+++ branches/pingus_0_6/src/worldmap/drawable_factory.cxx       2007-08-17 
23:14:41 UTC (rev 3001)
@@ -20,7 +20,7 @@
 #include <iostream>
 #include "../xml_helper.hxx"
 #include "surface_drawable.hxx"
-#include "sprite_drawable.hxx"
+//#include "sprite_drawable.hxx"
 #include "drawable_factory.hxx"
 
 namespace WorldMapNS {

Modified: branches/pingus_0_6/src/worldmap/sprite_drawable.hxx
===================================================================
--- branches/pingus_0_6/src/worldmap/sprite_drawable.hxx        2007-08-17 
23:11:07 UTC (rev 3000)
+++ branches/pingus_0_6/src/worldmap/sprite_drawable.hxx        2007-08-17 
23:14:41 UTC (rev 3001)
@@ -46,7 +46,7 @@
 
 private:
   SpriteDrawable (const SpriteDrawable&);
-  SpriteDrawable operator= (const SpriteDrawable&);
+  WorldMapNS::SpriteDrawable operator= (const SpriteDrawable&);
 };
 
 } // namespace WorldMapNS


Property changes on: branches/pingus_0_6/src/worldobjs
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in



Property changes on: branches/pingus_0_6/src/worldobjsdata
___________________________________________________________________
Name: svn:ignore
   + .deps
Makefile
Makefile.in


Modified: branches/pingus_0_6/src/xml_helper.cxx
===================================================================
--- branches/pingus_0_6/src/xml_helper.cxx      2007-08-17 23:11:07 UTC (rev 
3000)
+++ branches/pingus_0_6/src/xml_helper.cxx      2007-08-17 23:14:41 UTC (rev 
3001)
@@ -466,12 +466,12 @@
   //std::cout << "OUT: in_len: " << in_len << " out_len: " << out_len << 
std::endl;
   int ret = UTF8Toisolat1(out, &out_len, in,  &in_len);
 
-  if (ret != 0)
+  if (ret < 0)
     {
       std::cout << "Error: XMLhelper: Encoding failed: ret: " << ret
                 << " in: " << in_len
                 << " out: " << out_len
-                << " str: " << reinterpret_cast<const char*>(in)
+                << " str: '" << reinterpret_cast<const char*>(in) << "'"
                 << std::endl;
       delete[] out;
       return reinterpret_cast<const char*>(in);