summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-27 21:41:20 +0300
committerAndrei Karas <akaras@inbox.ru>2011-03-27 21:41:20 +0300
commit964ffbb9b6ed5246b14a7d0c0d065f7d38af0912 (patch)
treeedef1b3f31183402e2d0f86ee48c9734c2a03c7e /src/net
parent41ac086fcd38fd472b579a495a8e8e7685ae4722 (diff)
downloadmv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.gz
mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.bz2
mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.xz
mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.zip
Fix some warnings and improve code from gcc 4.6 compilation.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp6
-rw-r--r--src/net/tmwa/playerhandler.cpp15
2 files changed, 14 insertions, 7 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 89f63cce3..7d530940a 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -166,11 +166,9 @@ void connectToServer(const ServerInfo &server)
break;
#endif
case ServerInfo::TMWATHENA:
- new TmwAthena::GeneralHandler;
- break;
-
+ case ServerInfo::UNKNOWN:
default:
- // Shouldn't happen...
+ new TmwAthena::GeneralHandler;
break;
}
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 6078dd761..3f8bdab7b 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -707,9 +707,18 @@ void PlayerHandler::changeAction(Being::Action action)
char type;
switch (action)
{
- case Being::SIT: type = 2; break;
- case Being::STAND: type = 3; break;
- default: return;
+ case Being::SIT:
+ type = 2;
+ break;
+ case Being::STAND:
+ type = 3;
+ break;
+ default:
+ case Being::MOVE:
+ case Being::ATTACK:
+ case Being::DEAD:
+ case Being::HURT:
+ return;
}
MessageOut outMsg(CMSG_PLAYER_CHANGE_ACT);