summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@inspircd.org>2009-05-17 05:13:29 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-17 22:35:41 +0200
commit0b18320693dd428e01ab9810d3bb4e18858c43d2 (patch)
treeb1cb19856e696b6d6a437535f7876c018ac63370
parent9a8d9a1e92859fdd75468852b3c7cc0de4ae44c0 (diff)
downloadmana-0b18320693dd428e01ab9810d3bb4e18858c43d2.tar.gz
mana-0b18320693dd428e01ab9810d3bb4e18858c43d2.tar.bz2
mana-0b18320693dd428e01ab9810d3bb4e18858c43d2.tar.xz
mana-0b18320693dd428e01ab9810d3bb4e18858c43d2.zip
Init state variable to make valgrind happy.
(cherry picked from commit 9b4d924d74587f489ac8141134b1c504e54a0684)
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3c98ed27..bc010d30 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -161,7 +161,7 @@ extern Net::Connection *accountServerConnection;
Graphics *graphics;
Game *game = 0;
-unsigned char state;
+unsigned char state = STATE_NULL;
std::string errorMessage;
Sound sound;
diff --git a/src/main.h b/src/main.h
index 49a034f5..a3894d13 100644
--- a/src/main.h
+++ b/src/main.h
@@ -107,15 +107,16 @@ enum {
STATE_LOGOUT_ATTEMPT,
STATE_CONNECT_GAME,
STATE_WAIT,
- STATE_FORCE_QUIT
+ STATE_FORCE_QUIT,
#else
STATE_ACCOUNT,
STATE_CHAR_CONNECT,
STATE_CHAR_SERVER,
STATE_CHAR_NEW,
STATE_CHAR_DEL,
- STATE_CONNECTING
+ STATE_CONNECTING,
#endif
+ STATE_NULL
};
/* length definitions for several char[]s in order