Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Marionette and Devotion will now check raw distance and ignore obstacles and the like.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7134 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-13 17:37:08 +00:00
parent 785e089deb
commit c5909b0e34
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ 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/06/13
* Marionette and Devotion will now check raw distance and ignore obstacles
and the like. [Skotlex]
* Added irc_channel_pass setting and prevent crashing when irc server
lookup by host fails. Thanks to Trancid for the details. [Skotlex]
* [Fixed]:

4
src/map/status.c
View File

@ -6023,7 +6023,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
{ //Check range and timeleft to preserve status [Skotlex]
//This implementation won't work for mobs because of map_id2sd, but it's a small cost in exchange of the speed of map_id2sd over map_id2sd
struct map_session_data *md = map_id2sd(sc->data[type].val1);
if (md && battle_check_range(bl, &md->bl, sc->data[type].val3) && (sc->data[type].val4-=1000)>0)
if (md && check_distance_bl(bl, &md->bl, sc->data[type].val3) && (sc->data[type].val4-=1000)>0)
{
sc->data[type].timer = add_timer(1000+tick, status_change_timer, bl->id, data);
return 0;
@ -6073,7 +6073,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
case SC_MARIONETTE2:
{
struct block_list *pbl = map_id2bl(sc->data[type].val1);
if (pbl && battle_check_range(bl, pbl, 7) && (sc->data[type].val2--)>0)
if (pbl && check_distance_bl(bl, pbl, 7) && (sc->data[type].val2--)>0)
{
sc->data[type].timer = add_timer(
1000 + tick, status_change_timer,

4
src/map/unit.c
View File

@ -1482,6 +1482,10 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
skill_stop_dancing(bl);
if (sc->data[SC_DEVOTION].timer!=-1)
status_change_end(bl,SC_DEVOTION,-1);
if (sc->data[SC_MARIONETTE].timer!=-1)
status_change_end(bl,SC_MARIONETTE,-1);
if (sc->data[SC_MARIONETTE2].timer!=-1)
status_change_end(bl,SC_MARIONETTE2,-1);
if (sc->data[SC_CLOSECONFINE].timer!=-1)
status_change_end(bl,SC_CLOSECONFINE,-1);
if (sc->data[SC_CLOSECONFINE2].timer!=-1)