diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 8 | ||||
| -rw-r--r-- | src/map/pc.c | 46 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
3 files changed, 20 insertions, 36 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index ada55e050..f41b428f9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4019,7 +4019,7 @@ int clif_damage(struct block_list *src,struct block_list *dst,unsigned int tick, WBUFL(buf,14)=sdelay;
WBUFL(buf,18)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,22)=div;
+ WBUFW(buf,22)=damage?div:0;
WBUFW(buf,27)=damage2?div:0;
} else {
WBUFW(buf,22)=(damage > SHRT_MAX)?SHRT_MAX:damage;
@@ -4544,7 +4544,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst, WBUFL(buf,16)=sdelay;
WBUFL(buf,20)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,24)=div;
+ WBUFW(buf,24)=damage?div:0;
} else {
WBUFW(buf,24)=damage;
}
@@ -4575,7 +4575,7 @@ int clif_skill_damage(struct block_list *src,struct block_list *dst, WBUFL(buf,16)=sdelay;
WBUFL(buf,20)=ddelay;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFL(buf,24)=div;
+ WBUFL(buf,24)=damage?div:0;
} else {
WBUFL(buf,24)=damage;
}
@@ -4635,7 +4635,7 @@ int clif_skill_damage2(struct block_list *src,struct block_list *dst, WBUFW(buf,24)=dst->x;
WBUFW(buf,26)=dst->y;
if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
- WBUFW(buf,28)=div;
+ WBUFW(buf,28)=damage?div:0;
} else {
WBUFW(buf,28)=damage;
}
diff --git a/src/map/pc.c b/src/map/pc.c index 909233ddb..05eb21ee7 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2548,11 +2548,11 @@ int pc_payzeny(struct map_session_data *sd,int zeny) if(sd->state.finalsave) return 1; - if (zeny > 0 && sd->status.zeny < zeny) - return 1; //Not enough. + if (zeny < 0) + return pc_getzeny(sd, -zeny); - if (zeny < 0 && sd->status.zeny > MAX_ZENY +zeny) - return 1; //Overflow + if (sd->status.zeny < zeny) + return 1; //Not enough. sd->status.zeny-=zeny; clif_updatestatus(sd,SP_ZENY); @@ -2566,23 +2566,25 @@ int pc_payzeny(struct map_session_data *sd,int zeny) */ int pc_getzeny(struct map_session_data *sd,int zeny) { - double z; - nullpo_retr(0, sd); - z = (double)sd->status.zeny; - if(z + (double)zeny > MAX_ZENY) { - zeny = 0; - sd->status.zeny = MAX_ZENY; - } + if(sd->state.finalsave) + return 1; + + if(zeny < 0) + return pc_payzeny(sd, -zeny); + + if (sd->status.zeny > MAX_ZENY -zeny) + return 1; //Overflow + sd->status.zeny+=zeny; clif_updatestatus(sd,SP_ZENY); + if(zeny > 0 && sd->state.showzeny){ char output[255]; sprintf(output, "Gained %dz.", zeny); clif_disp_onlyself(sd,output,strlen(output)); } - return 0; } @@ -5244,25 +5246,7 @@ int pc_setparam(struct map_session_data *sd,int type,int val) sd->status.status_point = val; break; case SP_ZENY: - if(val <= MAX_ZENY) { - // MAX_ZENY 以下なら代入 - sd->status.zeny = val; - } else { - sd->status.zeny = MAX_ZENY; - /* Could someone explain the comments below? I have no idea what they are trying to do... - * if you want to give someone so much zeny, just set their zeny to the max. [Skotlex] - if(sd->status.zeny > val) { - // Zeny が減少しているなら代入 - sd->status.zeny = val; - } else if(sd->status.zeny <= MAX_ZENY) { - // Zeny が増加していて、現在の値がMAX_ZENY 以下ならMAX_ZENY - sd->status.zeny = MAX_ZENY; - } else { - // Zeny が増加していて、現在の値がMAX_ZENY より下なら増加分を無視 - ; - } - */ - } + sd->status.zeny = cap_value(val, 0, MAX_ZENY); break; case SP_BASEEXP: if(pc_nextbaseexp(sd) > 0) { diff --git a/src/map/skill.c b/src/map/skill.c index d4fbd4972..8367663ba 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -10038,7 +10038,7 @@ int skill_unit_move_sub (struct block_list *bl, va_list ap) struct skill_unit_group *group; struct block_list *target; unsigned int tick,flag,result; - int skill_id,unit_id; + int skill_id,unit_id=0; //Set to 0 to shut-up compiler warnings. target=va_arg(ap,struct block_list*); tick = va_arg(ap,unsigned int); |