summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-07 19:22:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-07 21:38:21 +0300
commite7d34cc22d3bfd0dd44b014af1bd5fdc891141aa (patch)
treef7fa5a490a99cd4c08d051f44154d5d0e4d26222 /src/net
parentffeffa2314dbe03e0ced58e0c465760b54908690 (diff)
downloadplus-e7d34cc22d3bfd0dd44b014af1bd5fdc891141aa.tar.gz
plus-e7d34cc22d3bfd0dd44b014af1bd5fdc891141aa.tar.bz2
plus-e7d34cc22d3bfd0dd44b014af1bd5fdc891141aa.tar.xz
plus-e7d34cc22d3bfd0dd44b014af1bd5fdc891141aa.zip
fix more style, add consts.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/charserverhandler.h2
-rw-r--r--src/net/ea/gui/guildtab.cpp2
-rw-r--r--src/net/ea/gui/partytab.cpp2
-rw-r--r--src/net/ea/loginhandler.h3
-rw-r--r--src/net/eathena/adminhandler.cpp1
-rw-r--r--src/net/eathena/chathandler.cpp1
-rw-r--r--src/net/eathena/gamehandler.cpp2
-rw-r--r--src/net/eathena/guildhandler.h2
-rw-r--r--src/net/guildhandler.h2
-rw-r--r--src/net/tmwa/adminhandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.cpp1
-rw-r--r--src/net/tmwa/guildhandler.h5
-rw-r--r--src/net/tmwa/playerhandler.cpp1
13 files changed, 19 insertions, 7 deletions
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 44d0684f3..c12a969aa 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -76,7 +76,7 @@ class CharServerHandler
virtual void requestCharacters() = 0;
- virtual void chooseCharacter(Net::Character *character) = 0;
+ virtual void chooseCharacter(Net::Character *const character) = 0;
virtual void newCharacter(const std::string &name, const int slot,
const bool gender, const int hairstyle,
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 909cdb8c2..26f984a9a 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -99,7 +99,7 @@ bool GuildTab::handleCommand(const std::string &type, const std::string &args)
}
else if (type == "kick" && taGuild)
{
- Net::getGuildHandler()->kick(taGuild->getMember(args));
+ Net::getGuildHandler()->kick(taGuild->getMember(args), "");
}
else if (type == "notice" && taGuild)
{
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index e8689d7d0..fc59136e1 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -175,6 +175,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args)
break;
case -1:
chatLog(strprintf(BOOLEAN_OPTIONS, "item"));
+ break;
default:
break;
}
@@ -214,6 +215,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args)
break;
case -1:
chatLog(strprintf(BOOLEAN_OPTIONS, "exp"));
+ break;
default:
break;
}
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index eb81ceb6f..1efc94a2a 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -60,7 +60,8 @@ class LoginHandler : public Net::LoginHandler
virtual void chooseServer(const unsigned int server) const override;
- virtual void registerAccount(LoginData *const loginData) const override;
+ virtual void registerAccount(LoginData *const loginData)
+ const override;
virtual Worlds getWorlds() const override A_WARN_UNUSED;
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 662dee9ed..615cffa28 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -62,6 +62,7 @@ void AdminHandler::handleMessage(Net::MessageIn &msg)
NotifyManager::notify(NotifyManager::KICK_FAIL);
else
NotifyManager::notify(NotifyManager::KICK_SUCCEED);
+ break;
default:
break;
}
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 9ec9fe621..ae13a47b7 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -95,6 +95,7 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
case SMSG_IGNORE_ALL_RESPONSE:
processIgnoreAllResponse(msg);
+ break;
default:
break;
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index fbce4d943..00cfcc827 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -84,6 +84,8 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
case SMSG_MAP_CHAR_ID:
processMapCharId(msg);
+ break;
+
default:
break;
}
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index c25e8ff6f..26c57411a 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -55,7 +55,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
void leave(const int guildId) const override;
void kick(const GuildMember *const member,
- const std::string &reason = "") const override;
+ const std::string &reason) const override;
void chat(const int guildId, const std::string &text) const override;
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 27bd9a217..23b4048cc 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -54,7 +54,7 @@ class GuildHandler
virtual void leave(const int guildId) const = 0;
virtual void kick(const GuildMember *const member,
- const std::string &reason = "") const = 0;
+ const std::string &reason) const = 0;
virtual void chat(const int guildId,
const std::string &text) const = 0;
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 4ff07bd76..667972539 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -62,6 +62,8 @@ void AdminHandler::handleMessage(Net::MessageIn &msg)
NotifyManager::notify(NotifyManager::KICK_FAIL);
else
NotifyManager::notify(NotifyManager::KICK_SUCCEED);
+ break;
+
default:
break;
}
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 655a6d826..09b3bd518 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -108,6 +108,7 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
case SMSG_IGNORE_ALL_RESPONSE:
processIgnoreAllResponse(msg);
+ break;
default:
break;
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index c4c6cf285..581c9bc2f 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -49,12 +49,13 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
void invite(const int guildId,
const Being *const being) const override;
- void inviteResponse(const int guildId, const bool response) const override;
+ void inviteResponse(const int guildId,
+ const bool response) const override;
void leave(const int guildId) const override;
void kick(const GuildMember *const member,
- const std::string &reason = "") const override;
+ const std::string &reason) const override;
void chat(const int guildId, const std::string &text) const override;
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index ec07a1b51..162841693 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -104,6 +104,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
case SMSG_ONLINE_LIST:
processOnlineList(msg);
+ break;
default:
break;