diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-10 16:56:05 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-11 08:29:51 -0700 |
| commit | 4a41ce55224ad7b54c6b5ea78126d8d314f5ef41 (patch) | |
| tree | 2d2172cb0c0985c7711206dc5adda6bfa219245e /src/main.cpp | |
| parent | d036e2c771bcd19a21e26aec155d4269cecdb1c2 (diff) | |
| download | mana-client-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.gz mana-client-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.bz2 mana-client-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.xz mana-client-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.zip | |
Changed spelling from colour to color.
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 c68c02d8..80cff8d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ #include "gui/button.h" #include "gui/char_server.h" #include "gui/char_select.h" -#include "gui/colour.h" +#include "gui/color.h" #include "gui/gui.h" #include "gui/login.h" #include "gui/ok_dialog.h" @@ -136,7 +136,7 @@ CharServerHandler charServerHandler; LoginData loginData; LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1); -Colour *textColour; +Color *textColor; // This anonymous namespace hides whatever is inside from other modules. namespace { @@ -764,7 +764,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 - textColour = new Colour(); + textColor = new Color(); Game *game = NULL; Window *currentDialog = NULL; @@ -1097,7 +1097,7 @@ int main(int argc, char *argv[]) usleep(50000); } - delete textColour; + delete textColor; #ifdef PACKAGE_VERSION delete versionLabel; #endif |