summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-31 14:26:04 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-31 14:26:04 +0000
commitbbcf5c2bc5324d906d3a05b7bc67a33714ec4c4f (patch)
treeaca277594ea16a620a2b262a382115843a995ed1 /src
parent0705e5f5a0943a4d04ce6b39ee1edf46f49d1821 (diff)
downloadhercules-bbcf5c2bc5324d906d3a05b7bc67a33714ec4c4f.tar.gz
hercules-bbcf5c2bc5324d906d3a05b7bc67a33714ec4c4f.tar.bz2
hercules-bbcf5c2bc5324d906d3a05b7bc67a33714ec4c4f.tar.xz
hercules-bbcf5c2bc5324d906d3a05b7bc67a33714ec4c4f.zip
- Removed incorrect "Waterball range+1 when standing on suiton" feature.
- Corrected the Speed update code to prevent sending "walk to xy" packets twice when the affected character is a player. - Expanded mob can't move warning to print out where this mob was stuck at (map, x,y) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7998 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c7
3 files changed, 6 insertions, 5 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 6a72df011..6e167b3cc 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1012,7 +1012,7 @@ int mob_randomwalk(struct mob_data *md,int tick)
md->move_fail_count++;
if(md->move_fail_count>1000){
if(battle_config.error_log)
- ShowWarning("MOB cant move. random spawn %d, class = %d\n",md->bl.id,md->class_);
+ ShowWarning("MOB cant move. random spawn %d, class = %d, at %s (%d,%d)\n",md->bl.id,md->class_,map[md->bl.m].name, md->bl.x, md->bl.y);
md->move_fail_count=0;
mob_spawn(md);
}
diff --git a/src/map/skill.c b/src/map/skill.c
index c39013d5a..f8d880556 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3005,8 +3005,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
if (skilllv>1) {
int range = skilllv/2;
int cnt;
- // if caster is ONLY on a NJ_SUITON cell, range will be increased by 1 (consuming suiton cells but also deluge cells if there are ones)
- if ( !map_getcell(src->m,src->x,src->y,CELL_CHKWATER) && !map_find_skill_unit_oncell(src,src->x,src->y,SA_DELUGE,NULL) ) range = skilllv/2+1;
if (sd)
cnt = skill_count_water(src,range);
diff --git a/src/map/status.c b/src/map/status.c
index c32b4602c..4af93b2d4 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2802,10 +2802,13 @@ void status_calc_bl(struct block_list *bl, unsigned long flag)
}
if(flag&SCB_SPEED) {
- struct unit_data *ud = unit_bl2ud(bl);
status->speed = status_calc_speed(bl, sc, b_status->speed);
- if (ud && ud->walktimer != -1) //Re-walk to adjust speed. [Skotlex]
+ if (!sd)
+ { //Player speed is updated on calc_bl_sub_pc
+ struct unit_data *ud = unit_bl2ud(bl);
+ if (ud && ud->walktimer != -1) //Re-walk to adjust speed. [Skotlex]
unit_walktoxy(bl, ud->to_x, ud->to_y, ud->state.walk_easy);
+ }
}
if(flag&SCB_CRI && b_status->cri) {
if (status->luk == b_status->luk)