summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-02-20 08:57:42 -0700
committerIra Rice <irarice@gmail.com>2009-02-20 08:57:42 -0700
commit6635294efc3d94dd468c7a4a723e7169402c018c (patch)
tree2efe8203daf2e5ca842769dbdcc176c9efc17059 /src/gui
parentb2eb8daa8c39bcfd5fbd3a76dbbc432b43c561a9 (diff)
downloadmana-6635294efc3d94dd468c7a4a723e7169402c018c.tar.gz
mana-6635294efc3d94dd468c7a4a723e7169402c018c.tar.bz2
mana-6635294efc3d94dd468c7a4a723e7169402c018c.tar.xz
mana-6635294efc3d94dd468c7a4a723e7169402c018c.zip
Removed the last of the image particle guichan fonts.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.cpp24
-rw-r--r--src/gui/gui.h11
2 files changed, 4 insertions, 31 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ed85fa8f..85a33218 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -113,7 +113,7 @@ Gui::Gui(Graphics *graphics):
{
const int fontSize = (int)config.getValue("fontSize", 11);
mGuiFont = new TrueTypeFont(path, fontSize);
- mInfoParicleFont = new TrueTypeFont(path, fontSize, 1);
+ mInfoParticleFont = new TrueTypeFont(path, fontSize, 1);
}
catch (gcn::Exception e)
{
@@ -136,22 +136,6 @@ Gui::Gui(Graphics *graphics):
gcn::Widget::setGlobalFont(mGuiFont);
- // Load hits' colorful fonts
- try
- {
- hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png",
- "0123456789crit! ");
- hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png",
- "0123456789crit! ");
- hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png",
- "0123456789misxp ");
- }
- catch (gcn::Exception e)
- {
- logger->error(std::string("Unable to load colored hits' fonts: ")
- + e.getMessage());
- }
-
// Initialize mouse cursor and listen for changes to the option
setUseCustomCursor(config.getValue("customcursor", 1) == 1);
mConfigListener = new GuiConfigListener(this);
@@ -169,16 +153,12 @@ Gui::~Gui()
config.removeListener("customcursor", mConfigListener);
delete mConfigListener;
- // Fonts used in showing hits
- delete hitRedFont;
- delete hitBlueFont;
- delete hitYellowFont;
-
if (mMouseCursors)
mMouseCursors->decRef();
delete mGuiFont;
delete boldFont;
+ delete mInfoParticleFont;
delete viewport;
delete getTop();
diff --git a/src/gui/gui.h b/src/gui/gui.h
index e19a0a87..295bc595 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -82,7 +82,7 @@ class Gui : public gcn::Gui
* you picked up, etc.
*/
gcn::Font* getInfoParticleFont() const
- { return mInfoParicleFont; }
+ { return mInfoParticleFont; }
/**
* Sets whether a custom cursor should be rendered.
@@ -115,7 +115,7 @@ class Gui : public gcn::Gui
private:
GuiConfigListener *mConfigListener;
gcn::Font *mGuiFont; /**< The global GUI font */
- gcn::Font *mInfoParicleFont; /**< Font for Info Paricles*/
+ gcn::Font *mInfoParticleFont; /**< Font for Info Paricles*/
bool mCustomCursor; /**< Show custom cursor */
ImageSet *mMouseCursors; /**< Mouse cursor images */
float mMouseCursorAlpha;
@@ -127,13 +127,6 @@ extern Gui *gui; /**< The GUI system */
extern SDLInput *guiInput; /**< GUI input */
/**
- * Fonts used in showing hits
- */
-extern gcn::Font *hitRedFont;
-extern gcn::Font *hitBlueFont;
-extern gcn::Font *hitYellowFont;
-
-/**
* Bolded text font
*/
extern gcn::Font *boldFont;