summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2007-09-21 00:28:43 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2007-09-21 00:28:43 +0000
commit1f00238ace41ddbdcd079b139158495e119810ad (patch)
treed986c8fa6e54b7769b2cb879a7ebc7492584f585
parentb0555aeb9eda5d7cae859b024315e3748507956f (diff)
downloadMana-1f00238ace41ddbdcd079b139158495e119810ad.tar.gz
Mana-1f00238ace41ddbdcd079b139158495e119810ad.tar.bz2
Mana-1f00238ace41ddbdcd079b139158495e119810ad.tar.xz
Mana-1f00238ace41ddbdcd079b139158495e119810ad.zip
Remove duplicated file contents.
-rw-r--r--ChangeLog1
-rw-r--r--src/gui/truetypefont.h67
2 files changed, 1 insertions, 67 deletions
diff --git a/ChangeLog b/ChangeLog
index eb8c7a43..f97b145a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* src/CMakeLists.txt: Added new files to build, removed old files and
added SDL_tff to the required libraries.
+ * src/gui/truetypefont.h: Remove duplicated contents.
2007-09-20 Guillaume Melquiond <guillaume.melquiond@gmail.com>
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index e0e57cd7..d496d82e 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -65,70 +65,3 @@ class TrueTypeFont : public gcn::Font
};
#endif
-/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
- *
- * This file is part of The Mana World.
- *
- * The Mana World 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
- * any later version.
- *
- * The Mana World 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 The Mana World; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id$
- */
-
-#ifndef _TMW_TRUETYPEFONT_H
-#define _TMW_TRUETYPEFONT_H
-
-#include <string>
-
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <SDL/SDL_ttf.h>
-
-/**
- * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
- *
- * <b>NOTE:</b> This class needs SDL_ttf to be initialized.
- */
-class TrueTypeFont : public gcn::Font
-{
- public:
- /**
- * Constructor.
- *
- * @param filename Font filename.
- * @param size Font size.
- */
- TrueTypeFont(const std::string& filename, int size);
-
- /**
- * Destructor.
- */
- ~TrueTypeFont();
-
- virtual int getWidth(const std::string& text) const;
-
- virtual int getHeight() const;
-
- /**
- * @see Font::drawString
- */
- void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
-
- private:
- TTF_Font *mFont;
-};
-
-#endif