diff options
| author | shennetsind <ind@henn.et> | 2013-06-27 16:31:18 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-27 16:31:18 -0300 |
| commit | 897f598ab7ea2235d551081f54328ee69970f731 (patch) | |
| tree | cba38e4e6f994b2cd871fd0019b342306475ee56 /src/map/battle.c | |
| parent | 85ac3b03b9e642bc322109ea8c176c43192eb4bd (diff) | |
| parent | 15398c9b90693707c3e49c349e24e6dd655f12a9 (diff) | |
| download | hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.gz hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.bz2 hercules-897f598ab7ea2235d551081f54328ee69970f731.tar.xz hercules-897f598ab7ea2235d551081f54328ee69970f731.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
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 804f08cb8..d67684e7b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1489,7 +1489,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block skillratio += 300 + 100 * skill_lv + status_get_int(src); RE_LVL_DMOD(100); break; - case WL_FROSTMISTY: // MATK [{( Skill Level x 100 ) + 200 } x ( Caster’s Base Level / 100 )] % + case WL_FROSTMISTY: // MATK [{( Skill Level x 100 ) + 200 } x ( Caster�s Base Level / 100 )] % skillratio += 100 + 100 * skill_lv; RE_LVL_DMOD(100); break; @@ -6576,14 +6576,14 @@ void Hercules_report(char* date, char *time_c) { WBUFL(buf,6 + 12 + 9 + 24 + 41 + 4 + 4 + 4 + BFLAG_LENGTH + ( i * ( BFLAG_LENGTH + 4 ) ) ) = *battle_data[i].val; } - chrif_send_report(buf, 6 + 12 + 9 + 24 + 41 + 4 + 4 + 4 + ( bd_size * ( BFLAG_LENGTH + 4 ) ) ); + chrif->send_report(buf, 6 + 12 + 9 + 24 + 41 + 4 + 4 + 4 + ( bd_size * ( BFLAG_LENGTH + 4 ) ) ); aFree(buf); #undef BFLAG_LENGTH } static int Hercules_report_timer(int tid, unsigned int tick, int id, intptr_t data) { - if( chrif_isconnected() ) {/* char server relays it, so it must be online. */ + if( chrif->isconnected() ) {/* char server relays it, so it must be online. */ Hercules_report(__DATE__,__TIME__); } return 0; |