X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftextscroller.hpp;h=b232b18956f9a8d88e9e5a134ba35e594263db11;hb=a362e6fbb3f1a812b6dafb6b54e22d1532327ea2;hp=905055e41facff0e2260355e6d7f162aeba0b53a;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/textscroller.hpp b/src/textscroller.hpp
index 905055e41..b232b1895 100644
--- a/src/textscroller.hpp
+++ b/src/textscroller.hpp
@@ -24,11 +24,38 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <memory>
 
 #include "screen.hpp"
+#include "math/vector.hpp"
+#include "math/rect.hpp"
 
 class DrawingContext;
 class Surface;
+class Font;
+
+/**
+ * Helper class for InfoBox: Represents a line of text
+ */
+class InfoBoxLine
+{
+public:
+  enum LineType { NORMAL, NORMAL_LEFT, SMALL, HEADING, REFERENCE, IMAGE};
+
+  InfoBoxLine(char format_char, const std::string& text);
+  ~InfoBoxLine();
+
+  void draw(DrawingContext& context, const Rect& bbox, int layer);
+  float get_height();
+
+  static const std::vector<InfoBoxLine*> split(const std::string& text, float width);
+
+private:
+  InfoBoxLine::LineType lineType;
+  Font* font;
+  std::string text;
+  Surface* image;
+};
 
 /** This class is displaying a box with information text inside the game
  */
@@ -43,15 +70,18 @@ public:
   void scrollup();
   void pagedown();
   void pageup();
-  
+
 private:
   size_t firstline;
-  std::vector<std::string> lines;
+  std::vector<InfoBoxLine*> lines;
   std::map<std::string, Surface*> images;
   Surface* arrow_scrollup;
   Surface* arrow_scrolldown;
 };
 
+/**
+ * Screen that displays intro text, extro text, etc.
+ */
 class TextScroller : public Screen
 {
 public:
@@ -67,10 +97,9 @@ private:
   float speed;
   std::string music;
   std::auto_ptr<Surface> background;
-  std::vector<std::string> lines;
-  std::map<std::string, Surface*> images;
+  std::vector<InfoBoxLine*> lines;
   float scroll;
+  bool fading;
 };
 
 #endif
-