diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-13 01:03:28 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-13 01:03:28 +0000 |
| commit | dc88ae10c96b5d5d9d40fccbb102f1ec80058063 (patch) | |
| tree | 89632cb14aff7a4c0848f2c845bab03728752b77 /src | |
| parent | 5e59d3abbd6547ff48a2571cdc77b29ab1326c04 (diff) | |
| download | hercules-dc88ae10c96b5d5d9d40fccbb102f1ec80058063.tar.gz hercules-dc88ae10c96b5d5d9d40fccbb102f1ec80058063.tar.bz2 hercules-dc88ae10c96b5d5d9d40fccbb102f1ec80058063.tar.xz hercules-dc88ae10c96b5d5d9d40fccbb102f1ec80058063.zip | |
Following r16914
-Upd pre-re db (insignia, homon-s, bloodylust, chaospanic)
-fix @zeny for negative amout bugreport:6886
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16923 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/renewal.h | 4 | ||||
| -rw-r--r-- | src/map/atcommand.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/config/renewal.h b/src/config/renewal.h index 4713cc185..339937adb 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -45,7 +45,7 @@ /// renewal level modifier on damage /// (disable by commenting the line) -/// +/// // leave this line to enable renewal base level modifier on skill damage (selected skills only) #define RENEWAL_LVDMG @@ -60,7 +60,7 @@ /// renewal ASPD [malufett] /// (disable by commenting the line) -/// +/// /// leave this line to enable renewal ASPD /// - shield penalty is applied /// - AGI has a greater factor in ASPD increase diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 5be76d36a..27329ae4a 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2533,7 +2533,10 @@ ACMD_FUNC(zeny) clif_displaymessage(fd, msg_txt(1012)); // Please enter an amount (usage: @zeny <amount>). return -1; } - pc_getzeny(sd,zeny,LOG_TYPE_COMMAND,NULL); + if(zeny > 0) + pc_getzeny(sd,zeny,LOG_TYPE_COMMAND,NULL); + else + pc_payzeny(sd,zeny,LOG_TYPE_COMMAND,NULL); return 0; } |