diff options
| author | Haru <haru@dotalux.com> | 2014-10-20 00:38:44 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-10-24 00:59:21 +0200 |
| commit | 138352558b04de199139d5f8124d6e3c24df8008 (patch) | |
| tree | 2d9894bb9c4d630715603860745d3e77ac7851b3 /src/map/battle.c | |
| parent | 98274e4ab8d5f8cb6381a4a625441c90020dffff (diff) | |
| download | hercules-138352558b04de199139d5f8124d6e3c24df8008.tar.gz hercules-138352558b04de199139d5f8124d6e3c24df8008.tar.bz2 hercules-138352558b04de199139d5f8124d6e3c24df8008.tar.xz hercules-138352558b04de199139d5f8124d6e3c24df8008.zip | |
pc_isriding* / pc_setriding* cleanup
- pc_isriding is now renamed to pc_isridingpeco, since that's what it
checks (to avoid confusion).
- pc_hasmount is added, to check for any of Peco, Dragon, Mado Gear, Wug
Rider.
- pc->setridingdragon is added.
- pc->setridingwug is added.
- pc->setfalcon type is changed.
- pc->setmadogear type is changed.
- pc->setridign is changed to pc->setridingpeco to avoid confusion.
- Changed direct accesses to sd->sd.option to the proper pc_is*
accessors, where applicable.
- Special thanks to Kisuka.
Signed-off-by: Haru <haru@dotalux.com>
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 6844d8bda..3db887c42 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -663,10 +663,10 @@ int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,in break; case W_1HSPEAR: case W_2HSPEAR: - if((skill_lv = pc->checkskill(sd,KN_SPEARMASTERY)) > 0) { - if(pc_isridingdragon(sd)) + if ((skill_lv = pc->checkskill(sd,KN_SPEARMASTERY)) > 0) { + if (pc_isridingdragon(sd)) damage += (skill_lv * 10); - else if(pc_isriding(sd)) + else if (pc_isridingpeco(sd)) damage += (skill_lv * 5); else damage += (skill_lv * 4); |