summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-17 04:48:11 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-17 04:48:11 +0000
commit9e7f07a4a5ccfb7e1862fbb58c32e928ab9c35e8 (patch)
tree079392aca9c0a6c79a0b6405c80ecc3aef353634 /src/map/pc.c
parent4db5fdac1ee37f1dd2d2d28fbcaca577e112b953 (diff)
downloadhercules-9e7f07a4a5ccfb7e1862fbb58c32e928ab9c35e8.tar.gz
hercules-9e7f07a4a5ccfb7e1862fbb58c32e928ab9c35e8.tar.bz2
hercules-9e7f07a4a5ccfb7e1862fbb58c32e928ab9c35e8.tar.xz
hercules-9e7f07a4a5ccfb7e1862fbb58c32e928ab9c35e8.zip
Compiler fixes and scripting timer event fixes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@228 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 64d10c1ce..54207c853 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1457,9 +1457,9 @@ int pc_calcstatus(struct map_session_data* sd,int first)
if(sd->sc_data[SC_LOUD].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1) // ラウドボイス
sd->paramb[0]+= 4;
if(sd->sc_data[SC_QUAGMIRE].timer!=-1){ // クァグマイア
- sd->speed = sd->speed*3/2;
int agib = (sd->status.agi+sd->paramb[1]+sd->parame[1])*(sd->sc_data[SC_QUAGMIRE].val1*10)/100;
int dexb = (sd->status.dex+sd->paramb[4]+sd->parame[4])*(sd->sc_data[SC_QUAGMIRE].val1*10)/100;
+ sd->speed = sd->speed*3/2;
sd->paramb[1]-= agib > 50 ? 50 : agib;
sd->paramb[4]-= dexb > 50 ? 50 : dexb;
}
@@ -4562,11 +4562,11 @@ int pc_need_status_point(struct map_session_data *sd,int type)
*/
int pc_statusup(struct map_session_data *sd,int type)
{
- int need,val = 0;
+ int max, need,val = 0;
nullpo_retr(0, sd);
- int max = (pc_calc_upper(sd->status.class)==2) ? 80 : battle_config.max_parameter;
+ max = (pc_calc_upper(sd->status.class)==2) ? 80 : battle_config.max_parameter;
need=pc_need_status_point(sd,type);
if(type<SP_STR || type>SP_LUK || need<0 || need>sd->status.status_point){