X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ftext_object.cpp;h=ea1e4ebf928c48ab09b8c78333d75835007fbd56;hb=0fc674b7c864e05a4c19acd6f77d28bfea535615;hp=30519376231736cc1f322ee35ed21739d067484d;hpb=c307442e4bf1352cf1807b171b5ab175ba063b31;p=supertux.git

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index 305193762..ea1e4ebf9 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,24 +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 "video/drawing_context.hpp"
 #include "scripting/squirrel_util.hpp"
-#include "log.hpp"
+#include "supertux/globals.hpp"
+#include "supertux/resources.hpp"
+#include "video/drawing_context.hpp"
 
-TextObject::TextObject(std::string name)
-  : 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)
 {
-  this->name = name;
-  font = blue_text;
+  this->name = name_;
+  font = Resources::normal_font;
   centered = false;
 }
 
@@ -45,7 +46,7 @@ TextObject::expose(HSQUIRRELVM vm, SQInteger table_idx)
   if (name.empty())
     return;
 
-  Scripting::expose_object(vm, table_idx, dynamic_cast<Scripting::Text *>(this), name, false);
+  scripting::expose_object(vm, table_idx, dynamic_cast<scripting::Text *>(this), name, false);
 }
 
 void
@@ -54,60 +55,55 @@ TextObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
   if (name.empty())
     return;
 
-  Scripting::unexpose_object(vm, table_idx, name);
+  scripting::unexpose_object(vm, table_idx, name);
 }
 
 void
-TextObject::set_font(const std::string& name)
+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;
-  } else if(name == "big") {
-    font = white_big_text;
-  } else if(name == "small") {
-    font = white_small_text;
+  if(name_ == "normal") {
+    font = Resources::normal_font;
+  } else if(name_ == "big") {
+    font = Resources::big_font;
+  } else if(name_ == "small") {
+    font = Resources::small_font;
   } else {
-    log_warning << "Unknown font '" << name << "'." << std::endl;
+    log_warning << "Unknown font '" << name_ << "'." << std::endl;
+    font = Resources::normal_font;
   }
 }
 
 void
-TextObject::set_text(const std::string& text)
+TextObject::set_text(const std::string& text_)
 {
-  this->text = text;
+  this->text = text_;
 }
 
 void
-TextObject::fade_in(float fadetime)
+TextObject::fade_in(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = fadetime;
+  this->fadetime = fadetime_;
+  fading = fadetime_;
 }
 
 void
-TextObject::fade_out(float fadetime)
+TextObject::fade_out(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = -fadetime;
+  this->fadetime = fadetime_;
+  fading = -fadetime_;
 }
 
 void
-TextObject::set_visible(bool visible)
+TextObject::set_visible(bool visible_)
 {
-  this->visible = visible;
+  this->visible = visible_;
   fading = 0;
 }
 
 void
-TextObject::set_centered(bool centered)
+TextObject::set_centered(bool centered_)
 {
-  this->centered = centered;
+  this->centered = centered_;
 }
 
 void
@@ -124,12 +120,18 @@ TextObject::draw(DrawingContext& context)
     return;
   }
 
-  context.draw_filled_rect(Vector(125, 50), Vector(550, 120),
-      Color(0.6f, 0.7f, 0.8f, 0.5f), 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();
 }
@@ -151,3 +153,5 @@ TextObject::update(float elapsed_time)
     }
   }
 }
+
+/* EOF */