summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/game-server/commandhandler.cpp15
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 60d5e43c..9da6a73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-03 David Athay <ko2fan@gmail.com>
+
+ * src/game-server/commandhandler.cpp: Fixed argument processing.
+
2008-11-03 Andreas Habel <mail@exceptionfault.de>
* src/sql/sqlite/createTables.sql, src/sql/mysql/createTables.sql,
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp
index 8430a6ac..bd69023c 100644
--- a/src/game-server/commandhandler.cpp
+++ b/src/game-server/commandhandler.cpp
@@ -51,9 +51,14 @@ static std::string getArgument(std::string &args)
std::string::size_type pos = args.find(' ');
if (pos != std::string::npos)
{
- argument = args.substr(0, pos-1);
+ argument = args.substr(0, pos);
args = args.substr(pos+1);
}
+ else
+ {
+ argument = args.substr(0);
+ args = "";
+ }
return argument;
}
@@ -688,10 +693,10 @@ void CommandHandler::handleCommand(Character *player,
// check character permissions
// finer tuning for checking per command can be done
// in the handle function for that command
- //if (player->getAccountLevel() >= AL_GM)
- //{
- // return;
- //}
+ if (player->getAccountLevel() < AL_GM)
+ {
+ return;
+ }
// get command type, and arguments
// remove first character (the @)