diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-10 16:56:05 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-10 16:56:05 +0100 |
| commit | c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7 (patch) | |
| tree | 87dbf38995dd4e66da83e30cef6085c9bceba05d /src/main.cpp | |
| parent | 840da9d6f64fea9275d0d1e916136fad29560c54 (diff) | |
| download | mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.gz mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.bz2 mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.xz mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.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 3a562b25..209157b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,7 +55,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" @@ -135,7 +135,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 { @@ -760,7 +760,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; @@ -1095,7 +1095,7 @@ int main(int argc, char *argv[]) usleep(50000); } - delete textColour; + delete textcolor; #ifdef PACKAGE_VERSION delete versionLabel; #endif |