X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftext_object.cpp;h=42716282b9250f657c29aae37ce8318fba7cfc2c;hb=04a3157ef478169b5a3fc05dae00ed6ee6a1fae2;hp=9d2dd33135346fa8724c11c6a586dc0fe51707c9;hpb=62ac0dbff5c24071859b7a02fdffb485ba82181e;p=supertux.git

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index 9d2dd3313..42716282b 100644
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -1,12 +1,38 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include "text_object.hpp"
+
+#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;
 }
@@ -16,6 +42,24 @@ TextObject::~TextObject()
 }
 
 void
+TextObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
+{
+  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)
+{
+  if (name.empty())
+    return;
+
+  Scripting::unexpose_object(vm, table_idx, name);
+}
+
+void
 TextObject::set_font(const std::string& name)
 {
   if(name == "gold") {
@@ -31,7 +75,7 @@ TextObject::set_font(const std::string& name)
   } else if(name == "small") {
     font = white_small_text;
   } else {
-    std::cerr << "Unknown font '" << name << "'.\n";
+    log_warning << "Unknown font '" << name << "'." << std::endl;
   }
 }
 
@@ -74,21 +118,26 @@ TextObject::draw(DrawingContext& context)
   context.push_transform();
   context.set_translation(Vector(0, 0));
   if(fading > 0) {
-    context.set_alpha(static_cast<uint8_t> 
-        ((fadetime-fading) * 255.0 / fadetime));
+    context.set_alpha((fadetime-fading) / fadetime);
   } else if(fading < 0) {
-    context.set_alpha(static_cast<uint8_t> (-fading * 255.0 / fadetime));
+    context.set_alpha(-fading / fadetime);
   } else if(!visible) {
     context.pop_transform();
     return;
   }
 
-  context.draw_filled_rect(Vector(125, 50), Vector(550, 120),
-      Color(150, 180, 200, 125), 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();
 }
@@ -110,4 +159,3 @@ TextObject::update(float elapsed_time)
     }
   }
 }
-