summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-01 22:21:26 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-01 22:21:26 +0000
commit83be2ad0b8c0543bc7403a0cc40b5ec1545f3ec2 (patch)
tree1002fc2bc3da5366baddf56a3e5857b7b4aaa81c /src/map/status.c
parenta26df9b75e9401b0f590dd6cde4680394eaf1e7a (diff)
downloadhercules-83be2ad0b8c0543bc7403a0cc40b5ec1545f3ec2.tar.gz
hercules-83be2ad0b8c0543bc7403a0cc40b5ec1545f3ec2.tar.bz2
hercules-83be2ad0b8c0543bc7403a0cc40b5ec1545f3ec2.tar.xz
hercules-83be2ad0b8c0543bc7403a0cc40b5ec1545f3ec2.zip
- Fixed berserk not raising your HP to your new cap.
- Fixed ground-skills not displaying damage done. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5851 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 8d1028427..cb97017b1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4235,6 +4235,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
break;
case SC_BERSERK: /* ƒo?ƒT?ƒN */
+ if (sc->data[SC_ENDURE].timer == -1 || sc->data[SC_ENDURE].val1 <= 10)
+ sc_start(bl, SC_ENDURE, 100, 11, tick);
if(sd && !(flag&4)){
sd->status.hp = sd->status.max_hp * 3;
sd->status.sp = 0;
@@ -4244,8 +4246,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
}
if (!(flag&4))
tick = 10000;
- if (sc->data[SC_ENDURE].timer == -1 || sc->data[SC_ENDURE].val1 <= 10)
- sc_start(bl, SC_ENDURE, 100, 11, tick);
calc_flag = 1;
break;