summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorshennetsind <notind@gmail.com>2013-06-27 10:30:26 -0700
committershennetsind <notind@gmail.com>2013-06-27 10:30:26 -0700
commitb97cbaf1a988370cb8cadc3d0108c19d14593b94 (patch)
tree4c7e2b722ad8baf8a165e83832988c8f89e6911f /src/map/battle.c
parentdbb4ce9421aed2defb4f3566e8c0b330c08b58bc (diff)
parent56e37cb8d74da7c12814df50a1d28f59a9b8dc36 (diff)
downloadhercules-b97cbaf1a988370cb8cadc3d0108c19d14593b94.tar.gz
hercules-b97cbaf1a988370cb8cadc3d0108c19d14593b94.tar.bz2
hercules-b97cbaf1a988370cb8cadc3d0108c19d14593b94.tar.xz
hercules-b97cbaf1a988370cb8cadc3d0108c19d14593b94.zip
Merge pull request #50 from Earisu/master
Chrif interface
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
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;