X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject%2Ftext_object.cpp;h=7db2cac8a9818b7933afe1c7c0117a96349c2c50;hb=f2ffe3ee4a4955232ac311c661f98e11d2daa155;hp=5fbd47f0fc9086d444a81355b78cec686863ad47;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index 5fbd47f0f..7db2cac8a 100644
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -1,12 +1,10 @@
-//  $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 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 3 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
@@ -14,23 +12,27 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "text_object.hpp"
+#include "object/text_object.hpp"
 
-#include <iostream>
-#include "resources.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
-#include "scripting/wrapper_util.hpp"
-#include "log.hpp"
 
-TextObject::TextObject()
-  : fading(0), fadetime(0), visible(false)
+TextObject::TextObject(std::string name) :
+  font(),
+  text(),
+  fading(0),
+  fadetime(0),
+  visible(false),
+  centered(),
+  anchor(ANCHOR_MIDDLE),
+  pos(0, 0)
 {
-  font = blue_text;
+  this->name = name;
+  font = Resources::normal_font;
   centered = false;
 }
 
@@ -39,35 +41,35 @@ TextObject::~TextObject()
 }
 
 void
-TextObject::expose(HSQUIRRELVM vm, int table_idx)
+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, int table_idx)
+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
 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 = Resources::normal_font;
   } else if(name == "big") {
-    font = white_big_text;
+    font = Resources::big_font;
   } else if(name == "small") {
-    font = white_small_text;
+    font = Resources::small_font;
   } else {
     log_warning << "Unknown font '" << name << "'." << std::endl;
+    font = Resources::normal_font;
   }
 }
 
@@ -118,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(Rectf(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();
 }
@@ -146,3 +154,4 @@ TextObject::update(float elapsed_time)
   }
 }
 
+/* EOF */