[Pingus-CVS] CVS: Games/Pingus/src/worldobjs ConveyorBelt.cc,1.32,1.33 IceBlock.cc,1.25,1.26 InfoBox.cc,1.5,1.6 SwitchDoor.cc,1.27,1.28 Teleporter.cc,1.35,1.36

[grumbel]

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

Modified Files:
        ConveyorBelt.cc IceBlock.cc InfoBox.cc SwitchDoor.cc 
        Teleporter.cc 
Log Message:
Removed Position and all references to operator<<(ostream, CL_Vector) since 
thats buggy in ClanLib

Index: ConveyorBelt.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ConveyorBelt.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ConveyorBelt.cc     8 Jun 2002 20:19:55 -0000       1.32
+++ ConveyorBelt.cc     8 Jun 2002 21:43:36 -0000       1.33
@@ -23,7 +23,6 @@
 #include "../PinguHolder.hh"
 #include "../PingusResource.hh"
 #include "../XMLhelper.hh"
-#include "../Position.hh"
 #include "ConveyorBelt.hh"
 #include "../GroundpieceData.hh"
 
@@ -39,7 +38,7 @@
 ConveyorBeltData::write_xml(std::ofstream* xml)
 {
   (*xml) << "  <worldobj type=\"conveyorbelt\">";
-  XMLhelper::write_position_xml (xml, pos);
+  XMLhelper::write_vector_xml (xml, pos);
   (*xml) << "    <width>" << width << "</width>\n"
         << "    <speed>" << speed << "</speed>\n"
         << "  </worldobj>\n" << std::endl;

Index: IceBlock.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/IceBlock.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- IceBlock.cc 8 Jun 2002 20:19:55 -0000       1.25
+++ IceBlock.cc 8 Jun 2002 21:43:37 -0000       1.26
@@ -25,7 +25,6 @@
 #include "../GroundpieceData.hh"
 #include "../PinguMap.hh"
 #include "../GameTime.hh"
-#include "../Position.hh"
 #include "IceBlock.hh"
 
 IceBlockData::IceBlockData ()
@@ -37,7 +36,7 @@
 IceBlockData::write_xml(std::ofstream* xml)
 {
   (*xml) << "  <worldobj type=\"iceblock\">";
-  XMLhelper::write_position_xml (xml, pos);
+  XMLhelper::write_vector_xml (xml, pos);
   (*xml) << "    <width>" << width << "</width>\n"
         << "  </worldobj>\n" << std::endl;
 }

Index: InfoBox.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/InfoBox.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- InfoBox.cc  8 Jun 2002 20:19:55 -0000       1.5
+++ InfoBox.cc  8 Jun 2002 21:43:37 -0000       1.6
@@ -21,7 +21,6 @@
 #include "../World.hh"
 #include "../PingusResource.hh"
 #include "../XMLhelper.hh"
-#include "../Position.hh"
 #include "InfoBox.hh"
 
 InfoBoxData::InfoBoxData ()
@@ -35,14 +34,12 @@
 boost::shared_ptr<WorldObj> 
 InfoBoxData::create_WorldObj()
 {
-  std::cout << "InfoBoxData::create_WorldObj(): " << this->pos << std::endl;
   return boost::shared_ptr<WorldObj> (new InfoBox (*this));
 }
 
 EditorObjLst
 InfoBoxData::create_EditorObj()
 {
-  std::cout << "InfoBoxData::create_EditorObj()" << this->pos << std::endl;
   EditorObjLst lst;
   lst.push_back (boost::shared_ptr<EditorObj>(new EditorInfoBox (*this)));
   return lst;
@@ -82,7 +79,7 @@
 InfoBoxData::write_xml(std::ofstream* xml)
 {
   (*xml) << "  <worldobj type=\"infobox\">\n";
-  XMLhelper::write_position_xml (xml, pos);
+  XMLhelper::write_vector_xml (xml, pos);
   
   (*xml) << "   <info-text>" << info_text << "</info-text>\n" 
         << "  </worldobj>\n" << std::endl;

Index: SwitchDoor.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/SwitchDoor.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- SwitchDoor.cc       8 Jun 2002 20:19:55 -0000       1.27
+++ SwitchDoor.cc       8 Jun 2002 21:43:37 -0000       1.28
@@ -24,7 +24,6 @@
 #include "../editor/EditorView.hh"
 #include "../GroundpieceData.hh"
 #include "../XMLhelper.hh"
-#include "../Position.hh"
 #include "SwitchDoor.hh"
 
 SwitchDoorData::SwitchDoorData ()
@@ -37,11 +36,11 @@
 {
   (*xml) << "  <worldobj type=\"switchdoor\">\n";
   (*xml) << "    <switch>\n";
-  XMLhelper::write_position_xml (xml, switch_pos);
+  XMLhelper::write_vector_xml (xml, switch_pos);
   (*xml) << "    </switch>\n"
         << "    <door>\n"
         << "    <height>\n" << door_height << "</height>\n";
-  XMLhelper::write_position_xml (xml, door_pos);
+  XMLhelper::write_vector_xml (xml, door_pos);
   (*xml) << "    </door>\n"
         << "  </worldobj>\n" << std::endl;
 }

Index: Teleporter.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/Teleporter.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Teleporter.cc       8 Jun 2002 20:19:55 -0000       1.35
+++ Teleporter.cc       8 Jun 2002 21:43:37 -0000       1.36
@@ -22,7 +22,6 @@
 #include "../PinguHolder.hh"
 #include "../XMLhelper.hh"
 #include "../editor/EditorView.hh"
-#include "../Position.hh"
 #include "Teleporter.hh"
 
 TeleporterData::TeleporterData (const TeleporterData& data) : 
WorldObjData(data)
@@ -35,9 +34,9 @@
 TeleporterData::write_xml(std::ofstream* xml)
 {
   (*xml) << "  <worldobj type=\"teleporter\">";
-  XMLhelper::write_position_xml (xml, pos);
+  XMLhelper::write_vector_xml (xml, pos);
   (*xml) << "    <target>" << std::endl;
-  XMLhelper::write_position_xml (xml, target_pos);
+  XMLhelper::write_vector_xml (xml, target_pos);
   (*xml) << "    </target>" << std::endl;
   (*xml) << "  </worldobj>" << std::endl;
 }
@@ -178,8 +177,6 @@
 EditorTeleporterObj::create (const TeleporterData& data)
 {
   std::list<boost::shared_ptr<EditorObj> > objs;
-
-  //std::cout << "EditorTeleporterObj: " << tdata << " - " << 
tdata->target_pos << std::endl;
 
   EditorTeleporterObj* teleporter=new EditorTeleporterObj (data);
   EditorTeleporterTargetObj* teleporter_target=new EditorTeleporterTargetObj 
(teleporter);