diff options
| author | Majin Sniper <majinsniper@gmx.de> | 2009-03-12 16:48:03 +0100 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 19:12:46 -0600 |
| commit | b9191530c81595b0ad3d2faa6c4d21d75a720c29 (patch) | |
| tree | a13f19443a464caa3329bb3d7d2c7ab378c70c9d /src/gui/gui.cpp | |
| parent | c7fa79ff1704d86e12e12b83e1e4745ca27a543a (diff) | |
| download | mana-b9191530c81595b0ad3d2faa6c4d21d75a720c29.tar.gz mana-b9191530c81595b0ad3d2faa6c4d21d75a720c29.tar.bz2 mana-b9191530c81595b0ad3d2faa6c4d21d75a720c29.tar.xz mana-b9191530c81595b0ad3d2faa6c4d21d75a720c29.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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 6d6ccbdf..e14642dd 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -25,6 +25,7 @@ #include "focushandler.h" #include "gui.h" +#include "palette.h" #include "sdlinput.h" #include "truetypefont.h" #include "viewport.h" @@ -45,11 +46,11 @@ 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; +gcn::Font *hitYellowFont = 0;*/ // Bolded font gcn::Font *boldFont = 0; @@ -175,6 +176,8 @@ void Gui::logic() else mMouseCursorAlpha = std::max(0.0f, mMouseCursorAlpha - 0.005f); + guiPalette->advanceGradient(); + gcn::Gui::logic(); } |