summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-09 23:14:00 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-09 23:14:00 +0000
commit4cbba75bb9534466c2d3a06a532f819bb38e5e8c (patch)
tree0cfeafce13adafa4e3c28bf18762a4909943773c
parent532ebd7e97e1948f6fe7ad8b823faa1f101896be (diff)
downloadhercules-4cbba75bb9534466c2d3a06a532f819bb38e5e8c.tar.gz
hercules-4cbba75bb9534466c2d3a06a532f819bb38e5e8c.tar.bz2
hercules-4cbba75bb9534466c2d3a06a532f819bb38e5e8c.tar.xz
hercules-4cbba75bb9534466c2d3a06a532f819bb38e5e8c.zip
- Added the missing last_thinktime initialization to pets.
- Reverted the change in skill_Wall_check to let skills go over pits. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5973 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/pet.c1
-rw-r--r--src/map/skill.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1e9645f4f..71e0fe227 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/09
+ * Added the missing last_thinktime initialization to pets. [Skotlex]
+ * Reverted the change in skill_wall_check to let skills go over pits.
+ [Skotlex]
* Changed use of strtol to strtoll when reading the equip_jobs as strtol's
result is just a signed int, fixes reading of equippable jobs for certain
items. [Skotlex]
diff --git a/src/map/pet.c b/src/map/pet.c
index c2c00e106..88eb26cd4 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -437,6 +437,7 @@ int pet_data_init(struct map_session_data *sd)
status_set_viewdata(&pd->bl,pd->class_);
unit_dataset(&sd->pd->bl);
pd->ud.dir = sd->ud.dir;
+ pd->last_thinktime = gettick();
map_addiddb(&pd->bl);
diff --git a/src/map/skill.c b/src/map/skill.c
index 5d2797fe3..fa0e842b8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6557,7 +6557,7 @@ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid,
if (alive && battle_config.skill_wall_check) {
//Check if there's a path between cell and center of casting.
struct walkpath_data wpd;
- if (path_search_real(&wpd,src->m,ux,uy,x,y,0x1,CELL_CHKNOREACH) == -1)
+ if (path_search_real(&wpd,src->m,ux,uy,x,y,0x1,CELL_CHKWALL) == -1)
alive = 0;
}