diff options
| author | sniper <sniper@livecd.janhome.net> | 2009-03-11 15:35:54 +0100 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 18:53:16 -0600 |
| commit | 4260cb92571842c6336537bf0d0c47c4f011ac0f (patch) | |
| tree | 6c9ce9d69dc6914bb9948b152171d216a801f7c9 /src/main.cpp | |
| parent | f3796c231d5bcac6850fb9afc8db652361e3fceb (diff) | |
| download | mana-4260cb92571842c6336537bf0d0c47c4f011ac0f.tar.gz mana-4260cb92571842c6336537bf0d0c47c4f011ac0f.tar.bz2 mana-4260cb92571842c6336537bf0d0c47c4f011ac0f.tar.xz mana-4260cb92571842c6336537bf0d0c47c4f011ac0f.zip | |
Extending the internal handling of colors
The internal storage for colors was in the file color.h/color.cpp. It
mainly managed the colors in the chat.
The Color class was extended to be more generic now and it stores
gcn::Color objects instead of integers now. A lot of new colortypes are
now available, though not many of them are used for now, that will come
in the next patches.
The Color class was renamed to Palette and color.{h,cpp} to
palette.{h,cpp} to better describe its purpose.
The color config gui now lists the new colors, even changes them, but the
result is not displayed properly for now.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index f1424096..dddf53d0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,10 +57,10 @@ #include "gui/button.h" #include "gui/char_server.h" #include "gui/char_select.h" -#include "gui/color.h" #include "gui/gui.h" #include "gui/login.h" #include "gui/ok_dialog.h" +#include "gui/palette.h" #include "gui/progressbar.h" #include "gui/register.h" #include "gui/sdlinput.h" @@ -135,7 +135,7 @@ CharServerHandler charServerHandler; LoginData loginData; LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1); -Color *textColor; +Palette *guiPalette; // This anonymous namespace hides whatever is inside from other modules. namespace { @@ -774,7 +774,7 @@ int main(int argc, char *argv[]) unsigned int oldstate = !state; // We start with a status change. // Needs to be created in main, as the updater uses it - textColor = new Color; + guiPalette = new Palette; Game *game = NULL; Window *currentDialog = NULL; @@ -1111,7 +1111,7 @@ int main(int argc, char *argv[]) usleep(50000); } - delete textColor; + delete guiPalette; #ifdef PACKAGE_VERSION delete versionLabel; #endif |