[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata entrance_data.cxx,NONE,1.1 entrance_data.hxx,NONE,1.1 Makefile.am,1.14,1.15 bumper_data.hxx,1.2,1.3 conveyor_belt_data.hxx,1.2,1.3 fake_exit_data.hxx,1.2,1.3 groundpiece_data.cxx,1.3,1.4 groundpiece_data.hxx,1.1,1.2 guillotine_data.hxx,1.2,1.3 hammer_data.hxx,1.2,1.3 hotspot_data.hxx,1.1,1.2 ice_block_data.hxx,1.2,1.3 info_box_data.hxx,1.2,1.3 laser_exit_data.hxx,1.2,1.3 liquid_data.hxx,1.1,1.2 prefab_obj_data.hxx,1.2,1.3 rain_generator_data.hxx,1.1,1.2 smasher_data.hxx,1.2,1.3 snow_generator_data.hxx,1.2,1.3 solid_color_background_data.hxx,1.1,1.2 spike_data.hxx,1.2,1.3 starfield_background_data.hxx,1.1,1.2 surface_background_data.hxx,1.1,1.2 switch_door_data.hxx,1.2,1.3 teleporter_data.hxx,1.1,1.2 thunderstorm_background_data.hxx,1.1,1.2 worldobj_group_data.hxx,1.3,1.4

[torangan]

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

Modified Files:
        Makefile.am bumper_data.hxx conveyor_belt_data.hxx 
        fake_exit_data.hxx groundpiece_data.cxx groundpiece_data.hxx 
        guillotine_data.hxx hammer_data.hxx hotspot_data.hxx 
        ice_block_data.hxx info_box_data.hxx laser_exit_data.hxx 
        liquid_data.hxx prefab_obj_data.hxx rain_generator_data.hxx 
        smasher_data.hxx snow_generator_data.hxx 
        solid_color_background_data.hxx spike_data.hxx 
        starfield_background_data.hxx surface_background_data.hxx 
        switch_door_data.hxx teleporter_data.hxx 
        thunderstorm_background_data.hxx worldobj_group_data.hxx 
Added Files:
        entrance_data.cxx entrance_data.hxx 
Log Message:
- splitted Entrance
- changed operator= return value


--- NEW FILE: entrance_data.cxx ---
//  $Id: entrance_data.cxx,v 1.1 2002/09/27 11:26:49 torangan 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.

#include <iostream>
#include "../editorobjs/entrance_obj.hxx"
#include "../worldobjs/entrances/woodthing.hxx"
#include "../worldobjs/entrances/cloud.hxx"
#include "../pingus_error.hxx"
#include "../string_converter.hxx"
#include "../xml_helper.hxx"
#include "entrance_data.hxx"

namespace WorldObjsData {

EntranceData::EntranceData () : direction(MISC),
                                release_rate(50),
                                owner_id(0),
                                type("generic")
{
}

EntranceData::EntranceData (xmlDocPtr doc, xmlNodePtr cur) : direction(MISC),
                                                             release_rate(50),
                                                             owner_id(0),
                                                             type("generic")
{
  cur = cur->children;  
  while (cur)
    {
      if (xmlIsBlankNode(cur)) 
        {
          cur = cur->next;
          continue;
        }

      if (XMLhelper::equal_str(cur->name, "type"))
        {
          char* name = (char*)xmlNodeListGetString(doc, cur->children, 1); 
          type = name;
          xmlFree(name);
        }
      else if (XMLhelper::equal_str(cur->name, "owner-id"))
        {
          owner_id = XMLhelper::parse_int(doc, cur);
        }
      else if (XMLhelper::equal_str(cur->name, "position"))
        {
          pos = XMLhelper::parse_vector(doc, cur);
        }
      else if (XMLhelper::equal_str(cur->name, "release-rate"))
        {
          char* release_rate_str = (char*)xmlNodeListGetString(doc, 
cur->children, 1);
          release_rate = StringConverter::to_int(release_rate_str);
          xmlFree(release_rate_str);
        }
      else if (XMLhelper::equal_str(cur->name, "direction"))
        {
          char* direction_str = (char*)xmlNodeListGetString(doc, cur->children, 
1);

          if (! strcmp(direction_str, "left"))
            direction = EntranceData::LEFT;
          else if (! strcmp(direction_str, "right"))
            direction = EntranceData::RIGHT;
          else if (! strcmp(direction_str, "misc"))
            direction = EntranceData::MISC;
          
          xmlFree(direction_str);
        }
      else
        {
          printf("Unhandled: %s\n", (char*)cur->name);
        }       
      cur = cur->next;  
    }
}

EntranceData::EntranceData (const EntranceData& old) : WorldObjData(old),
                                                       direction(old.direction),
                                                       desc(old.desc),
                                                       pos(old.pos),
                                                       
release_rate(old.release_rate),
                                                       owner_id(old.owner_id),
                                                       type(old.type)
{
}

void 
EntranceData::write_xml (std::ostream& xml)
{
  std::string dir_str;
  
  switch(direction)
    {
    case EntranceData::LEFT:
      dir_str = "left";
      break;
    case EntranceData::RIGHT:
      dir_str = "right";
      break;
    case EntranceData::MISC:
    default:
      dir_str = "misc";
      break;
    }

  xml << "<entrance>\n";
  XMLhelper::write_vector_xml(xml, pos);
  xml << "  <type>" << type << "</type>\n"
      << "  <direction>" << dir_str << "</direction>\n"
      << "  <release-rate>" << release_rate << "</release-rate>\n"
      << "  <owner-id>" << owner_id << "</owner-id>\n"
      << "</entrance>\n"
      << std::endl;  
}

WorldObj* 
EntranceData::create_WorldObj ()
{
  if (type == "generic") {
    return new WorldObjs::Entrance(*this);
  } else if (type == "woodthing") {
    return new WorldObjs::Entrances::WoodThing(*this);
  } else if (type == "cloud") {
    return new WorldObjs::Entrances::Cloud(*this);
  } else {
    PingusError::raise("Entrance: Entrance type in Level file is unknown: " + 
type);
    return 0; // never reached
  }
}

EditorObjLst 
EntranceData::create_EditorObj ()
{
  return EditorObjLst(1, new EditorObjs::EntranceObj(*this));
}

} // namespace WorldObjsData

/* EOF */

--- NEW FILE: entrance_data.hxx ---
//  $Id: entrance_data.hxx,v 1.1 2002/09/27 11:26:49 torangan Exp $
//
//  Pingus - A free Lemmings clone
//  Copyright (C) 1999 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 HEADER_PINGUS_ENTRANCE_DATA_HXX
#define HEADER_PINGUS_ENTRANCE_DATA_HXX

#include <ClanLib/Core/Math/cl_vector.h>
#include "../libxmlfwd.hxx"
#include "../res_descriptor.hxx"
#include "../worldobj_data.hxx"

namespace WorldObjsData {

class EntranceData : public WorldObjData
{
public:
  enum EntranceDirection { LEFT, RIGHT, MISC };
  
public:
  EntranceDirection direction;
  ResDescriptor     desc;
  CL_Vector         pos;
  int               release_rate;
  int               owner_id;
  
  /// The type of the entrance type (woodthing, generic, etc.)
  std::string type;

public:
  EntranceData ();
  EntranceData (xmlDocPtr doc, xmlNodePtr cur);
  EntranceData (const EntranceData& old);
  
  void write_xml (std::ostream&);

  EditorObjLst create_EditorObj ();
  WorldObj* create_WorldObj ();

private:
  EntranceData& operator= (const EntranceData& old);
};

} // namespace WorldObjsData

#endif

/* EOF */

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am 25 Sep 2002 17:21:39 -0000      1.14
+++ Makefile.am 27 Sep 2002 11:26:49 -0000      1.15
@@ -20,6 +20,7 @@
 libpingus_worldobjsdata_a_SOURCES = \
        bumper_data.cxx                  bumper_data.hxx \
        conveyor_belt_data.cxx           conveyor_belt_data.hxx \
+       entrance_data.cxx                entrance_data.hxx \
        fake_exit_data.cxx               fake_exit_data.hxx \
         groundpiece_data.hxx             groundpiece_data.cxx \
        guillotine_data.cxx              guillotine_data.hxx \

Index: bumper_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bumper_data.hxx     10 Sep 2002 19:24:20 -0000      1.2
+++ bumper_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
@@ -44,7 +44,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  BumperData operator= (const BumperData&);
+  BumperData& operator= (const BumperData&);
       
 };
   

Index: conveyor_belt_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conveyor_belt_data.hxx      15 Sep 2002 11:02:24 -0000      1.2
+++ conveyor_belt_data.hxx      27 Sep 2002 11:26:49 -0000      1.3
@@ -51,7 +51,7 @@
   EditorObjLst create_EditorObj ();
   
 private:
-  ConveyorBeltData operator= (const ConveyorBeltData&);
+  ConveyorBeltData& operator= (const ConveyorBeltData&);
 };
 
 } // namespace WorldObjsData

Index: fake_exit_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fake_exit_data.hxx  10 Sep 2002 19:24:20 -0000      1.2
+++ fake_exit_data.hxx  27 Sep 2002 11:26:49 -0000      1.3
@@ -46,7 +46,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  FakeExitData operator= (const FakeExitData&);
+  FakeExitData& operator= (const FakeExitData&);
       
 };
   

Index: groundpiece_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- groundpiece_data.cxx        16 Sep 2002 22:36:48 -0000      1.3
+++ groundpiece_data.cxx        27 Sep 2002 11:26:49 -0000      1.4
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <fstream>
-#include "../editor/editor_groundpiece_obj.hxx"
+#include "../editorobjs/groundpiece_obj.hxx"
 #include "../worldobjs/groundpiece.hxx"
 #include "../world.hxx"
 #include "../xml_helper.hxx"
@@ -83,7 +83,7 @@
 {
 }
 
-GroundpieceData
+GroundpieceData&
 GroundpieceData::operator= (const GroundpieceData& old)
 {
   if (this == &old)
@@ -101,15 +101,13 @@
 {
 }
 EditorObjLst
-GroundpieceData::create_EditorObj()
+GroundpieceData::create_EditorObj ()
 {
-  EditorObjLst lst;
-  lst.push_back(new EditorGroundpieceObj(*this));
-  return lst;
+  return EditorObjLst(1, new EditorObjs::GroundpieceObj(this));
 }
 
 WorldObj*
-GroundpieceData::create_WorldObj()
+GroundpieceData::create_WorldObj ()
 {
   return new WorldObjs::Groundpiece(*this);
 }

Index: groundpiece_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/groundpiece_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- groundpiece_data.hxx        16 Sep 2002 20:31:09 -0000      1.1
+++ groundpiece_data.hxx        27 Sep 2002 11:26:49 -0000      1.2
@@ -27,9 +27,6 @@
 #include "../worldobj_data.hxx"
 #include "../groundtype.hxx"
 
-class EditorObj;
-class WorldObj;
-
 namespace WorldObjsData {
 
 class GroundpieceData : public WorldObjData
@@ -38,21 +35,21 @@
   CL_Surface surface;
   ResDescriptor desc;
   CL_Vector pos;
-  
+
   Groundtype::GPType gptype; 
 
   GroundpieceData ();
   GroundpieceData (xmlDocPtr doc, xmlNodePtr cur);
   
   GroundpieceData (const GroundpieceData& old);
-  GroundpieceData operator= (const GroundpieceData& old);
+  GroundpieceData& operator= (const GroundpieceData& old);
 
   ~GroundpieceData ();
 
-  WorldObj*    create_WorldObj();
-  EditorObjLst create_EditorObj();
+  WorldObj*    create_WorldObj  ();
+  EditorObjLst create_EditorObj ();
 
-  void write_xml(std::ostream& xml);
+  void write_xml (std::ostream& xml);
 };
 
 } // namespace WorldObjsData

Index: guillotine_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- guillotine_data.hxx 10 Sep 2002 19:24:20 -0000      1.2
+++ guillotine_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
@@ -50,7 +50,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  GuillotineData operator= (const GuillotineData&);
+  GuillotineData& operator= (const GuillotineData&);
       
 };
   

Index: hammer_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hammer_data.hxx     10 Sep 2002 19:24:20 -0000      1.2
+++ hammer_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
@@ -46,7 +46,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  HammerData operator= (const HammerData&);
+  HammerData& operator= (const HammerData&);
       
 };
   

Index: hotspot_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hotspot_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hotspot_data.hxx    24 Sep 2002 09:29:04 -0000      1.1
+++ hotspot_data.hxx    27 Sep 2002 11:26:49 -0000      1.2
@@ -47,7 +47,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  HotspotData operator= (const HotspotData&);
+  HotspotData& operator= (const HotspotData&);
 };
 
 } // namespace WorldObjsData

Index: ice_block_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ice_block_data.hxx  15 Sep 2002 11:02:24 -0000      1.2
+++ ice_block_data.hxx  27 Sep 2002 11:26:49 -0000      1.3
@@ -51,7 +51,7 @@
   EditorObjLst create_EditorObj ();
   
 private:
-  IceBlockData operator= (const IceBlockData&);
+  IceBlockData& operator= (const IceBlockData&);
 };
 
 } // namespace WorldObjsData

Index: info_box_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- info_box_data.hxx   17 Sep 2002 16:23:30 -0000      1.2
+++ info_box_data.hxx   27 Sep 2002 11:26:49 -0000      1.3
@@ -51,7 +51,7 @@
   EditorObjLst create_EditorObj ();
   
 private:
-  InfoBoxData operator= (const InfoBoxData&);
+  InfoBoxData& operator= (const InfoBoxData&);
 };
 
 } // namespace WorldObjsData

Index: laser_exit_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- laser_exit_data.hxx 10 Sep 2002 19:24:20 -0000      1.2
+++ laser_exit_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
@@ -46,7 +46,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  LaserExitData operator= (const LaserExitData&);
+  LaserExitData& operator= (const LaserExitData&);
       
 };
   

Index: liquid_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/liquid_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- liquid_data.hxx     25 Sep 2002 17:21:39 -0000      1.1
+++ liquid_data.hxx     27 Sep 2002 11:26:49 -0000      1.2
@@ -53,7 +53,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  LiquidData operator= (const LiquidData&);
+  LiquidData& operator= (const LiquidData&);
 };
 
 } // namespace WorldObjsData

Index: prefab_obj_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/prefab_obj_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- prefab_obj_data.hxx 15 Sep 2002 16:49:20 -0000      1.2
+++ prefab_obj_data.hxx 27 Sep 2002 11:26:49 -0000      1.3
@@ -62,7 +62,7 @@
 
 private:
   PrefabObjData (const PrefabObjData&);
-  PrefabObjData operator= (const PrefabObjData&);
+  PrefabObjData& operator= (const PrefabObjData&);
 };
 
 } // namespace WorldObjsData

Index: rain_generator_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/rain_generator_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rain_generator_data.hxx     16 Sep 2002 15:47:36 -0000      1.1
+++ rain_generator_data.hxx     27 Sep 2002 11:26:49 -0000      1.2
@@ -38,7 +38,7 @@
   void write_xml(std::ostream& xml);
 private:
   RainGeneratorData (const RainGeneratorData&);
-  RainGeneratorData operator= (const RainGeneratorData&);
+  RainGeneratorData& operator= (const RainGeneratorData&);
 };
 
 } // namespace WorldObjsData

Index: smasher_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smasher_data.hxx    10 Sep 2002 19:24:20 -0000      1.2
+++ smasher_data.hxx    27 Sep 2002 11:26:49 -0000      1.3
@@ -44,7 +44,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  SmasherData operator= (const SmasherData&);
+  SmasherData& operator= (const SmasherData&);
       
 };
   

Index: snow_generator_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/snow_generator_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snow_generator_data.hxx     16 Sep 2002 17:17:17 -0000      1.2
+++ snow_generator_data.hxx     27 Sep 2002 11:26:49 -0000      1.3
@@ -39,7 +39,7 @@
   void write_xml(std::ostream& xml);
 private:
   SnowGeneratorData (const SnowGeneratorData&);
-  SnowGeneratorData operator= (const SnowGeneratorData&);
+  SnowGeneratorData& operator= (const SnowGeneratorData&);
 };
 
 } // namespace WorldObjsData

Index: solid_color_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/solid_color_background_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- solid_color_background_data.hxx     15 Sep 2002 09:54:34 -0000      1.1
+++ solid_color_background_data.hxx     27 Sep 2002 11:26:49 -0000      1.2
@@ -49,7 +49,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  SolidColorBackgroundData operator= (const SolidColorBackgroundData&);
+  SolidColorBackgroundData& operator= (const SolidColorBackgroundData&);
 };
 
 } // namespace WorldObjsData

Index: spike_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- spike_data.hxx      10 Sep 2002 19:24:20 -0000      1.2
+++ spike_data.hxx      27 Sep 2002 11:26:49 -0000      1.3
@@ -46,7 +46,7 @@
   EditorObjLst create_EditorObj ();
       
 private:
-  SpikeData operator= (const SpikeData&);
+  SpikeData& operator= (const SpikeData&);
       
 };
   

Index: starfield_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/starfield_background_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- starfield_background_data.hxx       16 Sep 2002 20:52:22 -0000      1.1
+++ starfield_background_data.hxx       27 Sep 2002 11:26:49 -0000      1.2
@@ -42,7 +42,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  StarfieldBackgroundData operator= (const StarfieldBackgroundData&);
+  StarfieldBackgroundData& operator= (const StarfieldBackgroundData&);
 };
 
 } // namespace WorldObjsData

Index: surface_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- surface_background_data.hxx 16 Sep 2002 20:52:22 -0000      1.1
+++ surface_background_data.hxx 27 Sep 2002 11:26:49 -0000      1.2
@@ -76,7 +76,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  SurfaceBackgroundData operator= (const SurfaceBackgroundData&);
+  SurfaceBackgroundData& operator= (const SurfaceBackgroundData&);
 };
 
 } // namespace WorldObjsData

Index: switch_door_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switch_door_data.hxx        15 Sep 2002 11:02:24 -0000      1.2
+++ switch_door_data.hxx        27 Sep 2002 11:26:49 -0000      1.3
@@ -56,7 +56,7 @@
   EditorObjLst create_EditorObj ();
 
 private:
-  SwitchDoorData operator= (const SwitchDoorData&);
+  SwitchDoorData& operator= (const SwitchDoorData&);
 };
 
 } // namespace WorldObjsData

Index: teleporter_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- teleporter_data.hxx 10 Sep 2002 12:11:29 -0000      1.1
+++ teleporter_data.hxx 27 Sep 2002 11:26:49 -0000      1.2
@@ -27,34 +27,34 @@
 
 namespace WorldObjsData {
 
-  class TeleporterData : public WorldObjData
-  {
-  public:
-    CL_Vector pos;
-    CL_Vector target_pos;
-    
-    Sprite sprite;
-    Sprite target_sprite;
-
-    TeleporterData ();
-    TeleporterData (xmlDocPtr doc, xmlNodePtr cur);
-    TeleporterData (const TeleporterData& data);
-  
-    /** Write the content of this object formatted as xml to the given
-        stream */
-    void write_xml (std::ostream& xml);
+class TeleporterData : public WorldObjData
+{
+public:
+  CL_Vector pos;
+  CL_Vector target_pos;
   
-    /** Create an WorldObj from the given data object */
-    WorldObj* create_WorldObj ();
+  Sprite sprite;
+  Sprite target_sprite;
 
-    /** Create an EditorObj from the given data object */
-    EditorObjLst create_EditorObj ();
-    
-  private:
-    TeleporterData operator= (const TeleporterData& data);
-  };
+  TeleporterData ();
+  TeleporterData (xmlDocPtr doc, xmlNodePtr cur);
+  TeleporterData (const TeleporterData& data);
 
-}
+  /** Write the content of this object formatted as xml to the given
+      stream */
+  void write_xml (std::ostream& xml);
+
+  /** Create an WorldObj from the given data object */
+  WorldObj* create_WorldObj ();
+
+  /** Create an EditorObj from the given data object */
+  EditorObjLst create_EditorObj ();
+  
+private:
+  TeleporterData& operator= (const TeleporterData& data);
+};
+
+} // namespace WorldObjsData
 
 #endif
 

Index: thunderstorm_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/thunderstorm_background_data.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- thunderstorm_background_data.hxx    18 Sep 2002 15:00:37 -0000      1.1
+++ thunderstorm_background_data.hxx    27 Sep 2002 11:26:49 -0000      1.2
@@ -45,7 +45,7 @@
   EditorObjLst create_EditorObj ();
 
 private:  
-  ThunderstormBackgroundData operator= (const ThunderstormBackgroundData&);
+  ThunderstormBackgroundData& operator= (const ThunderstormBackgroundData&);
 };
 
 } // namespace WorldObjsData

Index: worldobj_group_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/worldobj_group_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- worldobj_group_data.hxx     15 Sep 2002 21:49:58 -0000      1.3
+++ worldobj_group_data.hxx     27 Sep 2002 11:26:49 -0000      1.4
@@ -50,7 +50,7 @@
   EditorObjLst create_EditorObj ();
   
 private:
-  WorldObjGroupData operator= (const WorldObjGroupData&);
+  WorldObjGroupData& operator= (const WorldObjGroupData&);
 };
 
 } // namespace WorldObjsData