diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-20 18:22:04 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-20 18:22:04 +0000 |
| commit | e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d (patch) | |
| tree | b3fc31f59d2006310ccfb32df5cd0afe00fae09c | |
| parent | df87fb05f06f776e21c36f72de759094e1697f9a (diff) | |
| download | hercules-e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d.tar.gz hercules-e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d.tar.bz2 hercules-e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d.tar.xz hercules-e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d.zip | |
- Close confine won't get the bonus range on cast as other skills do due to exploits.
- Fixed a bug in setnpctimer checking out the wrong variable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5347 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index d8a6d7218..380a519d7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/20
+ * Close confine won't get the bonus range on cast as other skills do due to
+ exploits. [Skotlex]
+ * Fixed a bug in setnpctimer. [Skotlex]
* Menu-based skills now use their own variables separetly from the normal
skill variables. This should enable them to work even when you keep doing
other stuff between the menu invocation and selection. Also gives a better
diff --git a/src/map/npc.c b/src/map/npc.c index 9d6d25cbb..7bdba2a61 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -769,7 +769,7 @@ int npc_settimerevent_tick(struct npc_data *nd,int newtimer) }
flag= sd->npc_timer_id != -1 ;
} else
- flag= nd->u.scr.timer != -1 ;
+ flag= nd->u.scr.timerid != -1 ;
if(flag)
npc_timerevent_stop(nd);
nd->u.scr.timer=newtimer;
diff --git a/src/map/skill.c b/src/map/skill.c index 729135ad7..cb9e7d255 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8489,7 +8489,8 @@ int skill_use_id (struct map_session_data *sd, int target_id, int skill_num, int if (!skill_check_condition(sd,0)) return 0;
if(sd->bl.id != target_id){ // Don't check range for self skills, this is useless...
- if(!battle_check_range(&sd->bl,bl,skill_get_range2(&sd->bl, skill_num,skill_lv)+1))
+ if(!battle_check_range(&sd->bl,bl,skill_get_range2(&sd->bl, skill_num,skill_lv)
+ +(skill_num==RG_CLOSECONFINE)?0:1)) //Close confine is expoitable thanks to this extra range "feature" of the client. [Skotlex]
return 0;
}
|