diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-21 14:18:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-21 14:18:48 +0000 |
| commit | 9a850a659b05bbd8be0c51027bda20493d875431 (patch) | |
| tree | 3d7cec4b5c9ba84b23b498be245b45322666e590 /src/map | |
| parent | 316b68609dad823f0dee0abf50726d495b6fdda5 (diff) | |
| download | hercules-9a850a659b05bbd8be0c51027bda20493d875431.tar.gz hercules-9a850a659b05bbd8be0c51027bda20493d875431.tar.bz2 hercules-9a850a659b05bbd8be0c51027bda20493d875431.tar.xz hercules-9a850a659b05bbd8be0c51027bda20493d875431.zip | |
- Added back cropping the attack delay to attack motion for those weird mobs that have a aDelay less than their aMotion time.
- Made the Note 4 comment clearer in the battle config files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9548 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mob.c | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index f38a5d3ac..7405fc7ec 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3308,6 +3308,9 @@ static int mob_readdb(void) status->aspd_rate = 1000; status->adelay = atoi(str[27]); status->amotion = atoi(str[28]); + //If the attack animation is longer than the delay, the client crops the attack animation! + if (status->adelay < status->amotion) + status->adelay = status->amotion; status->dmotion=atoi(str[29]); if(battle_config.monster_damage_delay_rate != 100) status->dmotion = status->dmotion*battle_config.monster_damage_delay_rate/100; @@ -4008,6 +4011,9 @@ static int mob_read_sqldb(void) status->aspd_rate = 1000; status->adelay = TO_INT(27); status->amotion = TO_INT(28); + //If the attack animation is longer than the delay, the client crops the attack animation! + if (status->adelay < status->amotion) + status->adelay = status->amotion; status->dmotion = TO_INT(29); if(battle_config.monster_damage_delay_rate != 100) status->dmotion = status->dmotion*battle_config.monster_damage_delay_rate/100; diff --git a/src/map/skill.c b/src/map/skill.c index c69ecbaeb..33e02296a 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2167,7 +2167,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds *------------------------------------------ */ static int skill_area_temp[8]; -static int skill_unit_temp[24]; /* For storing skill_unit ids as players move in/out of them. [Skotlex] */ +static int skill_unit_temp[64]; /* For storing skill_unit ids as players move in/out of them. [Skotlex] */ static int skill_unit_index=0; //Well, yeah... am too lazy to pass pointers around :X typedef int (*SkillFunc)(struct block_list *, struct block_list *, int, int, unsigned int, int); int skill_area_sub (struct block_list *bl, va_list ap) |