diff options
| author | Majin Sniper <majinsniper@gmx.de> | 2009-03-12 16:48:03 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-12 21:38:36 -0600 |
| commit | 5207b4cbb462cfa962a6f566897a6affd92eef94 (patch) | |
| tree | c9129fbf894b7756f5c4c5e1180492433ca11ee2 /src/gui/gui.cpp | |
| parent | 7d20381b7b9abdf0934ee0fbbb196c788ea93a0d (diff) | |
| download | mana-5207b4cbb462cfa962a6f566897a6affd92eef94.tar.gz mana-5207b4cbb462cfa962a6f566897a6affd92eef94.tar.bz2 mana-5207b4cbb462cfa962a6f566897a6affd92eef94.tar.xz mana-5207b4cbb462cfa962a6f566897a6affd92eef94.zip | |
Extend color config gui to support the new colors
The new color palette supports many more colors that the browserbox can
display. So a change to the color config gui was needed.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 2c0ddee9..434fc1e1 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -26,6 +26,7 @@ #include "focushandler.h" #include "gui.h" +#include "palette.h" #include "sdlinput.h" #include "skin.h" #include "truetypefont.h" @@ -48,11 +49,6 @@ Gui *gui = 0; Viewport *viewport = 0; /**< Viewport on the map. */ SDLInput *guiInput = 0; -// Fonts used in showing hits -gcn::Font *hitRedFont = 0; -gcn::Font *hitBlueFont = 0; -gcn::Font *hitYellowFont = 0; - // Bolded font gcn::Font *boldFont = 0; @@ -177,6 +173,8 @@ void Gui::logic() else mMouseCursorAlpha = std::max(0.0f, mMouseCursorAlpha - 0.005f); + guiPalette->advanceGradient(); + gcn::Gui::logic(); } |