diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 15:29:17 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 15:29:17 +0000 |
| commit | a1fddcf716995eddf1c26e1395c8cc24ce6b3eba (patch) | |
| tree | 81c5947a93a0b58b2d684a2d9589cec4c68f1673 /src/map/unit.c | |
| parent | 6f704b3e087d36513e4c5b190da10141231fb187 (diff) | |
| download | hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.gz hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.bz2 hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.xz hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.zip | |
- Small optimization in battle_check_target
- Disabled ontouch npcs triggering on hidden/chase-walk characters.
- Added the SC* code blocks relevant to SC_AVOID, SC_CHANGE, SC_BLOODLUST, SC_FLEET
- Added structure status_data to homun_data
- Added handling of BL_HOMUNCULUS in status_heal, status_damage.
- Cleaned up the homun-submitted code, moved the relevant code to status_calc_homunculus.
- Updated map-server Makefile to compile mercenary.* files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6847 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 39b8c45dc..02a95fd34 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1272,11 +1272,10 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int t if(sd && sd->status.pet_id > 0 && sd->pd && battle_config.pet_attack_support)
pet_target_check(sd,target,0);
- map_freeblock_unlock();
-
-ud->attackabletime = tick + sstatus->adelay;
+ map_freeblock_unlock();
+ ud->attackabletime = tick + sstatus->adelay;
// You can't move if you can't attack neither.
unit_set_walkdelay(src, tick, sstatus->amotion, 1);
}
|