[Supertux-Commit] r5984 - in branches/supertux-milestone2-grumbel/src: badguy control object scripting supertux trigger util worldmap

[grumbel at cummiskey.dreamhost.com]

Author: grumbel
Date: 2009-11-15 18:35:47 -0800 (Sun, 15 Nov 2009)
New Revision: 5984

Removed:
   branches/supertux-milestone2-grumbel/src/util/serializable.hpp
Modified:
   branches/supertux-milestone2-grumbel/src/badguy/angrystone.cpp
   branches/supertux-milestone2-grumbel/src/badguy/angrystone.hpp
   branches/supertux-milestone2-grumbel/src/badguy/badguy.cpp
   branches/supertux-milestone2-grumbel/src/badguy/badguy.hpp
   branches/supertux-milestone2-grumbel/src/badguy/bomb.cpp
   branches/supertux-milestone2-grumbel/src/badguy/bomb.hpp
   branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.cpp
   branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.hpp
   branches/supertux-milestone2-grumbel/src/badguy/dart.cpp
   branches/supertux-milestone2-grumbel/src/badguy/dart.hpp
   branches/supertux-milestone2-grumbel/src/badguy/darttrap.cpp
   branches/supertux-milestone2-grumbel/src/badguy/darttrap.hpp
   branches/supertux-milestone2-grumbel/src/badguy/dispenser.cpp
   branches/supertux-milestone2-grumbel/src/badguy/dispenser.hpp
   branches/supertux-milestone2-grumbel/src/badguy/fish.cpp
   branches/supertux-milestone2-grumbel/src/badguy/fish.hpp
   branches/supertux-milestone2-grumbel/src/badguy/flame.cpp
   branches/supertux-milestone2-grumbel/src/badguy/flame.hpp
   branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.cpp
   branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.hpp
   branches/supertux-milestone2-grumbel/src/badguy/igel.cpp
   branches/supertux-milestone2-grumbel/src/badguy/igel.hpp
   branches/supertux-milestone2-grumbel/src/badguy/jumpy.cpp
   branches/supertux-milestone2-grumbel/src/badguy/jumpy.hpp
   branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.cpp
   branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mole.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mole.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mole_rock.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mole_rock.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mrbomb.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mrbomb.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mriceblock.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mriceblock.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mrrocket.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mrrocket.hpp
   branches/supertux-milestone2-grumbel/src/badguy/mrtree.cpp
   branches/supertux-milestone2-grumbel/src/badguy/mrtree.hpp
   branches/supertux-milestone2-grumbel/src/badguy/plant.cpp
   branches/supertux-milestone2-grumbel/src/badguy/plant.hpp
   branches/supertux-milestone2-grumbel/src/badguy/poisonivy.cpp
   branches/supertux-milestone2-grumbel/src/badguy/poisonivy.hpp
   branches/supertux-milestone2-grumbel/src/badguy/skullyhop.cpp
   branches/supertux-milestone2-grumbel/src/badguy/skullyhop.hpp
   branches/supertux-milestone2-grumbel/src/badguy/snail.cpp
   branches/supertux-milestone2-grumbel/src/badguy/snail.hpp
   branches/supertux-milestone2-grumbel/src/badguy/snowball.cpp
   branches/supertux-milestone2-grumbel/src/badguy/snowball.hpp
   branches/supertux-milestone2-grumbel/src/badguy/spidermite.cpp
   branches/supertux-milestone2-grumbel/src/badguy/spidermite.hpp
   branches/supertux-milestone2-grumbel/src/badguy/spiky.cpp
   branches/supertux-milestone2-grumbel/src/badguy/spiky.hpp
   branches/supertux-milestone2-grumbel/src/badguy/sspiky.cpp
   branches/supertux-milestone2-grumbel/src/badguy/sspiky.hpp
   branches/supertux-milestone2-grumbel/src/badguy/stalactite.cpp
   branches/supertux-milestone2-grumbel/src/badguy/stalactite.hpp
   branches/supertux-milestone2-grumbel/src/badguy/stumpy.cpp
   branches/supertux-milestone2-grumbel/src/badguy/stumpy.hpp
   branches/supertux-milestone2-grumbel/src/badguy/toad.cpp
   branches/supertux-milestone2-grumbel/src/badguy/toad.hpp
   branches/supertux-milestone2-grumbel/src/badguy/totem.cpp
   branches/supertux-milestone2-grumbel/src/badguy/totem.hpp
   branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.cpp
   branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.hpp
   branches/supertux-milestone2-grumbel/src/badguy/yeti.cpp
   branches/supertux-milestone2-grumbel/src/badguy/yeti.hpp
   branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.cpp
   branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.hpp
   branches/supertux-milestone2-grumbel/src/badguy/zeekling.cpp
   branches/supertux-milestone2-grumbel/src/badguy/zeekling.hpp
   branches/supertux-milestone2-grumbel/src/control/joystickkeyboardcontroller.cpp
   branches/supertux-milestone2-grumbel/src/object/background.cpp
   branches/supertux-milestone2-grumbel/src/object/background.hpp
   branches/supertux-milestone2-grumbel/src/object/camera.cpp
   branches/supertux-milestone2-grumbel/src/object/camera.hpp
   branches/supertux-milestone2-grumbel/src/object/decal.cpp
   branches/supertux-milestone2-grumbel/src/object/decal.hpp
   branches/supertux-milestone2-grumbel/src/object/firefly.cpp
   branches/supertux-milestone2-grumbel/src/object/firefly.hpp
   branches/supertux-milestone2-grumbel/src/object/gradient.cpp
   branches/supertux-milestone2-grumbel/src/object/gradient.hpp
   branches/supertux-milestone2-grumbel/src/object/ispy.cpp
   branches/supertux-milestone2-grumbel/src/object/ispy.hpp
   branches/supertux-milestone2-grumbel/src/object/particlesystem.cpp
   branches/supertux-milestone2-grumbel/src/object/particlesystem.hpp
   branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.cpp
   branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.hpp
   branches/supertux-milestone2-grumbel/src/object/path.cpp
   branches/supertux-milestone2-grumbel/src/object/path.hpp
   branches/supertux-milestone2-grumbel/src/object/rock.cpp
   branches/supertux-milestone2-grumbel/src/object/rock.hpp
   branches/supertux-milestone2-grumbel/src/object/tilemap.cpp
   branches/supertux-milestone2-grumbel/src/object/tilemap.hpp
   branches/supertux-milestone2-grumbel/src/scripting/serialize.cpp
   branches/supertux-milestone2-grumbel/src/supertux/gameconfig.cpp
   branches/supertux-milestone2-grumbel/src/supertux/level.cpp
   branches/supertux-milestone2-grumbel/src/supertux/level.hpp
   branches/supertux-milestone2-grumbel/src/supertux/player_status.cpp
   branches/supertux-milestone2-grumbel/src/supertux/player_status.hpp
   branches/supertux-milestone2-grumbel/src/supertux/sector.cpp
   branches/supertux-milestone2-grumbel/src/supertux/sector.hpp
   branches/supertux-milestone2-grumbel/src/trigger/climbable.cpp
   branches/supertux-milestone2-grumbel/src/trigger/climbable.hpp
   branches/supertux-milestone2-grumbel/src/trigger/door.cpp
   branches/supertux-milestone2-grumbel/src/trigger/door.hpp
   branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.cpp
   branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.hpp
   branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.cpp
   branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.hpp
   branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.cpp
   branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.hpp
   branches/supertux-milestone2-grumbel/src/trigger/switch.cpp
   branches/supertux-milestone2-grumbel/src/trigger/switch.hpp
   branches/supertux-milestone2-grumbel/src/worldmap/worldmap.cpp
Log:
Removed the whole level serialization stuff, as its not used anywhere

Modified: branches/supertux-milestone2-grumbel/src/badguy/angrystone.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/angrystone.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/angrystone.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/angrystone.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -41,17 +40,6 @@
 }
 
 void
-AngryStone::write(lisp::Writer& writer)
-{
-  writer.start_list("angrystone");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("angrystone");
-}
-
-void
 AngryStone::collision_solid(const CollisionHit& hit)
 {
   // TODO

Modified: branches/supertux-milestone2-grumbel/src/badguy/angrystone.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/angrystone.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/angrystone.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -24,7 +24,6 @@
 public:
   AngryStone(const Reader& reader);
 
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/badguy/badguy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/badguy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/badguy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -201,12 +201,6 @@
 }
 
 void
-BadGuy::write(lisp::Writer& )
-{
-  log_warning << "tried to write out a generic badguy" << std::endl;
-}
-
-void
 BadGuy::active_update(float elapsed_time)
 {
   movement = physic.get_movement(elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/badguy/badguy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/badguy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/badguy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -21,7 +21,6 @@
 #include "supertux/direction.hpp"
 #include "supertux/physic.hpp"
 #include "supertux/timer.hpp"
-#include "util/serializable.hpp"
 
 class Player;
 class Bullet;
@@ -30,8 +29,7 @@
  * Base class for moving sprites that can hurt the Player.
  */
 class BadGuy : public MovingSprite, 
-               protected UsesPhysic, 
-               public Serializable
+               protected UsesPhysic
 {
 public:
   BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
@@ -63,11 +61,6 @@
   /** Call this, if you use custom kill_fall() or kill_squashed(GameObject& object) */
   virtual void run_dead_script();
 
-  /** Writes out the badguy into the included lisp::Writer. Useful e.g. when
-   * converting an old-format level to the new format.
-   */
-  virtual void write(lisp::Writer& writer);
-
   /**
    * True if this badguy can break bricks or open bonusblocks in his current form.
    */

Modified: branches/supertux-milestone2-grumbel/src/badguy/bomb.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/bomb.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/bomb.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -41,12 +41,6 @@
 }
 
 void
-Bomb::write(lisp::Writer& )
-{
-  // bombs are only temporarily so don't write them out...
-}
-
-void
 Bomb::collision_solid(const CollisionHit& hit)
 {
   if(hit.bottom)

Modified: branches/supertux-milestone2-grumbel/src/badguy/bomb.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/bomb.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/bomb.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
 public:
   Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_bomb/bomb.sprite" );
 
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/bouncing_snowball.hpp"
 
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -34,17 +33,6 @@
 }
 
 void
-BouncingSnowball::write(lisp::Writer& writer)
-{
-  writer.start_list("bouncingsnowball");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("bouncingsnowball");
-}
-
-void
 BouncingSnowball::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);

Modified: branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/bouncing_snowball.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -26,7 +26,6 @@
   BouncingSnowball(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/dart.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/dart.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/dart.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,7 +18,6 @@
 
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -67,15 +66,6 @@
 }
 
 void
-Dart::write(lisp::Writer& writer)
-{
-  writer.start_list("dart");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("dart");
-}
-
-void
 Dart::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -::SPEED : ::SPEED);

Modified: branches/supertux-milestone2-grumbel/src/badguy/dart.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/dart.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/dart.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -34,8 +34,7 @@
   void initialize();
   void activate();
   void deactivate();
-  void write(lisp::Writer& writer);
-
+  
   void active_update(float elapsed_time);
 
   void collision_solid(const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/darttrap.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/darttrap.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/darttrap.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,7 +18,6 @@
 #include "badguy/darttrap.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
@@ -47,18 +46,6 @@
 }
 
 void
-DartTrap::write(lisp::Writer& writer)
-{
-  writer.start_list("darttrap");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.write("initial-delay", initial_delay);
-  writer.write("fire-delay", fire_delay);
-  writer.write("ammo", ammo);
-  writer.end_list("darttrap");
-}
-
-void
 DartTrap::initialize()
 {
   sprite->set_action(dir == LEFT ? "idle-left" : "idle-right");

Modified: branches/supertux-milestone2-grumbel/src/badguy/darttrap.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/darttrap.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/darttrap.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
 
   void initialize();
   void activate();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/dispenser.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/dispenser.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/dispenser.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/dispenser.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/bullet.hpp"
 #include "object/player.hpp"
@@ -70,21 +69,6 @@
 }
 
 void
-Dispenser::write(lisp::Writer& writer)
-{
-  writer.start_list("dispenser");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.write("cycle", cycle);
-  writer.write("random", random);
-  writer.write("type", type);
-  writer.write("badguy", badguys);
-
-  writer.end_list("dispenser");
-}
-
-void
 Dispenser::activate()
 {
   if( broken ){

Modified: branches/supertux-milestone2-grumbel/src/badguy/dispenser.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/dispenser.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/dispenser.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -26,7 +26,6 @@
 
   void activate();
   void deactivate();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
 
   void freeze();

Modified: branches/supertux-milestone2-grumbel/src/badguy/fish.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/fish.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/fish.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/fish.hpp"
 
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/tile.hpp"
@@ -41,17 +40,6 @@
 }
 
 void
-Fish::write(lisp::Writer& writer)
-{
-  writer.start_list("fish");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("fish");
-}
-
-void
 Fish::collision_solid(const CollisionHit& chit)
 {
   hit(chit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/fish.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/fish.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/fish.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -31,7 +31,6 @@
   HitResponse collision_badguy(BadGuy& , const CollisionHit& );
   void collision_tile(uint32_t tile_attributes);
 
-  void write(lisp::Writer& );
   void active_update(float);
 
   void freeze();

Modified: branches/supertux-milestone2-grumbel/src/badguy/flame.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/flame.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/flame.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,7 +18,6 @@
 
 #include "audio/sound_manager.hpp"
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "supertux/object_factory.hpp"
 
 #include <math.h>
@@ -43,19 +42,6 @@
 }
 
 void
-Flame::write(lisp::Writer& writer)
-{
-  writer.start_list("flame");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.write("radius", radius);
-  writer.write("speed", speed);
-
-  writer.end_list("flame");
-}
-
-void
 Flame::active_update(float elapsed_time)
 {
   angle = fmodf(angle + elapsed_time * speed, (float) (2*M_PI));

Modified: branches/supertux-milestone2-grumbel/src/badguy/flame.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/flame.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/flame.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -30,7 +30,6 @@
   void activate();
   void deactivate();
 
-  void write(lisp::Writer& write);
   void active_update(float elapsed_time);
   void kill_fall();
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/flyingsnowball.hpp"
 
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/sprite_particle.hpp"
 #include "object/player.hpp"
@@ -45,17 +44,6 @@
 }
 
 void
-FlyingSnowBall::write(lisp::Writer& writer)
-{
-  writer.start_list("flyingsnowball");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("flyingsnowball");
-}
-
-void
 FlyingSnowBall::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");

Modified: branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/flyingsnowball.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
 
   void initialize();
   void activate();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/igel.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/igel.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/igel.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,7 +18,6 @@
 #include "object/bullet.hpp"
 #include "supertux/sector.hpp"
 
-#include "lisp/writer.hpp"
 #include "supertux/object_factory.hpp"
 
 namespace {
@@ -44,14 +43,6 @@
 }
 
 void
-Igel::write(lisp::Writer& writer)
-{
-  writer.start_list("igel");
-  WalkingBadguy::write(writer);
-  writer.end_list("igel");
-}
-
-void
 Igel::be_normal()
 {
   initialize();

Modified: branches/supertux-milestone2-grumbel/src/badguy/igel.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/igel.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/igel.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -28,7 +28,6 @@
   Igel(const Reader& reader);
   Igel(const Vector& pos, Direction d);
 
-  void write(lisp::Writer& writer);
   HitResponse collision_bullet(Bullet& bullet, const CollisionHit& hit);
 
   void active_update(float elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/badguy/jumpy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/jumpy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/jumpy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/jumpy.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -35,17 +34,6 @@
 }
 
 void
-Jumpy::write(lisp::Writer& writer)
-{
-  writer.start_list("jumpy");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("jumpy");
-}
-
-void
 Jumpy::collision_solid(const CollisionHit& chit)
 {
   hit(chit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/jumpy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/jumpy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/jumpy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
 
-  void write(lisp::Writer& writer);
   void active_update(float);
 
   void freeze();

Modified: branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "badguy/kugelblitz.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/camera.hpp"
 #include "object/player.hpp"
@@ -48,16 +47,6 @@
 }
 
 void
-Kugelblitz::write(lisp::Writer& writer)
-{
-  writer.start_list("kugelblitz");
-
-  writer.write("x", start_position.x);
-
-  writer.end_list("kugelblitz");
-}
-
-void
 Kugelblitz::initialize()
 {
   physic.set_velocity_y(300);

Modified: branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/kugelblitz.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -29,7 +29,6 @@
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
-  void write(lisp::Writer& writer);
   void active_update(float);
   void kill_fall();
   void explode();

Modified: branches/supertux-milestone2-grumbel/src/badguy/mole.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mole.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mole.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/mole.hpp"
 #include "badguy/mole_rock.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -55,15 +54,6 @@
 }
 
 void
-Mole::write(lisp::Writer& writer)
-{
-  writer.start_list("mole");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("mole");
-}
-
-void
 Mole::activate()
 {
   if (state != DEAD) set_state(PRE_THROWING);

Modified: branches/supertux-milestone2-grumbel/src/badguy/mole.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mole.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mole.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -30,7 +30,6 @@
   bool collision_squished(GameObject& object);
 
   void activate();
-  void write(lisp::Writer& );
   void active_update(float);
 
 private:

Modified: branches/supertux-milestone2-grumbel/src/badguy/mole_rock.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mole_rock.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mole_rock.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/mole_rock.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -56,15 +55,6 @@
 }
 
 void
-MoleRock::write(lisp::Writer& writer)
-{
-  writer.start_list("mole_rock");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("mole_rock");
-}
-
-void
 MoleRock::initialize()
 {
   physic.set_velocity(initial_velocity);

Modified: branches/supertux-milestone2-grumbel/src/badguy/mole_rock.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mole_rock.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mole_rock.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -31,7 +31,6 @@
 
   void initialize();
   void deactivate();
-  void write(lisp::Writer& writer);
 
   void active_update(float elapsed_time);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrbomb.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrbomb.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrbomb.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/bomb.hpp"
 #include "badguy/mrbomb.hpp"
-#include "lisp/writer.hpp"
 #include "object/explosion.hpp"
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
@@ -58,14 +57,6 @@
   sound_manager->preload("sounds/explosion.wav");
 }
 
-void
-MrBomb::write(lisp::Writer& writer)
-{
-  writer.start_list("mrbomb");
-  WalkingBadguy::write(writer);
-  writer.end_list("mrbomb");
-}
-
 HitResponse
 MrBomb::collision(GameObject& object, const CollisionHit& hit)
 {

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrbomb.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrbomb.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrbomb.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -26,7 +26,6 @@
   MrBomb(const Reader& reader);
   MrBomb(const Vector& pos, Direction d);
 
-  void write(lisp::Writer& writer);
   void kill_fall();
   HitResponse collision(GameObject& object, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/mriceblock.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mriceblock.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mriceblock.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/mriceblock.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -57,14 +56,6 @@
 }
 
 void
-MrIceBlock::write(lisp::Writer& writer)
-{
-  writer.start_list("mriceblock");
-  WalkingBadguy::write(writer);
-  writer.end_list("mriceblock");
-}
-
-void
 MrIceBlock::initialize()
 {
   WalkingBadguy::initialize();

Modified: branches/supertux-milestone2-grumbel/src/badguy/mriceblock.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mriceblock.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mriceblock.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -28,7 +28,6 @@
   MrIceBlock(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   HitResponse collision(GameObject& object, const CollisionHit& hit);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrrocket.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrrocket.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrrocket.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/mrrocket.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/explosion.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -37,17 +36,6 @@
 }
 
 void
-MrRocket::write(lisp::Writer& writer)
-{
-  writer.start_list("mrrocket");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("mrrocket");
-}
-
-void
 MrRocket::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrrocket.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrrocket.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrrocket.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
 
   void initialize();
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
 
 protected:

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrtree.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrtree.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrtree.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,6 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/poisonivy.hpp"
 #include "badguy/stumpy.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/player.hpp"
 #include "object/sprite_particle.hpp"
@@ -42,14 +41,6 @@
   sound_manager->preload("sounds/mr_tree.ogg");
 }
 
-void
-MrTree::write(lisp::Writer& writer)
-{
-  writer.start_list("mrtree");
-  WalkingBadguy::write(writer);
-  writer.end_list("mrtree");
-}
-
 bool
 MrTree::collision_squished(GameObject& object)
 {

Modified: branches/supertux-milestone2-grumbel/src/badguy/mrtree.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/mrtree.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/mrtree.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -23,7 +23,6 @@
 {
 public:
   MrTree(const Reader& reader);
-  void write(lisp::Writer& writer);
 
 protected:
   bool collision_squished(GameObject& object);

Modified: branches/supertux-milestone2-grumbel/src/badguy/plant.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/plant.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/plant.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/plant.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -33,17 +32,6 @@
 }
 
 void
-Plant::write(lisp::Writer& writer)
-{
-  writer.start_list("plant");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("plant");
-}
-
-void
 Plant::initialize()
 {
   //FIXME: turns sspiky around for debugging

Modified: branches/supertux-milestone2-grumbel/src/badguy/plant.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/plant.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/plant.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,7 +25,6 @@
   Plant(const Reader& reader);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/badguy/poisonivy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/poisonivy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/poisonivy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "badguy/poisonivy.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/sprite_particle.hpp"
 #include "supertux/object_factory.hpp"
@@ -35,14 +34,6 @@
   walk_speed = 80;
 }
 
-void
-PoisonIvy::write(lisp::Writer& writer)
-{
-  writer.start_list("poisonivy");
-  WalkingBadguy::write(writer);
-  writer.end_list("poisonivy");
-}
-
 bool
 PoisonIvy::collision_squished(GameObject& object)
 {

Modified: branches/supertux-milestone2-grumbel/src/badguy/poisonivy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/poisonivy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/poisonivy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,8 +25,6 @@
   PoisonIvy(const Reader& reader);
   PoisonIvy(const Vector& pos, Direction d);
 
-  void write(lisp::Writer& writer);
-
 protected:
   bool collision_squished(GameObject& object);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/skullyhop.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/skullyhop.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/skullyhop.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/skullyhop.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -47,15 +46,6 @@
 }
 
 void
-SkullyHop::write(lisp::Writer& writer)
-{
-  writer.start_list("skullyhop");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("skullyhop");
-}
-
-void
 SkullyHop::initialize()
 {
   // initial state is JUMPING, because we might start airborne

Modified: branches/supertux-milestone2-grumbel/src/badguy/skullyhop.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/skullyhop.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/skullyhop.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -29,7 +29,6 @@
   SkullyHop(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   bool collision_squished(GameObject& object);

Modified: branches/supertux-milestone2-grumbel/src/badguy/snail.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/snail.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/snail.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/snail.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -59,14 +58,6 @@
 }
 
 void
-Snail::write(lisp::Writer& writer)
-{
-  writer.start_list("snail");
-  WalkingBadguy::write(writer);
-  writer.end_list("snail");
-}
-
-void
 Snail::initialize()
 {
   WalkingBadguy::initialize();

Modified: branches/supertux-milestone2-grumbel/src/badguy/snail.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/snail.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/snail.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -29,7 +29,6 @@
   Snail(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   bool can_break();

Modified: branches/supertux-milestone2-grumbel/src/badguy/snowball.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/snowball.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/snowball.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/snowball.hpp"
 
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -32,14 +31,6 @@
   walk_speed = 80;
 }
 
-void
-SnowBall::write(lisp::Writer& writer)
-{
-  writer.start_list("snowball");
-  WalkingBadguy::write(writer);
-  writer.end_list("snowball");
-}
-
 bool
 SnowBall::collision_squished(GameObject& object)
 {

Modified: branches/supertux-milestone2-grumbel/src/badguy/snowball.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/snowball.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/snowball.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,8 +25,6 @@
   SnowBall(const Reader& reader);
   SnowBall(const Vector& pos, Direction d);
 
-  void write(lisp::Writer& writer);
-
 protected:
   bool collision_squished(GameObject& object);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/spidermite.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/spidermite.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/spidermite.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/spidermite.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -41,17 +40,6 @@
 }
 
 void
-SpiderMite::write(lisp::Writer& writer)
-{
-  writer.start_list("spidermite");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("spidermite");
-}
-
-void
 SpiderMite::initialize()
 {
   sprite->set_action(dir == LEFT ? "left" : "right");

Modified: branches/supertux-milestone2-grumbel/src/badguy/spidermite.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/spidermite.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/spidermite.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -26,7 +26,6 @@
   SpiderMite(const Vector& pos);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/spiky.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/spiky.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/spiky.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/spiky.hpp"
 
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -28,14 +27,6 @@
 }
 
 void
-Spiky::write(lisp::Writer& writer)
-{
-  writer.start_list("spiky");
-  WalkingBadguy::write(writer);
-  writer.end_list("spiky");
-}
-
-void
 Spiky::freeze()
 {
   WalkingBadguy::freeze();

Modified: branches/supertux-milestone2-grumbel/src/badguy/spiky.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/spiky.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/spiky.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -24,8 +24,6 @@
 public:
   Spiky(const Reader& reader);
 
-  void write(lisp::Writer& writer);
-
   void freeze();
   bool is_freezable() const;
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/sspiky.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/sspiky.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/sspiky.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/sspiky.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -31,14 +30,6 @@
 }
 
 void
-SSpiky::write(lisp::Writer& writer)
-{
-  writer.start_list("sspiky");
-  WalkingBadguy::write(writer);
-  writer.end_list("sspiky");
-}
-
-void
 SSpiky::initialize()
 {
   state = SSPIKY_SLEEPING;

Modified: branches/supertux-milestone2-grumbel/src/badguy/sspiky.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/sspiky.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/sspiky.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,7 +25,6 @@
   SSpiky(const Reader& reader);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/badguy/stalactite.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/stalactite.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/stalactite.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/stalactite.hpp"
 
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
@@ -37,15 +36,6 @@
 }
 
 void
-Stalactite::write(lisp::Writer& writer)
-{
-  writer.start_list("stalactite");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("stalactite");
-}
-
-void
 Stalactite::active_update(float elapsed_time)
 {
   if(state == STALACTITE_HANGING) {

Modified: branches/supertux-milestone2-grumbel/src/badguy/stalactite.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/stalactite.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/stalactite.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,7 +25,6 @@
   Stalactite(const Reader& reader);
 
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/stumpy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/stumpy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/stumpy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/stumpy.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/player.hpp"
 #include "object/sprite_particle.hpp"
@@ -51,14 +50,6 @@
 }
 
 void
-Stumpy::write(lisp::Writer& writer)
-{
-  writer.start_list("stumpy");
-  WalkingBadguy::write(writer);
-  writer.end_list("stumpy");
-}
-
-void
 Stumpy::initialize()
 {
   switch (mystate) {

Modified: branches/supertux-milestone2-grumbel/src/badguy/stumpy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/stumpy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/stumpy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
 
   void initialize();
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/toad.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/toad.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/toad.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/toad.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -46,15 +45,6 @@
 }
 
 void
-Toad::write(lisp::Writer& writer)
-{
-  writer.start_list("toad");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("toad");
-}
-
-void
 Toad::initialize()
 {
   // initial state is JUMPING, because we might start airborne

Modified: branches/supertux-milestone2-grumbel/src/badguy/toad.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/toad.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/toad.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -29,7 +29,6 @@
   Toad(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   bool collision_squished(GameObject& object);

Modified: branches/supertux-milestone2-grumbel/src/badguy/totem.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/totem.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/totem.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "badguy/totem.hpp"
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -59,17 +58,6 @@
 }
 
 void
-Totem::write(lisp::Writer& writer)
-{
-  writer.start_list("totem");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("totem");
-}
-
-void
 Totem::initialize()
 {
   if (!carried_by) {

Modified: branches/supertux-milestone2-grumbel/src/badguy/totem.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/totem.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/totem.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -30,7 +30,6 @@
 
   void initialize();
   void active_update(float elapsed_time);
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 

Modified: branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/walking_badguy.hpp"
 
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 
 WalkingBadguy::WalkingBadguy(const Vector& pos, 
@@ -66,13 +65,6 @@
 }
 
 void
-WalkingBadguy::write(lisp::Writer& writer)
-{
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-}
-
-void
 WalkingBadguy::initialize()
 {
   if(frozen)

Modified: branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/walking_badguy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -32,7 +32,6 @@
   WalkingBadguy(const Reader& reader, const std::string& sprite_name, const std::string& walk_left_action, const std::string& walk_right_action, int layer = LAYER_OBJECTS);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/yeti.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/yeti.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/yeti.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,7 +20,6 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/bouncing_snowball.hpp"
 #include "badguy/yeti_stalactite.hpp"
-#include "lisp/writer.hpp"
 #include "object/camera.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
@@ -243,17 +242,6 @@
 }
 
 void
-Yeti::write(lisp::Writer& writer)
-{
-  writer.start_list("yeti");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("yeti");
-}
-
-void
 Yeti::drop_stalactite()
 {
   // make a stalactite falling down and shake camera a bit

Modified: branches/supertux-milestone2-grumbel/src/badguy/yeti.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/yeti.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/yeti.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -29,7 +29,6 @@
   ~Yeti();
 
   void draw(DrawingContext& context);
-  void write(lisp::Writer& writer);
   void initialize();
   void active_update(float elapsed_time);
   void collision_solid(const CollisionHit& hit);

Modified: branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "badguy/yeti_stalactite.hpp"
 
-#include "lisp/writer.hpp"
 #include "supertux/object_factory.hpp"
 
 static const float SHAKE_TIME = .8f;
@@ -31,15 +30,6 @@
 }
 
 void
-YetiStalactite::write(lisp::Writer& writer)
-{
-  writer.start_list("yeti_stalactite");
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-  writer.end_list("yeti_stalactite");
-}
-
-void
 YetiStalactite::start_shaking()
 {
   timer.start(SHAKE_TIME);

Modified: branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/yeti_stalactite.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -25,7 +25,6 @@
   YetiStalactite(const Reader& lisp);
   virtual ~YetiStalactite();
 
-  void write(lisp::Writer& );
   void active_update(float elapsed_time);
   void start_shaking();
   bool is_hanging();

Modified: branches/supertux-milestone2-grumbel/src/badguy/zeekling.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/zeekling.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/zeekling.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,6 @@
 
 #include <math.h>
 
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
@@ -54,17 +53,6 @@
 }
 
 void
-Zeekling::write(lisp::Writer& writer)
-{
-  writer.start_list("zeekling");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("zeekling");
-}
-
-void
 Zeekling::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -speed : speed);

Modified: branches/supertux-milestone2-grumbel/src/badguy/zeekling.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/badguy/zeekling.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/badguy/zeekling.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -27,7 +27,6 @@
   Zeekling(const Vector& pos, Direction d);
 
   void initialize();
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   void active_update(float elapsed_time);
 

Modified: branches/supertux-milestone2-grumbel/src/control/joystickkeyboardcontroller.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/control/joystickkeyboardcontroller.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/control/joystickkeyboardcontroller.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,8 +18,8 @@
 #include "control/joystickkeyboardcontroller.hpp"
 
 #include "gui/menu.hpp"
+#include "util/writer.hpp"
 #include "lisp/list_iterator.hpp"
-#include "lisp/writer.hpp"
 #include "supertux/gameconfig.hpp"
 #include "supertux/console.hpp"
 #include "util/gettext.hpp"
@@ -278,7 +278,7 @@
 }
 
 void
-JoystickKeyboardController::write(lisp::Writer& writer)
+JoystickKeyboardController::write(Writer& writer)
 {
   writer.start_list("keymap");
   writer.write("jump-with-up", jump_with_up_kbd);

Modified: branches/supertux-milestone2-grumbel/src/object/background.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/background.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/background.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "object/background.hpp"
 #include "supertux/main.hpp"
 #include "supertux/object_factory.hpp"
@@ -57,25 +56,6 @@
 }
 
 void
-Background::write(lisp::Writer& writer)
-{
-  writer.start_list("background");
-
-  if (image_top.get() != NULL)
-    writer.write("image-top", imagefile_top);
-
-  writer.write("image", imagefile);
-  if (image_bottom.get() != NULL)
-    writer.write("image-bottom", imagefile_bottom);
-
-  writer.write("speed", speed);
-  writer.write("speed-y", speed_y);
-  writer.write("layer", layer);
-
-  writer.end_list("background");
-}
-
-void
 Background::update(float)
 {
 }

Modified: branches/supertux-milestone2-grumbel/src/object/background.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/background.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/background.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,22 +18,18 @@
 #define HEADER_SUPERTUX_OBJECT_BACKGROUND_HPP
 
 #include "supertux/game_object.hpp"
-#include "util/serializable.hpp"
 #include "util/reader_fwd.hpp"
 #include "video/drawing_context.hpp"
 
 class DisplayManager;
 
-class Background : public GameObject, 
-                   public Serializable
+class Background : public GameObject
 {
 public:
   Background();
   Background(const Reader& reader);
   virtual ~Background();
 
-  virtual void write(lisp::Writer& writer);
-
   void set_image(const std::string& name, float bkgd_speed);
 
   std::string get_image() const

Modified: branches/supertux-milestone2-grumbel/src/object/camera.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/camera.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/camera.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -177,23 +177,6 @@
 }
 
 void
-Camera::write(lisp::Writer& writer)
-{
-  writer.start_list("camera");
-
-  if(mode == NORMAL) {
-    writer.write("mode", "normal");
-  } else if(mode == AUTOSCROLL) {
-    writer.write("mode", "autoscroll");
-    autoscroll_path->write(writer);
-  } else if(mode == MANUAL) {
-    writer.write("mode", "manual");
-  }
-
-  writer.end_list("camera");
-}
-
-void
 Camera::reset(const Vector& tuxpos)
 {
   translation.x = tuxpos.x - SCREEN_WIDTH/2;

Modified: branches/supertux-milestone2-grumbel/src/object/camera.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/camera.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/camera.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -23,7 +23,6 @@
 #include "supertux/game_object.hpp"
 #include "supertux/script_interface.hpp"
 #include "supertux/timer.hpp"
-#include "util/serializable.hpp"
 #include "util/reader_fwd.hpp"
 
 class Sector;
@@ -32,7 +31,6 @@
 class CameraConfig;
 
 class Camera : public GameObject, 
-               public Serializable, 
                public ScriptInterface
 {
 public:
@@ -41,9 +39,7 @@
 
   /// parse camera mode from lisp file
   void parse(const Reader& reader);
-  /// write camera mode to a lisp file
-  virtual void write(lisp::Writer& writer);
-
+    
   /// reset camera position
   void reset(const Vector& tuxpos);
 

Modified: branches/supertux-milestone2-grumbel/src/object/decal.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/decal.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/decal.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "object/decal.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -42,17 +41,6 @@
 }
 
 void
-Decal::write(lisp::Writer& writer)
-{
-  writer.start_list("decal");
-  writer.write("x", pos.x);
-  writer.write("y", pos.y);
-  writer.write("image", imagefile);
-  writer.write("layer", layer);
-  writer.end_list("decal");
-}
-
-void
 Decal::update(float)
 {
 }

Modified: branches/supertux-milestone2-grumbel/src/object/decal.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/decal.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/decal.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,6 @@
 
 #include "supertux/game_object.hpp"
 #include "util/reader_fwd.hpp"
-#include "util/serializable.hpp"
 #include "video/drawing_context.hpp"
 
 class DisplayManager;
@@ -27,14 +26,12 @@
 /**
  * Non-interactive, decorative image
  */
-class Decal : public GameObject, 
-              public Serializable
+class Decal : public GameObject
 {
 public:
   Decal(const Reader& reader);
   virtual ~Decal();
 
-  virtual void write(lisp::Writer& writer);
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 

Modified: branches/supertux-milestone2-grumbel/src/object/firefly.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/firefly.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/firefly.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "object/firefly.hpp"
 
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "object/player.hpp"
 #include "object/sprite_particle.hpp"
@@ -58,15 +57,6 @@
   }
 }
 
-void
-Firefly::write(lisp::Writer& writer)
-{
-  writer.start_list("firefly");
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.end_list("firefly");
-}
-
 HitResponse
 Firefly::collision(GameObject& other, const CollisionHit& )
 {

Modified: branches/supertux-milestone2-grumbel/src/object/firefly.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/firefly.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/firefly.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,19 +18,16 @@
 #define HEADER_SUPERTUX_OBJECT_FIREFLY_HPP
 
 #include "object/moving_sprite.hpp"
-#include "util/serializable.hpp"
 
 /**
  * A Firefly: When tux touches it, it begins buzzing and you will respawn at this
  * position.
  */
-class Firefly : public MovingSprite, 
-                public Serializable
+class Firefly : public MovingSprite
 {
 public:
   Firefly(const Reader& lisp);
 
-  void write(lisp::Writer& writer);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 private:

Modified: branches/supertux-milestone2-grumbel/src/object/gradient.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/gradient.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/gradient.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "object/gradient.hpp"
 #include "supertux/object_factory.hpp"
 
@@ -42,26 +41,6 @@
 }
 
 void
-Gradient::write(lisp::Writer& writer)
-{
-  writer.start_list("gradient");
-
-  std::vector<float> bkgd_top_color, bkgd_bottom_color;
-  bkgd_top_color.push_back(gradient_top.red);
-  bkgd_top_color.push_back(gradient_top.green);
-  bkgd_top_color.push_back(gradient_top.blue);
-  bkgd_bottom_color.push_back(gradient_bottom.red);
-  bkgd_bottom_color.push_back(gradient_bottom.green);
-  bkgd_bottom_color.push_back(gradient_bottom.blue);
-  writer.write("top_color", bkgd_top_color);
-  writer.write("bottom_color", bkgd_bottom_color);
-
-  writer.write("layer", layer);
-
-  writer.end_list("gradient");
-}
-
-void
 Gradient::update(float)
 {
 }

Modified: branches/supertux-milestone2-grumbel/src/object/gradient.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/gradient.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/gradient.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,21 +19,17 @@
 
 #include "supertux/game_object.hpp"
 #include "util/reader_fwd.hpp"
-#include "util/serializable.hpp"
 #include "video/drawing_context.hpp"
 
 class DisplayManager;
 
-class Gradient : public GameObject, 
-                 public Serializable
+class Gradient : public GameObject
 {
 public:
   Gradient();
   Gradient(const Reader& reader);
   virtual ~Gradient();
 
-  virtual void write(lisp::Writer& writer);
-
   void set_gradient(Color top, Color bottom);
 
   Color get_gradient_top() const

Modified: branches/supertux-milestone2-grumbel/src/object/ispy.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/ispy.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/ispy.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include "object/ispy.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "object/tilemap.hpp"
 #include "sprite/sprite.hpp"
@@ -44,26 +43,6 @@
   sprite->set_action((dir == DOWN) ? "idle-down" : ((dir == LEFT) ? "idle-left" : "idle-right"));
 }
 
-void
-Ispy::write(lisp::Writer& writer)
-{
-  writer.start_list("ispy");
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("script", script);
-  switch (dir)
-  {
-    case DOWN:
-      writer.write("direction", "down"); break;
-    case LEFT:
-      writer.write("direction", "left"); break;
-    case RIGHT:
-      writer.write("direction", "right"); break;
-    default: break;
-  }
-  writer.end_list("ispy");
-}
-
 HitResponse
 Ispy::collision(GameObject& , const CollisionHit& )
 {

Modified: branches/supertux-milestone2-grumbel/src/object/ispy.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/ispy.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/ispy.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,18 +19,15 @@
 
 #include "object/moving_sprite.hpp"
 #include "supertux/direction.hpp"
-#include "util/serializable.hpp"
 
 /**
  * An Ispy: When it spots Tux, a script will run.
  */
-class Ispy : public MovingSprite, 
-             public Serializable
+class Ispy : public MovingSprite
 {
 public:
   Ispy(const Reader& lisp);
 
-  void write(lisp::Writer& writer);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
   virtual void update(float elapsed_time);

Modified: branches/supertux-milestone2-grumbel/src/object/particlesystem.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/particlesystem.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/particlesystem.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,6 @@
 #include <cmath>
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "math/random_generator.hpp"
 #include "supertux/main.hpp"
 #include "video/drawing_context.hpp"
@@ -105,14 +104,6 @@
   reader.get("z-pos", z_pos);
 }
 
-void
-SnowParticleSystem::write(lisp::Writer& writer)
-{
-  writer.start_list("particles-snow");
-  writer.write("z-pos", z_pos);
-  writer.end_list("particles-snow");
-}
-
 SnowParticleSystem::~SnowParticleSystem()
 {
   for(int i=0;i<3;++i)
@@ -165,14 +156,6 @@
   reader.get("z-pos", z_pos);
 }
 
-void
-GhostParticleSystem::write(lisp::Writer& writer)
-{
-  writer.start_list("particles-ghosts");
-  writer.write("z-pos", z_pos);
-  writer.end_list("particles-ghosts");
-}
-
 GhostParticleSystem::~GhostParticleSystem()
 {
   for(int i=0;i<2;++i)
@@ -218,14 +201,6 @@
   reader.get("z-pos", z_pos);
 }
 
-void
-CloudParticleSystem::write(lisp::Writer& writer)
-{
-  writer.start_list("particles-clouds");
-  writer.write("z-pos", z_pos);
-  writer.end_list("particles-clouds");
-}
-
 CloudParticleSystem::~CloudParticleSystem()
 {
   delete cloudimage;

Modified: branches/supertux-milestone2-grumbel/src/object/particlesystem.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/particlesystem.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/particlesystem.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -21,7 +21,6 @@
 
 #include "math/vector.hpp"
 #include "supertux/game_object.hpp"
-#include "util/serializable.hpp"
 #include "util/reader.hpp"
 
 class Surface;
@@ -69,15 +68,13 @@
   float virtual_width, virtual_height;
 };
 
-class SnowParticleSystem : public ParticleSystem, 
-                           public Serializable
+class SnowParticleSystem : public ParticleSystem
 {
 public:
   SnowParticleSystem();
   virtual ~SnowParticleSystem();
 
   void parse(const Reader& lisp);
-  void write(lisp::Writer& writer);
 
   virtual void update(float elapsed_time);
 
@@ -97,16 +94,14 @@
   Surface* snowimages[3];
 };
 
-class GhostParticleSystem : public ParticleSystem, 
-                            public Serializable
+class GhostParticleSystem : public ParticleSystem
 {
 public:
   GhostParticleSystem();
   virtual ~GhostParticleSystem();
 
   void parse(const Reader& lisp);
-  void write(lisp::Writer& writer);
-
+  
   virtual void update(float elapsed_time);
 
   std::string type() const
@@ -122,16 +117,14 @@
   Surface* ghosts[2];
 };
 
-class CloudParticleSystem : public ParticleSystem, 
-                            public Serializable
+class CloudParticleSystem : public ParticleSystem
 {
 public:
   CloudParticleSystem();
   virtual ~CloudParticleSystem();
 
   void parse(const Reader& lisp);
-  void write(lisp::Writer& writer);
-
+  
   virtual void update(float elapsed_time);
 
   std::string type() const

Modified: branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -14,7 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "lisp/writer.hpp"
 #include "object/particlesystem_interactive.hpp"
 #include "supertux/main.hpp"
 
@@ -164,14 +163,6 @@
   reader.get("z-pos", z_pos);
 }
 
-void
-RainParticleSystem::write(lisp::Writer& writer)
-{
-  writer.start_list("particles-rain");
-  writer.write("z-pos", z_pos);
-  writer.end_list("particles-rain");
-}
-
 RainParticleSystem::~RainParticleSystem()
 {
   for(int i=0;i<2;++i)
@@ -246,14 +237,6 @@
   reader.get("z-pos", z_pos);
 }
 
-void
-CometParticleSystem::write(lisp::Writer& writer)
-{
-  writer.start_list("particles-comets");
-  writer.write("z-pos", z_pos);
-  writer.end_list("particles-comets");
-}
-
 CometParticleSystem::~CometParticleSystem()
 {
   for(int i=0;i<2;++i)

Modified: branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/particlesystem_interactive.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,12 +20,7 @@
 #include "math/vector.hpp"
 #include "supertux/game_object.hpp"
 #include "supertux/sector.hpp"
-#include "util/serializable.hpp"
 
-namespace lisp {
-class Lisp;
-}
-
 class Surface;
 class DisplayManager;
 
@@ -66,15 +61,13 @@
   int collision(Particle* particle, Vector movement);
 };
 
-class RainParticleSystem : public ParticleSystem_Interactive, 
-                           public Serializable
+class RainParticleSystem : public ParticleSystem_Interactive
 {
 public:
   RainParticleSystem();
   virtual ~RainParticleSystem();
 
   void parse(const Reader& lisp);
-  void write(lisp::Writer& writer);
 
   virtual void update(float elapsed_time);
 
@@ -91,8 +84,7 @@
   Surface* rainimages[2];
 };
 
-class CometParticleSystem : public ParticleSystem_Interactive, 
-                            public Serializable
+class CometParticleSystem : public ParticleSystem_Interactive
 {
 public:
   CometParticleSystem();

Modified: branches/supertux-milestone2-grumbel/src/object/path.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/path.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/path.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -22,7 +22,6 @@
 #include <stdexcept>
 
 #include "lisp/list_iterator.hpp"
-#include "lisp/writer.hpp"
 #include "util/log.hpp"
 
 Path::Path() :
@@ -85,40 +84,6 @@
     throw std::runtime_error("Path with zero nodes");
 }
 
-void
-Path::write(lisp::Writer& writer)
-{
-  writer.start_list("path");
-
-  switch(mode) {
-    case ONE_SHOT:
-      writer.write("mode", "oneshot");
-      break;
-    case PING_PONG:
-      writer.write("mode", "pingpong");
-      break;
-    case CIRCULAR:
-      writer.write("mode", "circular");
-      break;
-    default:
-      log_warning << "Don't know how to write mode " << (int) mode << " ?!?" << std::endl;
-      break;
-  }
-
-  for (size_t i=0; i < nodes.size(); i++) {
-    const Node& node = nodes[i];
-
-    writer.start_list("node");
-    writer.write("x", node.position.x);
-    writer.write("y", node.position.y);
-    writer.write("time", node.time);
-
-    writer.end_list("node");
-  }
-
-  writer.end_list("path");
-}
-
 Vector
 Path::get_base() const
 {

Modified: branches/supertux-milestone2-grumbel/src/object/path.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/path.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/path.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -24,16 +24,14 @@
 #include "math/vector.hpp"
 #include "util/reader_fwd.hpp"
 #include "util/writer_fwd.hpp"
-#include "util/serializable.hpp"
 
-class Path : public Serializable
+class Path
 {
 public:
   Path();
   ~Path();
 
   void read(const Reader& reader);
-  void write(lisp::Writer& writer);
 
   Vector get_base() const;
 

Modified: branches/supertux-milestone2-grumbel/src/object/rock.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/rock.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/rock.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/rock.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/tile.hpp"
@@ -58,17 +57,6 @@
 }
 
 void
-Rock::write(lisp::Writer& writer)
-{
-  writer.start_list("rock");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-
-  writer.end_list("rock");
-}
-
-void
 Rock::update(float elapsed_time)
 {
   if( grabbed )

Modified: branches/supertux-milestone2-grumbel/src/object/rock.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/rock.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/rock.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,14 +20,12 @@
 #include "object/moving_sprite.hpp"
 #include "object/portable.hpp"
 #include "supertux/physic.hpp"
-#include "util/serializable.hpp"
 
 class Sprite;
 
 class Rock : public MovingSprite, 
              public Portable, 
-             protected UsesPhysic, 
-             public Serializable
+             protected UsesPhysic
 {
 public:
   Rock(const Vector& pos, std::string spritename);
@@ -37,7 +35,6 @@
   void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
-  void write(lisp::Writer& writer);
 
   void grab(MovingObject& object, const Vector& pos, Direction dir);
   void ungrab(MovingObject& object, Direction dir);

Modified: branches/supertux-milestone2-grumbel/src/object/tilemap.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/tilemap.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/tilemap.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -16,7 +16,6 @@
 
 #include <math.h>
 
-#include "lisp/writer.hpp"
 #include "object/tilemap.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "scripting/tilemap.hpp"
@@ -118,23 +117,6 @@
 }
 
 void
-TileMap::write(lisp::Writer& writer)
-{
-  writer.start_list("tilemap");
-
-  writer.write("z-pos", z_pos);
-
-  writer.write("solid", solid);
-  writer.write("speed", speed_x);
-  writer.write("speed-y", speed_y);
-  writer.write("width", width);
-  writer.write("height", height);
-  writer.write("tiles", tiles);
-
-  writer.end_list("tilemap");
-}
-
-void
 TileMap::update(float elapsed_time)
 {
   // handle tilemap fading

Modified: branches/supertux-milestone2-grumbel/src/object/tilemap.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/object/tilemap.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/object/tilemap.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -35,7 +35,6 @@
  * This class is responsible for drawing the level tiles
  */
 class TileMap : public GameObject, 
-                public Serializable, 
                 public ScriptInterface
 {
 public:
@@ -45,8 +44,6 @@
           size_t width_, size_t height_);
   virtual ~TileMap();
 
-  virtual void write(lisp::Writer& writer);
-
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 

Modified: branches/supertux-milestone2-grumbel/src/scripting/serialize.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/scripting/serialize.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/scripting/serialize.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,8 +18,8 @@
 
 #include <iostream>
 
+#include "lisp/writer.hpp"
 #include "lisp/list_iterator.hpp"
-#include "lisp/writer.hpp"
 #include "scripting/squirrel_error.hpp"
 
 namespace Scripting {

Modified: branches/supertux-milestone2-grumbel/src/supertux/gameconfig.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/gameconfig.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/gameconfig.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -21,8 +21,8 @@
 #include "addon/addon_manager.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
-#include "lisp/writer.hpp"
 #include "supertux/main.hpp"
 
 Config* config = 0;

Modified: branches/supertux-milestone2-grumbel/src/supertux/level.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/level.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/level.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,7 +18,6 @@
 
 #include "lisp/list_iterator.hpp"
 #include "lisp/parser.hpp"
-#include "lisp/writer.hpp"
 #include "object/block.hpp"
 #include "object/coin.hpp"
 #include "supertux/sector.hpp"
@@ -138,35 +137,6 @@
 }
 
 void
-Level::save(const std::string& filename)
-{
-  lisp::Writer* writer = new lisp::Writer(filename);
-
-  writer->write_comment("Level made using SuperTux's built-in Level Editor");
-
-  writer->start_list("supertux-level");
-
-  int version = 2;
-  writer->write("version", version);
-
-  writer->write("name", name, true);
-  writer->write("author", author);
-  if(on_menukey_script != "")
-    writer->write("on-menukey-script", on_menukey_script);
-
-  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
-    Sector* sector = *i;
-    writer->start_list("sector");
-    sector->write(*writer);
-    writer->end_list("sector");
-  }
-
-  writer->end_list("supertux-level");
-
-  delete writer;
-}
-
-void
 Level::add_sector(Sector* sector)
 {
   Sector* test = get_sector(sector->get_name());

Modified: branches/supertux-milestone2-grumbel/src/supertux/level.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/level.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/level.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -50,7 +50,6 @@
 
   // loads a levelfile
   void load(const std::string& filename);
-  void save(const std::string& filename);
 
   const std::string& get_name() const
   { return name; }

Modified: branches/supertux-milestone2-grumbel/src/supertux/player_status.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/player_status.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/player_status.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,7 @@
 
 #include "audio/sound_manager.hpp"
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
+#include "util/writer.hpp"
 #include "supertux/main.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/resources.hpp"

Modified: branches/supertux-milestone2-grumbel/src/supertux/player_status.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/player_status.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/player_status.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -21,7 +21,6 @@
 #include <memory>
 
 #include "util/reader_fwd.hpp"
-#include "util/serializable.hpp"
 #include "util/writer_fwd.hpp"
 #include "video/color.hpp"
 
@@ -39,7 +38,7 @@
  * This class memorizes player status between different game sessions (for
  * example when switching maps in the worldmap)
  */
-class PlayerStatus : public Serializable
+class PlayerStatus
 {
   static Color text_color;
 public:

Modified: branches/supertux-milestone2-grumbel/src/supertux/sector.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/sector.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/sector.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -22,7 +22,6 @@
 #include "audio/sound_manager.hpp"
 #include "badguy/jumpy.hpp"
 #include "lisp/list_iterator.hpp"
-#include "lisp/writer.hpp"
 #include "math/aatriangle.hpp"
 #include "object/background.hpp"
 #include "object/bullet.hpp"
@@ -440,33 +439,6 @@
 
 }
 
-void
-Sector::write(lisp::Writer& writer)
-{
-  writer.write("name", name);
-  writer.write("gravity", gravity);
-  writer.write("music", music);
-
-  // write spawnpoints
-  for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end();
-      ++i) {
-    SpawnPoint* spawn = *i;
-    writer.start_list("spawn-points");
-    writer.write("name", spawn->name);
-    writer.write("x", spawn->pos.x);
-    writer.write("y", spawn->pos.y);
-    writer.end_list("spawn-points");
-  }
-
-  // write objects
-  for(GameObjects::iterator i = gameobjects.begin();
-      i != gameobjects.end(); ++i) {
-    Serializable* serializable = dynamic_cast<Serializable*> (*i);
-    if(serializable)
-      serializable->write(writer);
-  }
-}
-
 HSQUIRRELVM
 Sector::run_script(std::istream& in, const std::string& sourcename)
 {

Modified: branches/supertux-milestone2-grumbel/src/supertux/sector.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/supertux/sector.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/supertux/sector.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -71,9 +71,7 @@
   /// read sector from lisp file
   void parse(const Reader& lisp);
   void parse_old_format(const Reader& lisp);
-  /// write sector to lisp file
-  void write(lisp::Writer& writer);
-
+  
   /// activates this sector (change music, initialize player class, ...)
   void activate(const std::string& spawnpoint);
   void activate(const Vector& player_pos);

Modified: branches/supertux-milestone2-grumbel/src/trigger/climbable.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/climbable.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/climbable.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -17,7 +17,6 @@
 #include "trigger/climbable.hpp"
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "supertux/main.hpp"
 #include "supertux/object_factory.hpp"
@@ -56,19 +55,6 @@
   }
 }
 
-void
-Climbable::write(lisp::Writer& writer)
-{
-  writer.start_list("climbable");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("width", bbox.get_width());
-  writer.write("height", bbox.get_height());
-
-  writer.end_list("climbable");
-}
-
 void 
 Climbable::update(float /*elapsed_time*/)
 {

Modified: branches/supertux-milestone2-grumbel/src/trigger/climbable.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/climbable.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/climbable.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,14 +20,12 @@
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"
 #include "trigger/trigger_base.hpp"
-#include "util/serializable.hpp"
 #include "util/reader_fwd.hpp"
 #include "video/drawing_context.hpp"
 
 class Player;
 
-class Climbable : public TriggerBase, 
-                  public Serializable
+class Climbable : public TriggerBase
 {
   static Color text_color;
 public:
@@ -35,7 +33,6 @@
   Climbable(const Rect& area);
   ~Climbable();
 
-  void write(lisp::Writer& writer);
   void event(Player& player, EventType type);
   void update(float elapsed_time);
   void draw(DrawingContext& context);

Modified: branches/supertux-milestone2-grumbel/src/trigger/door.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/door.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/door.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "audio/sound_manager.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/game_session.hpp"
@@ -56,22 +55,6 @@
 }
 
 void
-Door::write(lisp::Writer& writer)
-{
-  writer.start_list("door");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("width", bbox.get_width());
-  writer.write("height", bbox.get_height());
-
-  writer.write("sector", target_sector);
-  writer.write("spawnpoint", target_spawnpoint);
-
-  writer.end_list("door");
-}
-
-void
 Door::update(float )
 {
   switch (state) {

Modified: branches/supertux-milestone2-grumbel/src/trigger/door.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/door.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/door.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -22,16 +22,13 @@
 
 class Player;
 
-class Door : public TriggerBase, 
-             public Serializable
+class Door : public TriggerBase
 {
 public:
   Door(const Reader& reader);
   Door(int x, int y, std::string sector, std::string spawnpoint);
   virtual ~Door();
 
-  virtual void write(lisp::Writer& writer);
-
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual void event(Player& player, EventType type);

Modified: branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -19,7 +19,6 @@
 #include <stdexcept>
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
 #include "trigger/scripttrigger.hpp"
@@ -59,21 +58,6 @@
 }
 
 void
-ScriptTrigger::write(lisp::Writer& writer)
-{
-  writer.start_list("scripttrigger");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("width", bbox.get_width());
-  writer.write("height", bbox.get_height());
-  writer.write("script", script);
-  writer.write("button", triggerevent == EVENT_ACTIVATE);
-
-  writer.end_list("scripttrigger");
-}
-
-void
 ScriptTrigger::event(Player& , EventType type)
 {
   if(type != triggerevent)

Modified: branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/scripttrigger.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -18,15 +18,8 @@
 #define HEADER_SUPERTUX_TRIGGER_SCRIPTTRIGGER_HPP
 
 #include "trigger/trigger_base.hpp"
-#include "util/serializable.hpp"
 
-namespace lisp {
-class Lisp;
-class Writer;
-}
-
-class ScriptTrigger : public TriggerBase, 
-                      public Serializable
+class ScriptTrigger : public TriggerBase
 {
 public:
   ScriptTrigger(const Reader& reader);

Modified: branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -54,20 +54,6 @@
 }
 
 void
-SecretAreaTrigger::write(lisp::Writer& writer)
-{
-  writer.start_list("secretarea");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("width", bbox.get_width());
-  writer.write("height", bbox.get_height());
-  writer.write("fade-tilemap", fade_tilemap);
-
-  writer.end_list("secretarea");
-}
-
-void
 SecretAreaTrigger::draw(DrawingContext& context)
 {
   if (message_timer.started()) {

Modified: branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/secretarea_trigger.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,15 +20,13 @@
 #include "trigger/trigger_base.hpp"
 
 #include "supertux/timer.hpp"
-#include "util/serializable.hpp"
 #include "util/reader_fwd.hpp"
 #include "util/writer_fwd.hpp"
 
 class DrawingContext;
 class Color;
 
-class SecretAreaTrigger : public TriggerBase, 
-                          public Serializable
+class SecretAreaTrigger : public TriggerBase
 {
   static Color text_color;
 public:
@@ -36,7 +34,6 @@
   SecretAreaTrigger(const Rect& area, std::string fade_tilemap = "");
   ~SecretAreaTrigger();
 
-  void write(lisp::Writer& writer);
   void event(Player& player, EventType type);
   void draw(DrawingContext& context);
 

Modified: branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
 #include "supertux/object_factory.hpp"
 #include "trigger/sequence_trigger.hpp"
@@ -45,20 +44,6 @@
 }
 
 void
-SequenceTrigger::write(lisp::Writer& writer)
-{
-  writer.start_list("sequencetrigger");
-
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("width", bbox.get_width());
-  writer.write("height", bbox.get_height());
-  writer.write("sequence", sequence_name);
-
-  writer.end_list("sequencetrigger");
-}
-
-void
 SequenceTrigger::event(Player& player, EventType type)
 {
   if(type == triggerevent) {

Modified: branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/sequence_trigger.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -21,15 +21,13 @@
 
 class Player;
 
-class SequenceTrigger : public TriggerBase, 
-                        public Serializable
+class SequenceTrigger : public TriggerBase
 {
 public:
   SequenceTrigger(const Reader& reader);
   SequenceTrigger(const Vector& pos, const std::string& sequence);
   ~SequenceTrigger();
 
-  void write(lisp::Writer& writer);
   void event(Player& player, EventType type);
 
   std::string get_sequence_name() const { return sequence_name; }

Modified: branches/supertux-milestone2-grumbel/src/trigger/switch.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/switch.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/switch.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -46,17 +46,6 @@
 }
 
 void
-Switch::write(lisp::Writer& writer)
-{
-  writer.start_list("switch");
-  writer.write("x", bbox.p1.x);
-  writer.write("y", bbox.p1.y);
-  writer.write("sprite", sprite_name);
-  writer.write("script", script);
-  writer.end_list("switch");
-}
-
-void
 Switch::update(float )
 {
   switch (state) {

Modified: branches/supertux-milestone2-grumbel/src/trigger/switch.hpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/trigger/switch.hpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/trigger/switch.hpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -20,21 +20,16 @@
 #include <string>
 
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "sprite/sprite.hpp"
 #include "trigger/trigger_base.hpp"
-#include "util/serializable.hpp"
 #include "video/drawing_context.hpp"
 
-class Switch : public TriggerBase, 
-               public Serializable
+class Switch : public TriggerBase
 {
 public:
   Switch(const Reader& reader);
   virtual ~Switch();
 
-  virtual void write(lisp::Writer& writer);
-
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual void event(Player& player, EventType type);

Deleted: branches/supertux-milestone2-grumbel/src/util/serializable.hpp

Modified: branches/supertux-milestone2-grumbel/src/worldmap/worldmap.cpp
===================================================================
--- branches/supertux-milestone2-grumbel/src/worldmap/worldmap.cpp	2009-11-16 02:10:19 UTC (rev 5983)
+++ branches/supertux-milestone2-grumbel/src/worldmap/worldmap.cpp	2009-11-16 02:35:47 UTC (rev 5984)
@@ -35,7 +35,6 @@
 #include "lisp/lisp.hpp"
 #include "lisp/list_iterator.hpp"
 #include "lisp/parser.hpp"
-#include "lisp/writer.hpp"
 #include "object/background.hpp"
 #include "object/tilemap.hpp"
 #include "physfs/physfs_stream.hpp"