X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftext_object.cpp;h=42716282b9250f657c29aae37ce8318fba7cfc2c;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=af3564368fd099dcad999f9691a392e541cf2e8c;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index af3564368..42716282b 100644
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -23,13 +23,16 @@
 
 #include <iostream>
 #include "resources.hpp"
+#include "main.hpp"
 #include "video/drawing_context.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "log.hpp"
 
-TextObject::TextObject()
-  : fading(0), fadetime(0), visible(false)
+TextObject::TextObject(std::string name)
+  : fading(0), fadetime(0), visible(false), anchor(ANCHOR_MIDDLE),
+    pos(0, 0)
 {
+  this->name = name;
   font = blue_text;
   centered = false;
 }
@@ -41,14 +44,19 @@ TextObject::~TextObject()
 void
 TextObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::Text* interface = static_cast<Scripting::Text*> (this);
-  Scripting::expose_object(vm, table_idx, interface, "Text", false);
+  if (name.empty())
+    return;
+
+  Scripting::expose_object(vm, table_idx, dynamic_cast<Scripting::Text *>(this), name, false);
 }
 
 void
 TextObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::unexpose_object(vm, table_idx, "Text");
+  if (name.empty())
+    return;
+
+  Scripting::unexpose_object(vm, table_idx, name);
 }
 
 void
@@ -118,12 +126,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);
+  } else {
+    context.draw_text(font, text, spos + Vector(10, 10), ALIGN_LEFT, LAYER_GUI-40);
   }
-  else context.draw_text(font, text, Vector(125+35, 50+35), LEFT_ALLIGN, LAYER_GUI-40);
 
   context.pop_transform();
 }