[Pingus-CVS] r2791 - in branches/pingus_sdl/src: . editor

[jsalmon3]

Author: jsalmon3
Date: 2007-08-04 09:02:52 +0200 (Sat, 04 Aug 2007)
New Revision: 2791

Modified:
   branches/pingus_sdl/src/editor/editor_level.cpp
   branches/pingus_sdl/src/file_writer.hpp
   branches/pingus_sdl/src/sexpr_file_writer.cpp
   branches/pingus_sdl/src/sexpr_file_writer.hpp
Log:
Added write_size

Modified: branches/pingus_sdl/src/editor/editor_level.cpp
===================================================================
--- branches/pingus_sdl/src/editor/editor_level.cpp     2007-08-04 06:52:26 UTC 
(rev 2790)
+++ branches/pingus_sdl/src/editor/editor_level.cpp     2007-08-04 07:02:52 UTC 
(rev 2791)
@@ -100,10 +100,7 @@
        }
        fw.end_section();       // actions
 
-       fw.begin_section("levelsize");
-       fw.write_int("width", impl->size.width);
-       fw.write_int("height", impl->size.height);
-       fw.end_section();       // levelsize
+       fw.write_size("levelsize", impl->size);
        fw.end_section();       // head
 
        // Write the objects

Modified: branches/pingus_sdl/src/file_writer.hpp
===================================================================
--- branches/pingus_sdl/src/file_writer.hpp     2007-08-04 06:52:26 UTC (rev 
2790)
+++ branches/pingus_sdl/src/file_writer.hpp     2007-08-04 07:02:52 UTC (rev 
2791)
@@ -24,6 +24,7 @@
 
 
 class Vector3f;
+class Size;
 
 /** Interface to write out name/value pairs out of some kind of file or
     structure */
@@ -41,6 +42,7 @@
   virtual void write_bool   (const char* name, bool) =0;
   virtual void write_string (const char* name, const std::string&) =0;
   virtual void write_vector (const char* name, const Vector3f&) =0;
+  virtual void write_size   (const char* name, const Size&) = 0;
 };
 
 

Modified: branches/pingus_sdl/src/sexpr_file_writer.cpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_writer.cpp       2007-08-04 06:52:26 UTC 
(rev 2790)
+++ branches/pingus_sdl/src/sexpr_file_writer.cpp       2007-08-04 07:02:52 UTC 
(rev 2791)
@@ -108,4 +108,10 @@
          << ")\n";
 }
 
+void
+SExprFileWriter::write_size(const char* name, const Size& size)
+{
+  (*out) << "(" << name << " " << size.width << " " << size.height << ")\n";
+}
+
 /* EOF */

Modified: branches/pingus_sdl/src/sexpr_file_writer.hpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_writer.hpp       2007-08-04 06:52:26 UTC 
(rev 2790)
+++ branches/pingus_sdl/src/sexpr_file_writer.hpp       2007-08-04 07:02:52 UTC 
(rev 2791)
@@ -24,6 +24,7 @@
 #include "file_writer.hpp"
 #include "math/color.hpp"
 #include "math/vector3f.hpp"
+#include "math/size.hpp"
 
 /** */
 class SExprFileWriter : public FileWriter
@@ -45,6 +46,7 @@
   virtual void write_bool(const char* name, bool);
   virtual void write_string(const char* name, const std::string&);
   virtual void write_vector(const char* name, const Vector3f&);
+  virtual void write_size(const char* name, const Size&);
 
   template<class E, class F>
   void write_enum(const char* name, E value, F enum2string)