X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ftext_object.cpp;h=ebe3e32d7e617c3d2ac033ddcef88610bad2a277;hb=8c0b10ba9ff57a36c3747c84a035faca5975556d;hp=d7f8bed18c87f93031520d86fb56231a97fe20da;hpb=4a486d92343d1824b311c234e9321e08f280fe68;p=supertux.git

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index d7f8bed18..ebe3e32d7 100644
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -23,15 +23,17 @@
 
 #include <iostream>
 #include "resources.hpp"
+#include "main.hpp"
 #include "video/drawing_context.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "log.hpp"
 
 TextObject::TextObject(std::string name)
-  : fading(0), fadetime(0), visible(false)
+  : fading(0), fadetime(0), visible(false), anchor(ANCHOR_MIDDLE),
+    pos(0, 0)
 {
   this->name = name;
-  font = blue_text;
+  font = normal_font;
   centered = false;
 }
 
@@ -60,18 +62,12 @@ TextObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 void
 TextObject::set_font(const std::string& name)
 {
-  if(name == "gold") {
-    font = gold_text;
-  } else if(name == "white") {
-    font = white_text;
-  } else if(name == "blue") {
-    font = blue_text;
-  } else if(name == "gray") {
-    font = gray_text;
+  if(name == "normal") {
+    font = normal_font;
   } else if(name == "big") {
-    font = white_big_text;
+    font = big_font;
   } else if(name == "small") {
-    font = white_small_text;
+    font = small_font;
   } else {
     log_warning << "Unknown font '" << name << "'." << std::endl;
   }
@@ -124,12 +120,18 @@ TextObject::draw(DrawingContext& context)
     return;
   }
 
-  context.draw_filled_rect(Vector(125, 50), Vector(550, 120),
-      Color(0.6, 0.7, 0.8, 0.5), LAYER_GUI-50);
+  float width  = 500;
+  float height = 70;
+  Vector spos = pos + get_anchor_pos(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
+      width, height, anchor);
+
+  context.draw_filled_rect(spos, Vector(width, height),
+      Color(0.6f, 0.7f, 0.8f, 0.5f), LAYER_GUI-50);
   if (centered) {
-    context.draw_center_text(font, text, Vector(0, 50+35), LAYER_GUI-40);
+    context.draw_center_text(font, text, spos, LAYER_GUI-40, TextObject::default_color);
+  } else {
+    context.draw_text(font, text, spos + Vector(10, 10), ALIGN_LEFT, LAYER_GUI-40, TextObject::default_color);
   }
-  else context.draw_text(font, text, Vector(125+35, 50+35), LEFT_ALLIGN, LAYER_GUI-40);
 
   context.pop_transform();
 }