diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
| commit | 22142fd2cc8dd262ca1202ffeb5f4ef714870c4c (patch) | |
| tree | ca0a1eaeb781baec2c4e5b22cf9df60fa89f2982 /src/game-server/commandhandler.cpp | |
| parent | 5bd0ddb6e2d1b002372541f911a2764ed2e54e6c (diff) | |
| parent | a5895b1655be3e81f451844a911eab8b798fa7ab (diff) | |
| download | manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.gz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.bz2 manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.xz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/character.cpp
src/scripting/lua.cpp
Diffstat (limited to 'src/game-server/commandhandler.cpp')
| -rw-r--r-- | src/game-server/commandhandler.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 0cde9891..6064811e 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -60,7 +60,7 @@ static void handleRecall(Character*, std::string&); static void handleBan(Character*, std::string&); static void handleItem(Character*, std::string&); static void handleDrop(Character*, std::string&); -//static void handleMoney(Character*, std::string&); +static void handleMoney(Character*, std::string&); static void handleSpawn(Character*, std::string&); static void handleAttribute(Character*, std::string&); static void handleReload(Character*, std::string&); @@ -102,8 +102,8 @@ static CmdRef const cmdRef[] = "Creates a number of items in the inventory of a character", &handleItem}, {"drop", "<item id> <amount>", "Drops a stack of items on the ground at your current location", &handleDrop}, -/* {"money", "<character> <amount>", - "Changes the money a character possesses", &handleMoney},*/ + {"money", "<character> <amount>", + "Changes the money a character possesses", &handleMoney}, {"spawn", "<monster id> <number>", "Creates a number of monsters near your location", &handleSpawn}, {"attribute", "<character> <attribute> <value>", @@ -594,7 +594,7 @@ static void handleDrop(Character *player, std::string &args) str << "User created item " << ic->getDatabaseID(); accountHandler->sendTransaction(player->getDatabaseID(), TRANS_CMD_DROP, str.str()); } -/* + static void handleMoney(Character *player, std::string &args) { Character *other; @@ -639,13 +639,12 @@ static void handleMoney(Character *player, std::string &args) value = utils::stringToInt(valuestr); // change how much money the player has - Inventory(other).changeMoney(value); + other->setAttribute(ATTR_GP , other->getAttribute(ATTR_GP) + value); // log transaction std::string msg = "User created " + valuestr + " money"; accountHandler->sendTransaction(player->getDatabaseID(), TRANS_CMD_MONEY, msg); } -*/ static void handleSpawn(Character *player, std::string &args) { |