summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
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