diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 11 | ||||
| -rw-r--r-- | src/map/map.h | 1 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 57fd3d5b3..7c82b1159 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6237,7 +6237,7 @@ int clif_movetoattack(struct map_session_data *sd,struct block_list *bl) WFIFOW(fd, 8)=bl->y;
WFIFOW(fd,10)=sd->bl.x;
WFIFOW(fd,12)=sd->bl.y;
- WFIFOW(fd,14)=sd->attackrange;
+ WFIFOW(fd,14)=sd->battle_status.rhw.range;
WFIFOSET(fd,packet_len_table[0x139]);
return 0;
}
@@ -9247,7 +9247,9 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) if(sd->npc_id) {
if (sd->npc_id != sd->npc_item_flag)
return;
- } else if (clif_cant_act(sd))
+ } else if (sd->state.storage_flag)
+ ; //You can equip/unequip stuff while storage is open.
+ else if (clif_cant_act(sd))
return;
if(sd->sc.data[SC_BLADESTOP].timer!=-1 || sd->sc.data[SC_BERSERK].timer!=-1 )
@@ -9284,6 +9286,11 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd) return;
}
+ if (sd->state.storage_flag)
+ ; //You can equip/unequip stuff while storage is open.
+ else if (clif_cant_act(sd))
+ return;
+
if (clif_cant_act(sd))
return;
diff --git a/src/map/map.h b/src/map/map.h index 94f6c894e..6663ae11a 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -606,7 +606,6 @@ struct map_session_data { int speed_add_rate, aspd_add_rate;
unsigned int setitem_hash, setitem_hash2; //Split in 2 because shift operations only work on int ranges. [Skotlex]
- short attackrange,attackrange_;
short splash_range, splash_add_range;
short add_steal_rate;
short hp_loss_value;
diff --git a/src/map/unit.c b/src/map/unit.c index a8c1e269e..5852f9ecb 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1590,6 +1590,8 @@ int unit_free(struct block_list *bl) { if(sd->sc.data[SC_TRICKDEAD].timer!=-1)
status_change_end(bl,SC_TRICKDEAD,-1);
if (battle_config.debuff_on_logout) {
+ if(sd->sc.data[SC_ORCISH].timer!=-1)
+ status_change_end(bl,SC_ORCISH,-1);
if(sd->sc.data[SC_STRIPWEAPON].timer!=-1)
status_change_end(bl,SC_STRIPWEAPON,-1);
if(sd->sc.data[SC_STRIPARMOR].timer!=-1)
|