small fix

[supertux.git] / src / textscroller.cpp

diff --git a/src/textscroller.cpp b/src/textscroller.cpp
index 9f7a5dd..066997d 100644 (file)
--- a/src/textscroller.cpp
+++ b/src/textscroller.cpp
@@ -17,20 +17,19 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
-#include "textscroller.h"
+#include "textscroller.hpp"
 
 #include <stdexcept>
-#include "resources.h"
-#include "video/font.h"
-#include "video/drawing_context.h"
-#include "app/globals.h"
-#include "lisp/parser.h"
-#include "lisp/lisp.h"
-#include "main.h"
-#include "control/joystickkeyboardcontroller.h"
+#include "resources.hpp"
+#include "video/font.hpp"
+#include "video/drawing_context.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "audio/sound_manager.hpp"
+#include "main.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
 
 static const float DEFAULT_SPEED = .02;
 static const float SCROLL = 60;
@@ -55,7 +54,7 @@ static void split_text(const std::string& text, std::vector<std::string>& lines)
   }
 }
 
-void display_text_file(const std::string& file)
+void display_text_file(const std::string& filename)
 {
   const Font* heading_font = white_big_text;
   const Font* normal_font = white_text;
@@ -68,7 +67,6 @@ void display_text_file(const std::string& file)
   std::string background_file;
   std::vector<std::string> lines;
 
-  std::string filename = datadir + "/" + file;
   lisp::Parser parser;
   try {
     std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
@@ -93,8 +91,8 @@ void display_text_file(const std::string& file)
   split_text(text, lines);
 
   // load background image
-  Surface* background = new Surface(
-      get_resource_filename("images/background/" + background_file), false);
+  Surface* background 
+    = new Surface("images/background/" + background_file, false);
 
   bool done = false;
   float scroll = 0;
@@ -171,6 +169,7 @@ void display_text_file(const std::string& file)
     }
     
     context.do_drawing();
+    sound_manager->update();
     
     if(SCREEN_HEIGHT+y-scroll < 0 && 20+SCREEN_HEIGHT+y-scroll < 0)
       done = 1;