[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds solidcolor_background.cxx
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/backgrounds solidcolor_background.cxx,1.1,1.2 solidcolor_background.hxx,1.3,1.4 starfield_background.cxx,1.3,1.4 starfield_background.hxx,1.3,1.4 surface_background_data.cxx,1.1,1.2 surface_background_data.hxx,1.3,1.4 thunderstorm_background_data.cxx,1.2,1.3 thunderstorm_background_data.hxx,1.3,1.4 |
Date: |
25 Jun 2002 12:20:35 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/backgrounds
In directory dark:/tmp/cvs-serv24105/backgrounds
Modified Files:
solidcolor_background.cxx solidcolor_background.hxx
starfield_background.cxx starfield_background.hxx
surface_background_data.cxx surface_background_data.hxx
thunderstorm_background_data.cxx
thunderstorm_background_data.hxx
Log Message:
- replaced all ofstream* by ostream&
- some more prefab stuff
Index: solidcolor_background.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/solidcolor_background.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- solidcolor_background.cxx 12 Jun 2002 19:02:30 -0000 1.1
+++ solidcolor_background.cxx 25 Jun 2002 12:20:33 -0000 1.2
@@ -23,9 +23,9 @@
#include "../xml_helper.hxx"
void
-SolidColorBackgroundData:: write_xml(std::ofstream* xml)
+SolidColorBackgroundData:: write_xml(std::ostream& xml)
{
- (*xml) << "<worldobj type=\"solidcolor-background\"></worldobj>" <<
std::endl;
+ xml << "<worldobj type=\"solidcolor-background\"></worldobj>" << std::endl;
}
SolidColorBackgroundData::SolidColorBackgroundData(xmlDocPtr doc, xmlNodePtr
cur)
Index: solidcolor_background.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/solidcolor_background.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- solidcolor_background.hxx 24 Jun 2002 22:52:58 -0000 1.3
+++ solidcolor_background.hxx 25 Jun 2002 12:20:33 -0000 1.4
@@ -44,7 +44,7 @@
/** Writte the content of this object formated as xml to the given
stream */
- virtual void write_xml(std::ofstream* xml);
+ virtual void write_xml(std::ostream& xml);
WorldObj* create_WorldObj();
EditorObjLst create_EditorObj();
@@ -74,7 +74,7 @@
: SolidColorBackgroundData (data),
pos (0.0f, 0.0f)
{}
- void write_xml(std::ofstream* xml) {
this->SolidColorBackgroundData::write_xml (xml); }
+ void write_xml(std::ostream& xml) {
this->SolidColorBackgroundData::write_xml (xml); }
/// Return the object width
int get_width() { return 256; }
Index: starfield_background.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/starfield_background.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background.cxx 21 Jun 2002 07:45:35 -0000 1.3
+++ starfield_background.cxx 25 Jun 2002 12:20:33 -0000 1.4
@@ -32,14 +32,14 @@
}
void
-StarfieldBackgroundData::write_xml(std::ofstream* xml)
+StarfieldBackgroundData::write_xml(std::ostream& xml)
{
- (*xml) << "<background type=\"starfield\">\n"
- << " <small-stars count=\"" << small_stars_count << "\"/>\n"
- << " <middle-stars count=\"" << middle_stars_count << "\"/>\n"
- << " <large-stars count=\"" << large_stars_count << "\"/>\n"
- << "</background>\n"
- << std::endl;
+ xml << "<background type=\"starfield\">\n"
+ << " <small-stars count=\"" << small_stars_count << "\"/>\n"
+ << " <middle-stars count=\"" << middle_stars_count << "\"/>\n"
+ << " <large-stars count=\"" << large_stars_count << "\"/>\n"
+ << "</background>\n"
+ << std::endl;
}
StarfieldBackgroundData::StarfieldBackgroundData (xmlDocPtr /*doc*/,
xmlNodePtr cur)
@@ -50,7 +50,7 @@
cur = cur->children;
- while (cur != NULL)
+ while (cur != NULL)
{
if (xmlIsBlankNode(cur))
{
Index: starfield_background.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/starfield_background.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- starfield_background.hxx 24 Jun 2002 22:52:58 -0000 1.3
+++ starfield_background.hxx 25 Jun 2002 12:20:33 -0000 1.4
@@ -38,7 +38,7 @@
StarfieldBackgroundData (xmlDocPtr /*doc*/, xmlNodePtr cur);
virtual ~StarfieldBackgroundData () {}
- void write_xml(std::ofstream* xml);
+ void write_xml(std::ostream& xml);
WorldObj* create_WorldObj();
EditorObjLst create_EditorObj();
@@ -105,7 +105,7 @@
pos (-64.0f, 0.0f)
{}
- void write_xml(std::ofstream* xml) {
this->StarfieldBackgroundData::write_xml (xml); }
+ void write_xml(std::ostream& xml) { this->StarfieldBackgroundData::write_xml
(xml); }
boost::shared_ptr<EditorObj> duplicate() {
return boost::shared_ptr<EditorObj>
Index: surface_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/surface_background_data.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- surface_background_data.cxx 12 Jun 2002 19:02:30 -0000 1.1
+++ surface_background_data.cxx 25 Jun 2002 12:20:33 -0000 1.2
@@ -39,26 +39,26 @@
}
void
-SurfaceBackgroundData::write_xml(std::ofstream* xml)
+SurfaceBackgroundData::write_xml(std::ostream& xml)
{
- (*xml) << "<background type=\"surface\">\n";
+ xml << "<background type=\"surface\">\n";
XMLhelper::write_desc_xml(xml, desc);
- (*xml) << " <color>\n"
- << " <red>" << color.red << "</red>\n"
- << " <green>" << color.green << "</green>\n"
- << " <blue>" << color.blue << "</blue>\n"
- << " <alpha>" << color.alpha << "</alpha>\n"
- << " </color>\n"
- << " <scroll-x>" << scroll_x << "</scroll-x>\n"
- << " <scroll-y>" << scroll_y << "</scroll-y>\n"
- << " <para-x>" << para_x << "</para-x>\n"
- << " <para-y>" << para_y << "</para-y>\n"
- << " <stretch-x>" << stretch_x << "</stretch-x>\n"
- << " <stretch-y>" << stretch_y << "</stretch-y>\n";
+ xml << " <color>\n"
+ << " <red>" << color.red << "</red>\n"
+ << " <green>" << color.green << "</green>\n"
+ << " <blue>" << color.blue << "</blue>\n"
+ << " <alpha>" << color.alpha << "</alpha>\n"
+ << " </color>\n"
+ << " <scroll-x>" << scroll_x << "</scroll-x>\n"
+ << " <scroll-y>" << scroll_y << "</scroll-y>\n"
+ << " <para-x>" << para_x << "</para-x>\n"
+ << " <para-y>" << para_y << "</para-y>\n"
+ << " <stretch-x>" << stretch_x << "</stretch-x>\n"
+ << " <stretch-y>" << stretch_y << "</stretch-y>\n";
XMLhelper::write_vector_xml(xml, pos);
- (*xml) << "</background>\n"
- << std::endl;
+ xml << "</background>\n"
+ << std::endl;
}
SurfaceBackgroundData::SurfaceBackgroundData(xmlDocPtr doc, xmlNodePtr cur)
Index: surface_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/surface_background_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_background_data.hxx 24 Jun 2002 22:52:58 -0000 1.3
+++ surface_background_data.hxx 25 Jun 2002 12:20:33 -0000 1.4
@@ -72,7 +72,7 @@
/** Write the content of this object formated as xml to the given
stream */
- void write_xml(std::ofstream* xml);
+ void write_xml(std::ostream& xml);
WorldObj* create_WorldObj();
EditorObjLst create_EditorObj();
@@ -91,7 +91,7 @@
}
- void write_xml(std::ofstream* xml) { this->SurfaceBackgroundData::write_xml
(xml); }
+ void write_xml(std::ostream& xml) { this->SurfaceBackgroundData::write_xml
(xml); }
boost::shared_ptr<EditorObj> duplicate() {
return boost::shared_ptr<EditorObj>
Index: thunderstorm_background_data.cxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/thunderstorm_background_data.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- thunderstorm_background_data.cxx 13 Jun 2002 14:25:12 -0000 1.2
+++ thunderstorm_background_data.cxx 25 Jun 2002 12:20:33 -0000 1.3
@@ -22,10 +22,10 @@
#include "thunderstorm_background.hxx"
void
-ThunderstormBackgroundData::write_xml(std::ofstream* xml)
+ThunderstormBackgroundData::write_xml(std::ostream& xml)
{
- (*xml) << "<background type=\"thunderstorm\">\n"
- << "</background>" << std::endl;
+ xml << "<background type=\"thunderstorm\">\n"
+ << "</background>" << std::endl;
}
ThunderstormBackgroundData::ThunderstormBackgroundData (xmlDocPtr doc,
xmlNodePtr cur)
Index: thunderstorm_background_data.hxx
===================================================================
RCS file:
/usr/local/cvsroot/Games/Pingus/src/backgrounds/thunderstorm_background_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thunderstorm_background_data.hxx 24 Jun 2002 22:52:58 -0000 1.3
+++ thunderstorm_background_data.hxx 25 Jun 2002 12:20:33 -0000 1.4
@@ -38,7 +38,7 @@
/** Writte the content of this object formated as xml to the given
stream */
- virtual void write_xml(std::ofstream* xml);
+ virtual void write_xml(std::ostream& xml);
WorldObj* create_WorldObj();
EditorObjLst create_EditorObj();
@@ -56,7 +56,7 @@
pos = CL_Vector(-128.0f, 0.0f);
}
- void write_xml(std::ofstream* xml) {
this->ThunderstormBackgroundData::write_xml (xml); }
+ void write_xml(std::ostream& xml) {
this->ThunderstormBackgroundData::write_xml (xml); }
boost::shared_ptr<EditorObj> duplicate() {
return boost::shared_ptr<EditorObj>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/backgrounds solidcolor_background.cxx,1.1,1.2 solidcolor_background.hxx,1.3,1.4 starfield_background.cxx,1.3,1.4 starfield_background.hxx,1.3,1.4 surface_background_data.cxx,1.1,1.2 surface_background_data.hxx,1.3,1.4 thunderstorm_background_data.cxx,1.2,1.3 thunderstorm_background_data.hxx,1.3,1.4,
grumbel <=
- Prev by Date:
[Pingus-CVS] [Bug #749] XML writing should look more nicely
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.7,1.8 editor_groundpiece_obj.hxx,1.2,1.3 editorobj.hxx,1.2,1.3 editorobj_group.cxx,1.2,1.3 editorobj_group.hxx,1.5,1.6 editorobj_group_data.cxx,1.1,1.2 editorobj_group_data.hxx,1.2,1.3 object_manager.cxx,1.7,1.8 object_selector.cxx,1.4,1.5 plfobj.hxx,1.2,1.3 start_pos.cxx,1.2,1.3 start_pos.hxx,1.2,1.3 weather_obj.cxx,1.2,1.3 weather_obj.hxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] [Bug #749] XML writing should look more nicely
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.7,1.8 editor_groundpiece_obj.hxx,1.2,1.3 editorobj.hxx,1.2,1.3 editorobj_group.cxx,1.2,1.3 editorobj_group.hxx,1.5,1.6 editorobj_group_data.cxx,1.1,1.2 editorobj_group_data.hxx,1.2,1.3 object_manager.cxx,1.7,1.8 object_selector.cxx,1.4,1.5 plfobj.hxx,1.2,1.3 start_pos.cxx,1.2,1.3 start_pos.hxx,1.2,1.3 weather_obj.cxx,1.2,1.3 weather_obj.hxx,1.2,1.3
- Index(es):