diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-05 15:05:49 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-05 15:05:49 +0000 |
| commit | f7cf35aaad2512e7f329954946aac5e2a24cdfb7 (patch) | |
| tree | 93dff649c7a49c0f6758a18adb23105968dd9df2 /src/map/battle.c | |
| parent | c05a7a22feec3a93445654f0ce1eead31052e6b9 (diff) | |
| download | hercules-f7cf35aaad2512e7f329954946aac5e2a24cdfb7.tar.gz hercules-f7cf35aaad2512e7f329954946aac5e2a24cdfb7.tar.bz2 hercules-f7cf35aaad2512e7f329954946aac5e2a24cdfb7.tar.xz hercules-f7cf35aaad2512e7f329954946aac5e2a24cdfb7.zip | |
- Corrected cloaking not ending on attack if you are near a wall.
- Moved define cap_value to map.h as it's quite handy.
- Updated pc_bonus to use cap_value on all status_data modifiers to prevent overflows/underflows.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6979 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index a2cd7cbfa..24958bb99 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2070,9 +2070,9 @@ struct Damage battle_calc_magic_attack( case MG_FIREWALL: if(mflag) //mflag has a value when it was checked against an undead in skill.c [Skotlex] ad.blewcount = 0; //No knockback - else + else ad.blewcount |= 0x10000; - ad.dmotion = 0; //No flinch animation. + ad.dmotion = 0; //No flinch animation. break; case WZ_STORMGUST: //Should knockback randomly. ad.blewcount|=0x40000; @@ -2769,7 +2769,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, } } - if (sc && sc->data[SC_CLOAKING].timer != -1 && !sc->data[SC_CLOAKING].val4) + if (sc && sc->data[SC_CLOAKING].timer != -1 && !(sc->data[SC_CLOAKING].val4&1)) status_change_end(src,SC_CLOAKING,-1); //Check for counter attacks that block your attack. [Skotlex] |