summaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h
index a5e60fef..578b14e7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -34,9 +34,14 @@
#include "net/protocol.h"
#include "sound.h"
#include <stdio.h>
+#include <memory>
#define CORE_VERSION "0.0.9"
+#ifdef ERROR
+#undef ERROR
+#endif
+
#define EXIT 0
#define LOGIN 1
#define CHAR_SERVER 2
@@ -74,7 +79,7 @@ typedef struct {
extern Image *login_wallpaper;
extern Spriteset *hairset, *playerset;
-extern Graphics *graphics;
+extern Graphics* graphics;
extern char username[25];
extern char password[25];
extern int map_address, char_ID;