summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-05-08 17:07:49 +0000
committerDavid Athay <ko2fan@gmail.com>2008-05-08 17:07:49 +0000
commit96c635e12b1834493abfbe4685cfc1d6a3eaddc4 (patch)
tree13f2076417fb5d06c68b487be30ec6c5fb129095
parent8a41d66561860abbcce1bbefbcebdb67b5429d73 (diff)
downloadmana-96c635e12b1834493abfbe4685cfc1d6a3eaddc4.tar.gz
mana-96c635e12b1834493abfbe4685cfc1d6a3eaddc4.tar.bz2
mana-96c635e12b1834493abfbe4685cfc1d6a3eaddc4.tar.xz
mana-96c635e12b1834493abfbe4685cfc1d6a3eaddc4.zip
Fixed initialisation in case
-rw-r--r--ChangeLog4
-rw-r--r--src/net/chathandler.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 25550919..4b762e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-08 David Athay <ko2fan@gmail.com>
+
+ * src/net/chathandler.cpp: Fixed initialisation in case.
+
2008-05-08 Philipp Sehmisch <tmw@crushnet.org>
* src/net/chathandler.cpp: Made say messages from being ID 0 display as
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index e1d68f22..dac6bb86 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -68,6 +68,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
Being *being;
std::string chatMsg;
short channelId;
+ short id;
std::string userNick;
std::string channelName;
short error = -1;
@@ -75,7 +76,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
switch (msg.getId())
{
case GPMSG_SAY:
- int id = msg.readInt16();
+ id = msg.readInt16();
chatMsg = msg.readString();
if (id == 0)
{