diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-06 23:48:13 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-06 23:48:13 +0000 |
commit | 867734490acadfa45af27b3903a95f2bf15d3f3d (patch) | |
tree | f9eb463ba65838cb5e237d6add98ff216961d07f /src/map/battle.c | |
parent | 8f3f5c94a0111b37b374f7d861533f5f25a99af5 (diff) | |
download | hercules-867734490acadfa45af27b3903a95f2bf15d3f3d.tar.gz hercules-867734490acadfa45af27b3903a95f2bf15d3f3d.tar.bz2 hercules-867734490acadfa45af27b3903a95f2bf15d3f3d.tar.xz hercules-867734490acadfa45af27b3903a95f2bf15d3f3d.zip |
- Fixed Overthrust's timer not being able to be refreshed when recasting it (conflict on what val2 should mean)
- Changed the code in status_change_timer so that a null pointer no longer causes a crash but prints an error instead.
- Corrected clones not copying over a player's skills properly.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12027 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 4f164dd3c..a91576f36 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1262,7 +1262,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(sc && skill_num != PA_SACRIFICE) { if(sc->data[SC_OVERTHRUST]) - skillratio += sc->data[SC_OVERTHRUST]->val2; + skillratio += sc->data[SC_OVERTHRUST]->val3; if(sc->data[SC_MAXOVERTHRUST]) skillratio += sc->data[SC_MAXOVERTHRUST]->val2; if(sc->data[SC_BERSERK]) |