projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite spacing logic to properly handle comments
[supertux.git]
/
src
/
textscroller.hpp
diff --git
a/src/textscroller.hpp
b/src/textscroller.hpp
index
cc166dc
..
ede1e6b
100644
(file)
--- a/
src/textscroller.hpp
+++ b/
src/textscroller.hpp
@@
-24,10
+24,12
@@
#include <vector>
#include <string>
#include <map>
#include <vector>
#include <string>
#include <map>
+#include <memory>
#include "screen.hpp"
#include "math/vector.hpp"
#include "math/rect.hpp"
#include "screen.hpp"
#include "math/vector.hpp"
#include "math/rect.hpp"
+#include "video/color.hpp"
class DrawingContext;
class Surface;
class DrawingContext;
class Surface;
@@
-52,6
+54,7
@@
public:
private:
InfoBoxLine::LineType lineType;
Font* font;
private:
InfoBoxLine::LineType lineType;
Font* font;
+ Color color;
std::string text;
Surface* image;
};
std::string text;
Surface* image;
};
@@
-78,6
+81,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:
@@
-88,6
+94,10
@@
public:
void draw(DrawingContext& context);
void update(float elapsed_time);
void draw(DrawingContext& context);
void update(float elapsed_time);
+ static Color small_color;
+ static Color heading_color;
+ static Color reference_color;
+ static Color normal_color;
private:
float defaultspeed;
float speed;
private:
float defaultspeed;
float speed;