projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Yeti behaviour. You must stun him (jump on him) when is under a falling stala...
[supertux.git]
/
src
/
textscroller.cpp
diff --git
a/src/textscroller.cpp
b/src/textscroller.cpp
index
9038ede
..
1b911b1
100644
(file)
--- a/
src/textscroller.cpp
+++ b/
src/textscroller.cpp
@@
-153,12
+153,12
@@
void display_text_file(const std::string& file)
if(center) {
context.draw_text(font,
line.substr(1, line.size()-1),
if(center) {
context.draw_text(font,
line.substr(1, line.size()-1),
- Vector(
screen->w/2, screen->h
+ y - scroll),
+ Vector(
SCREEN_WIDTH/2, SCREEN_HEIGHT
+ y - scroll),
CENTER_ALLIGN, LAYER_FOREGROUND1);
} else {
context.draw_text(font,
line.substr(1, line.size()-1),
CENTER_ALLIGN, LAYER_FOREGROUND1);
} else {
context.draw_text(font,
line.substr(1, line.size()-1),
- Vector(left_border,
screen->h
+ y - scroll),
+ Vector(left_border,
SCREEN_HEIGHT
+ y - scroll),
LEFT_ALLIGN, LAYER_FOREGROUND1);
}
LEFT_ALLIGN, LAYER_FOREGROUND1);
}
@@
-167,7
+167,7
@@
void display_text_file(const std::string& file)
context.do_drawing();
context.do_drawing();
- if(
screen->h+y-scroll < 0 && 20+screen->h
+y-scroll < 0)
+ if(
SCREEN_HEIGHT+y-scroll < 0 && 20+SCREEN_HEIGHT
+y-scroll < 0)
done = 1;
Uint32 ticks = SDL_GetTicks();
done = 1;
Uint32 ticks = SDL_GetTicks();
@@
-239,7
+239,7
@@
InfoBox::draw(DrawingContext& context)
if(center) {
context.draw_text(font,
line.substr(1, line.size()-1),
if(center) {
context.draw_text(font,
line.substr(1, line.size()-1),
- Vector(
screen->w
/2, y),
+ Vector(
SCREEN_WIDTH
/2, y),
CENTER_ALLIGN, LAYER_GUI);
} else {
context.draw_text(font,
CENTER_ALLIGN, LAYER_GUI);
} else {
context.draw_text(font,