[Pingus-CVS] CVS: Games/Pingus/src libxmlfwd.hxx,NONE,1.1 blitter.cxx,1.5,1.6 entrance_data.hxx,1.1,1.2 exit_data.hxx,1.1,1.2 hotspot_data.hxx,1.1,1.2 liquid_data.hxx,1.1,1.2 plt_xml.hxx,1.1,1.2 trap_data.hxx,1.1,1.2 worldobj_data_factory.hxx,1.1,1.2 xml_plf.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        blitter.cxx entrance_data.hxx exit_data.hxx hotspot_data.hxx 
        liquid_data.hxx plt_xml.hxx trap_data.hxx 
        worldobj_data_factory.hxx xml_plf.hxx 
Added Files:
        libxmlfwd.hxx 
Log Message:
- placed all those libxml fwd declarations in its own file
- some thumbnail cache tweaking

--- NEW FILE: libxmlfwd.hxx ---
//  $Id: libxmlfwd.hxx,v 1.1 2002/06/23 11:08:29 grumbel Exp $
// 
//  Pingus - A free Lemmings clone
//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
//  This program is free software; you can redistribute it and/or
//  modify it under the terms of the GNU General Public License
//  as published by the Free Software Foundation; either version 2
//  of the License, or (at your option) any later version.
//
//  This program is distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  GNU General Public License for more details.
// 
//  You should have received a copy of the GNU General Public License
//  along with this program; if not, write to the Free Software
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

#ifndef PINGUS_XMLFWD_HXX
#define PINGUS_XMLFWD_HXX

#ifndef WIN32
// FIXME: This might not work with each and every version of libxml
class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
class _xmlNode; typedef _xmlNode* xmlNodePtr;
#else
#include "xml_helper.hxx"
#endif

#endif

/* EOF */

Index: blitter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blitter.cxx 20 Jun 2002 15:43:44 -0000      1.5
+++ blitter.cxx 23 Jun 2002 11:08:29 -0000      1.6
@@ -328,6 +328,7 @@
 
   switch (prov->get_bytes_per_pixel())
     {
+      // RGB888
     case 3:
       {
        canvas->lock();
@@ -339,7 +340,7 @@
        
        for (int si = 0, ti = 0; si < buffer_size; si += 3, ti += 4)
          {
-           tbuffer[ti + 0] = 255;
+           tbuffer[ti + 0] = 0;
            tbuffer[ti + 1] = sbuffer[si + 0];
            tbuffer[ti + 2] = sbuffer[si + 1];
            tbuffer[ti + 3] = sbuffer[si + 2];
@@ -351,12 +352,12 @@
       }
       break;
 
+      // RGBA8888
     case 4:
       canvas->lock();
       prov->lock();
       memcpy(canvas->get_data(), prov->get_data(),
             sizeof(unsigned char) * prov->get_height() * prov->get_pitch());
-      // -FIXME: Memory hole
       prov->unlock();
       canvas->unlock();
       break;

Index: entrance_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/entrance_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entrance_data.hxx   12 Jun 2002 19:09:37 -0000      1.1
+++ entrance_data.hxx   23 Jun 2002 11:08:29 -0000      1.2
@@ -24,9 +24,7 @@
 #include "worldobj_data.hxx"
 #include "res_descriptor.hxx"
 
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
-
+#include "libxmlfwd.hxx"
 
 class EntranceData : public WorldObjData
 {

Index: exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit_data.hxx       12 Jun 2002 19:09:37 -0000      1.1
+++ exit_data.hxx       23 Jun 2002 11:08:29 -0000      1.2
@@ -24,8 +24,7 @@
 #include "res_descriptor.hxx"
 #include "worldobj_data.hxx"
 
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
+#include "libxmlfwd.hxx"
 
 ///
 class ExitData : public WorldObjData

Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/hotspot_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hotspot_data.hxx    12 Jun 2002 19:09:37 -0000      1.1
+++ hotspot_data.hxx    23 Jun 2002 11:08:29 -0000      1.2
@@ -24,9 +24,7 @@
 #include "res_descriptor.hxx"
 #include "worldobj_data.hxx"
 
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
-
+#include "libxmlfwd.hxx"
 
 class HotspotData : public WorldObjData
 {

Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/liquid_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- liquid_data.hxx     12 Jun 2002 19:09:37 -0000      1.1
+++ liquid_data.hxx     23 Jun 2002 11:08:29 -0000      1.2
@@ -24,9 +24,7 @@
 #include "res_descriptor.hxx"
 #include "worldobj_data.hxx"
 
-
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
+#include "libxmlfwd.hxx"
 
 ///
 class LiquidData : public WorldObjData

Index: plt_xml.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plt_xml.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- plt_xml.hxx 12 Jun 2002 19:06:13 -0000      1.1
+++ plt_xml.hxx 23 Jun 2002 11:08:29 -0000      1.2
@@ -24,8 +24,7 @@
 #include <map>
 #include "backgrounds/surface_background_data.hxx"
 
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
+#include "libxmlfwd.hxx"
 
 class PLTXML
 {

Index: trap_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/trap_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trap_data.hxx       12 Jun 2002 19:09:38 -0000      1.1
+++ trap_data.hxx       23 Jun 2002 11:08:29 -0000      1.2
@@ -24,8 +24,7 @@
 #include <ClanLib/Core/Math/cl_vector.h>
 #include "worldobj_data.hxx"
 
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
+#include "libxmlfwd.hxx"
 
 namespace boost {
   template <class T> class shared_ptr;

Index: worldobj_data_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldobj_data_factory.hxx   12 Jun 2002 19:09:38 -0000      1.1
+++ worldobj_data_factory.hxx   23 Jun 2002 11:08:29 -0000      1.2
@@ -24,8 +24,8 @@
 
 class WorldObjData;
 class WorldObjDataAbstractFactory;
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode;  typedef _xmlNode*  xmlNodePtr;
+
+#include "libxmlfwd.hxx"
 
 /** WorldObjDataFactory which can be used to create all kinds of
     WorldObjData's by given its id */

Index: xml_plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xml_plf.hxx 12 Jun 2002 19:09:38 -0000      1.1
+++ xml_plf.hxx 23 Jun 2002 11:08:29 -0000      1.2
@@ -21,9 +21,7 @@
 #define XMLPLF_HH
 
 #include "plf.hxx"
-
-class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
-class _xmlNode; typedef _xmlNode* xmlNodePtr;
+#include "libxmlfwd.hxx"
 
 class XMLPLF : public PLF
 {