Replaced more lisp::Lisp/lisp::Writer with Reader/Writer

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6029 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/src/supertux/gameconfig.cpp b/src/supertux/gameconfig.cpp
index be8bb70..b9a2995 100644 (file)
--- a/src/supertux/gameconfig.cpp
+++ b/src/supertux/gameconfig.cpp
@@ -20,9 +20,9 @@
 
 #include "addon/addon_manager.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
-#include "lisp/lisp.hpp"
 #include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
+#include "util/reader.hpp"
 #include "supertux/globals.hpp"
 
 Config* g_config = 0;

diff --git a/src/supertux/object_factory.cpp b/src/supertux/object_factory.cpp
index bc29d12..ea2b35d 100644 (file)
--- a/src/supertux/object_factory.cpp
+++ b/src/supertux/object_factory.cpp
@@ -18,9 +18,9 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "math/vector.hpp"
+#include "util/reader.hpp"
 #include "supertux/object_factory.hpp"
 
 GameObject* create_object(const std::string& name, const Reader& reader)

diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp
index 97a124d..281c809 100644 (file)
--- a/src/supertux/player_status.cpp
+++ b/src/supertux/player_status.cpp
@@ -18,12 +18,12 @@
 #include <math.h>
 
 #include "audio/sound_manager.hpp"
-#include "lisp/lisp.hpp"
 #include "util/writer.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 
 static const int START_COINS = 100;

diff --git a/src/supertux/textscroller.cpp b/src/supertux/textscroller.cpp
index 49ac9c2..48725fb 100644 (file)
--- a/src/supertux/textscroller.cpp
+++ b/src/supertux/textscroller.cpp
@@ -18,13 +18,13 @@
 
 #include "audio/sound_manager.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
-#include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "supertux/fadeout.hpp"
 #include "supertux/info_box_line.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 
 static const float DEFAULT_SPEED = 20;

diff --git a/src/supertux/tile.cpp b/src/supertux/tile.cpp
index 5a5528d..0f5e2ef 100644 (file)
--- a/src/supertux/tile.cpp
+++ b/src/supertux/tile.cpp
@@ -17,9 +17,9 @@
 
 #include "supertux/tile.hpp"
 
-#include "lisp/lisp.hpp"
 #include "supertux/tile_set.hpp"
 #include "supertux/timer.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 
 Tile::Tile(const TileSet *new_tileset) :

diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp
index 17fdac0..eb78b22 100644 (file)
--- a/src/supertux/title_screen.cpp
+++ b/src/supertux/title_screen.cpp
@@ -27,7 +27,6 @@
 #include "gui/menu.hpp"
 #include "gui/menu_item.hpp"
 #include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
 #include "object/camera.hpp"
 #include "object/player.hpp"
 #include "supertux/fadeout.hpp"
@@ -41,6 +40,7 @@
 #include "supertux/world.hpp"
 #include "util/file_system.hpp"
 #include "util/gettext.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 
 enum MainMenuIDs {