summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-28 03:55:21 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-28 03:55:21 +0000
commitcb8e7fecea483281556158a966f95997b5e73c38 (patch)
tree387e0e21236150088db85df6e09b2bd7607bb42f
parentaa9b34ab4680df2a15ed58b65b75b5b2e50246b8 (diff)
downloadhercules-cb8e7fecea483281556158a966f95997b5e73c38.tar.gz
hercules-cb8e7fecea483281556158a966f95997b5e73c38.tar.bz2
hercules-cb8e7fecea483281556158a966f95997b5e73c38.tar.xz
hercules-cb8e7fecea483281556158a966f95997b5e73c38.zip
Fixed @cash/@points not handling negative values properly (bugreport:2132)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13145 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/atcommand.c4
-rw-r--r--src/map/charcommand.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 99ca3256c..629cf617f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/08/28
+ * Fixed @cash/@points not handling negative values properly (bugreport:2132) [ultramage]
2008/08/26
* Fixed @agjgmlvl bug preventing its use on other players. (bugreport:2124) [SketchyPhoenix]
* pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 217587f7e..f734b76da 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7960,14 +7960,14 @@ int atcommand_cash(const int fd, struct map_session_data* sd, const char* comman
if( value > 0 )
pc_getcash(sd, value, 0);
else
- pc_paycash(sd, value, 0);
+ pc_paycash(sd, -value, 0);
}
else
{ // @points
if( value > 0 )
pc_getcash(sd, 0, value);
else
- pc_paycash(sd, value, value);
+ pc_paycash(sd, -value, -value);
}
return 0;
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 949b39b12..411188b9e 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -928,7 +928,7 @@ int charcommand_cash(const int fd, struct map_session_data* sd, const char* comm
if( value > 0 )
pc_getcash(pl_sd, value, 0);
else
- pc_paycash(pl_sd, value, 0);
+ pc_paycash(pl_sd, -value, 0);
clif_displaymessage(fd, "Character's Cash Points changed!.");
}
@@ -937,7 +937,7 @@ int charcommand_cash(const int fd, struct map_session_data* sd, const char* comm
if( value > 0 )
pc_getcash(pl_sd, 0, value);
else
- pc_paycash(pl_sd, value, value);
+ pc_paycash(pl_sd, -value, -value);
clif_displaymessage(fd, "Character's Kafra Points changed!.");
}