summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-07-08 19:37:58 +0200
committerPhilipp Sehmisch <crush@themanaworld.org>2009-07-08 19:37:58 +0200
commitaa981826b8fedcbf4ff2988a1d14cd69ac47b8a8 (patch)
treec49b731dbe99fb1bc60034432de5773e0cb11879 /src
parentc04d6befd07a57331a3ea3f360261d80fa9a0e69 (diff)
parentbf2248220db63fd21bd4d3facc52ce8624d2928c (diff)
downloadmanaserv-aa981826b8fedcbf4ff2988a1d14cd69ac47b8a8.tar.gz
manaserv-aa981826b8fedcbf4ff2988a1d14cd69ac47b8a8.tar.bz2
manaserv-aa981826b8fedcbf4ff2988a1d14cd69ac47b8a8.tar.xz
manaserv-aa981826b8fedcbf4ff2988a1d14cd69ac47b8a8.zip
Merge branch 'master' of git@gitorious.org:tmwserv/mainline
Diffstat (limited to 'src')
-rw-r--r--src/game-server/commandhandler.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp
index cf263103..d7d40614 100644
--- a/src/game-server/commandhandler.cpp
+++ b/src/game-server/commandhandler.cpp
@@ -70,7 +70,6 @@ static std::string getArgument(std::string &args)
argument = args.substr(0);
args = "";
}
-
return argument;
}
@@ -741,10 +740,8 @@ static void handleReport(Character *player, std::string &args)
// TODO: Send the report to a developer or something
}
-static void handleAnnounce(Character *player, std::string &args)
+static void handleAnnounce(Character *player, std::string &msg)
{
- std::string msg = getArgument(args);
-
if (msg == "")
{
say("Invalid number of arguments given.", player);