diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 02:17:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 02:17:48 +0000 |
| commit | 81289b916f65036bcab0c292d433ee2a2e9aa8c6 (patch) | |
| tree | 265861cf3f9a819fb2c635a6bc4d9feb24116aff | |
| parent | bde640d49c4a26203d76ea5884c1264b3f7828e2 (diff) | |
| download | hercules-81289b916f65036bcab0c292d433ee2a2e9aa8c6.tar.gz hercules-81289b916f65036bcab0c292d433ee2a2e9aa8c6.tar.bz2 hercules-81289b916f65036bcab0c292d433ee2a2e9aa8c6.tar.xz hercules-81289b916f65036bcab0c292d433ee2a2e9aa8c6.zip | |
- Fixed mob random walk interval being set to up to 6K seconds in some instances.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5621 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 178fb6550..fd03d3e51 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ 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/03/15
+ * Fixed mob random walk interval being set to up to 6K seconds in some
+ instances. [Skotlex]
* Added mapflag nodrop (prevents droping items to the ground). [Skotlex]
* Fixed mapflag notrade doing nothing. [Skotlex]
* Likely fixed Gravitation not hitting except for the last hit. [Skotlex]
diff --git a/src/map/mob.c b/src/map/mob.c index 822eb61d9..b469ab12e 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1929,7 +1929,7 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) {
if (DIFF_TICK(md->next_walktime, tick) > 7000 &&
(md->walkpath.path_len == 0 || md->walkpath.path_pos >= md->walkpath.path_len))
- md->next_walktime = tick + 3000 * rand() % 2000;
+ md->next_walktime = tick + 3000 + rand() % 2000;
// Random movement
if (mob_randomwalk(md,tick))
return 0;
diff --git a/src/map/skill.c b/src/map/skill.c index 137c812e9..33bd65255 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -779,10 +779,10 @@ int skillnotok(int skillid, struct map_session_data *sd) if (i >= GD_SKILLBASE)
i = GD_SKILLRANGEMIN + i - GD_SKILLBASE;
- if (sd->blockskill[i] > 0)
+ if (i > MAX_SKILL || i < 0)
return 1;
- if (i > MAX_SKILL || i < 0)
+ if (sd->blockskill[i] > 0)
return 1;
if (battle_config.gm_skilluncond && pc_isGM(sd) >= battle_config.gm_skilluncond)
|