[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata solid_color_background_data.cxx,NONE,1.1 solid_color_background_data.hxx,NONE,1.1 Makefile.am,1.5,1.6 bumper_data.cxx,1.4,1.5 conveyor_belt_data.cxx,1.1,1.2 fake_exit_data.cxx,1.4,1.5 guillotine_data.cxx,1.5,1.6 hammer_data.cxx,1.4,1.5 ice_block_data.cxx,1.1,1.2 info_box_data.cxx,1.2,1.3 laser_exit_data.cxx,1.4,1.5 smasher_data.cxx,1.4,1.5 spike_data.cxx,1.4,1.5 switch_door_data.cxx,1.2,1.3 teleporter_data.cxx,1.3,1.4

[torangan]

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

Modified Files:
        Makefile.am bumper_data.cxx conveyor_belt_data.cxx 
        fake_exit_data.cxx guillotine_data.cxx hammer_data.cxx 
        ice_block_data.cxx info_box_data.cxx laser_exit_data.cxx 
        smasher_data.cxx spike_data.cxx switch_door_data.cxx 
        teleporter_data.cxx 
Added Files:
        solid_color_background_data.cxx 
        solid_color_background_data.hxx 
Log Message:
splitted SolidColorBackground


--- NEW FILE: solid_color_background_data.cxx ---
//  $Id: solid_color_background_data.cxx,v 1.1 2002/09/15 09:54:34 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 <ostream>
#include "../xml_helper.hxx"
#include "../editorobjs/solid_color_background_obj.hxx"
#include "../worldobjs/solid_color_background.hxx"
#include "solid_color_background_data.hxx"

namespace WorldObjsData {

SolidColorBackgroundData::SolidColorBackgroundData (xmlDocPtr doc, xmlNodePtr 
cur)
{
  cur = cur->children;
  while (cur)
    {
      if (xmlIsBlankNode(cur)) 
        {
          cur = cur->next;
          continue;
        }

      if (XMLhelper::equal_str(cur->name, "color"))
        {
          color = XMLhelper::parse_color (doc, cur);
        }
      else
        {
          std::cout << "SolidColorBackground: Unhandled tag: " << cur->name << 
std::endl;
        }
      cur = cur->next;
    }
}

SolidColorBackgroundData::SolidColorBackgroundData (const 
SolidColorBackgroundData& old)
  : WorldObjData(old),
    pos(old.pos),
    color(old.color)
{
}

void
SolidColorBackgroundData::write_xml (std::ostream& xml)
{
  xml << "<worldobj type=\"solidcolor-background\"></worldobj>" << std::endl;
}

WorldObj* 
SolidColorBackgroundData::create_WorldObj ()
{
  return new WorldObjs::SolidColorBackground(this);
}

EditorObjLst 
SolidColorBackgroundData::create_EditorObj()
{
  return EditorObjLst(1, new EditorObjs::SolidColorBackgroundObj(this));
}

} // namespace WorldObjsData

/* EOF */

--- NEW FILE: solid_color_background_data.hxx ---
//  $Id: solid_color_background_data.hxx,v 1.1 2002/09/15 09:54:34 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.

#ifndef HEADER_PINGUS_WORLDOBJSDATA_SOLID_COLOR_BACKGROUND_DATA_HXX
#define HEADER_PINGUS_WORLDOBJSDATA_SOLID_COLOR_BACKGROUND_DATA_HXX

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

namespace WorldObjsData {

class SolidColorBackgroundData : public WorldObjData
{
public:
  CL_Vector pos;
  Color     color;

  // FIXME: Add z_pos handling here

  SolidColorBackgroundData () {}
  SolidColorBackgroundData (xmlDocPtr doc, xmlNodePtr cur);
  SolidColorBackgroundData (const SolidColorBackgroundData& old);

  virtual ~SolidColorBackgroundData() {}

  /** Writte the content of this object formated as xml to the given
      stream */
  virtual void write_xml (std::ostream& xml);

  WorldObj* create_WorldObj ();
  EditorObjLst create_EditorObj ();

private:
  SolidColorBackgroundData operator= (const SolidColorBackgroundData&);
};

} // namespace WorldObjsData

#endif

/* EOF */

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 14 Sep 2002 19:06:34 -0000      1.5
+++ Makefile.am 15 Sep 2002 09:54:34 -0000      1.6
@@ -18,17 +18,18 @@
 noinst_LIBRARIES = libpingus_worldobjsdata.a
 
 libpingus_worldobjsdata_a_SOURCES = \
-       bumper_data.cxx        bumper_data.hxx \
-       conveyor_belt_data.cxx conveyor_belt_data.hxx \
-       fake_exit_data.cxx     fake_exit_data.hxx \
-       guillotine_data.cxx    guillotine_data.hxx \
-       hammer_data.cxx        hammer_data.hxx \
-       ice_block_data.cxx     ice_block_data.hxx \
-       info_box_data.cxx      info_box_data.hxx \
-       laser_exit_data.cxx    laser_exit_data.hxx \
-       smasher_data.cxx       smasher_data.hxx \
-       spike_data.cxx         spike_data.hxx  \
-       switch_door_data.cxx   switch_door_data.hxx \
-       teleporter_data.cxx    teleporter_data.hxx
+       bumper_data.cxx                 bumper_data.hxx \
+       conveyor_belt_data.cxx          conveyor_belt_data.hxx \
+       fake_exit_data.cxx              fake_exit_data.hxx \
+       guillotine_data.cxx             guillotine_data.hxx \
+       hammer_data.cxx                 hammer_data.hxx \
+       ice_block_data.cxx              ice_block_data.hxx \
+       info_box_data.cxx               info_box_data.hxx \
+       laser_exit_data.cxx             laser_exit_data.hxx \
+       smasher_data.cxx                smasher_data.hxx \
+       solid_color_background_data.cxx solid_color_background_data.hxx \
+       spike_data.cxx                  spike_data.hxx  \
+       switch_door_data.cxx            switch_door_data.hxx \
+       teleporter_data.cxx             teleporter_data.hxx
 
 # EOF #

Index: bumper_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/bumper_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bumper_data.cxx     10 Sep 2002 21:03:33 -0000      1.4
+++ bumper_data.cxx     15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "bumper_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/bumper_obj.hxx"

Index: conveyor_belt_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/conveyor_belt_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conveyor_belt_data.cxx      14 Sep 2002 19:06:34 -0000      1.1
+++ conveyor_belt_data.cxx      15 Sep 2002 09:54:34 -0000      1.2
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/conveyor_belt_obj.hxx"

Index: fake_exit_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/fake_exit_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fake_exit_data.cxx  10 Sep 2002 21:03:33 -0000      1.4
+++ fake_exit_data.cxx  15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "fake_exit_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/fake_exit_obj.hxx"

Index: guillotine_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/guillotine_data.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- guillotine_data.cxx 14 Sep 2002 19:06:35 -0000      1.5
+++ guillotine_data.cxx 15 Sep 2002 09:54:34 -0000      1.6
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
 #include <iostream>
 #include "guillotine_data.hxx"
 #include "../xml_helper.hxx"

Index: hammer_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/hammer_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hammer_data.cxx     10 Sep 2002 21:03:33 -0000      1.4
+++ hammer_data.cxx     15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "hammer_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/hammer_obj.hxx"

Index: ice_block_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/ice_block_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ice_block_data.cxx  14 Sep 2002 19:06:35 -0000      1.1
+++ ice_block_data.cxx  15 Sep 2002 09:54:34 -0000      1.2
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/ice_block_obj.hxx"

Index: info_box_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/info_box_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- info_box_data.cxx   14 Sep 2002 19:06:35 -0000      1.2
+++ info_box_data.cxx   15 Sep 2002 09:54:34 -0000      1.3
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/info_box_obj.hxx"

Index: laser_exit_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/laser_exit_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- laser_exit_data.cxx 10 Sep 2002 21:03:33 -0000      1.4
+++ laser_exit_data.cxx 15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "laser_exit_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/laser_exit_obj.hxx"

Index: smasher_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/smasher_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smasher_data.cxx    10 Sep 2002 21:03:33 -0000      1.4
+++ smasher_data.cxx    15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "smasher_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/smasher_obj.hxx"

Index: spike_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjsdata/spike_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- spike_data.cxx      10 Sep 2002 21:03:33 -0000      1.4
+++ spike_data.cxx      15 Sep 2002 09:54:34 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "spike_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/spike_obj.hxx"

Index: switch_door_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/switch_door_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switch_door_data.cxx        14 Sep 2002 19:06:35 -0000      1.2
+++ switch_door_data.cxx        15 Sep 2002 09:54:34 -0000      1.3
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "../pingus_resource.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/switch_door_obj.hxx"

Index: teleporter_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/teleporter_data.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- teleporter_data.cxx 10 Sep 2002 21:03:33 -0000      1.3
+++ teleporter_data.cxx 15 Sep 2002 09:54:34 -0000      1.4
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <fstream>
+#include <ostream>
 #include "teleporter_data.hxx"
 #include "../xml_helper.hxx"
 #include "../editorobjs/teleporter_obj.hxx"