projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few things from svn:ignore that are no longer needed to to switch to Cmake
[supertux.git]
/
src
/
textscroller.hpp
diff --git
a/src/textscroller.hpp
b/src/textscroller.hpp
index
5198eb9
..
b232b18
100644
(file)
--- a/
src/textscroller.hpp
+++ b/
src/textscroller.hpp
@@
-24,9
+24,11
@@
#include <vector>
#include <string>
#include <map>
#include <vector>
#include <string>
#include <map>
+#include <memory>
#include "screen.hpp"
#include "math/vector.hpp"
#include "screen.hpp"
#include "math/vector.hpp"
+#include "math/rect.hpp"
class DrawingContext;
class Surface;
class DrawingContext;
class Surface;
@@
-37,21
+39,22
@@
class Font;
*/
class InfoBoxLine
{
*/
class InfoBoxLine
{
-p
rivate
:
+p
ublic
:
enum LineType { NORMAL, NORMAL_LEFT, SMALL, HEADING, REFERENCE, IMAGE};
enum LineType { NORMAL, NORMAL_LEFT, SMALL, HEADING, REFERENCE, IMAGE};
- LineType lineType;
- Font* font;
- std::string text;
- Surface* image;
-public:
InfoBoxLine(char format_char, const std::string& text);
~InfoBoxLine();
InfoBoxLine(char format_char, const std::string& text);
~InfoBoxLine();
- void draw(DrawingContext& context, const
Vector& position
, int layer);
+ void draw(DrawingContext& context, const
Rect& bbox
, int layer);
float get_height();
float get_height();
- static const std::vector<InfoBoxLine*> split(const std::string& text, int line_length);
+ 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
};
/** This class is displaying a box with information text inside the game
@@
-76,6
+79,9
@@
private:
Surface* arrow_scrolldown;
};
Surface* arrow_scrolldown;
};
+/**
+ * Screen that displays intro text, extro text, etc.
+ */
class TextScroller : public Screen
{
public:
class TextScroller : public Screen
{
public: