diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-07-04 17:25:18 -0300 |
| commit | 5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1 (patch) | |
| tree | b3b02e05f343a3e24b7cceb34ce04bbb8721ed1c /src/map/map.c | |
| parent | 5ea7b8b9e172ed16fda6ee5a051ae0dbb767b4ac (diff) | |
| parent | aefa8d6bd88e5056080f45ed89f86258f1bf81d7 (diff) | |
| download | hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.gz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.bz2 hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.tar.xz hercules-5b1d3c5ebcbeab9730f8f4603c769c090ca4c8d1.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c index 10d413676..2770a8af7 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -357,7 +357,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) //TODO: Perhaps some outs of bounds checking should be placed here? if (bl->type&BL_CHAR) { - sc = status_get_sc(bl); + sc = iStatus->get_sc(bl); skill->unit_move(bl,tick,2); status_change_end(bl, SC_RG_CCONFINE_M, INVALID_TIMER); @@ -1672,7 +1672,7 @@ int map_quit(struct map_session_data *sd) { if( sd->sc.count ) { //Status that are not saved... for(i=0; i < SC_MAX; i++){ - if ( status_get_sc_type(i)&SC_NO_SAVE ){ + if ( iStatus->get_sc_type(i)&SC_NO_SAVE ){ if ( !sd->sc.data[i] ) continue; switch( i ){ @@ -5043,7 +5043,7 @@ void do_final(void) homun->final(); atcommand->final_msg(); skill->final(); - do_final_status(); + iStatus->do_final_status(); do_final_unit(); do_final_battleground(); do_final_duel(); @@ -5254,6 +5254,7 @@ void map_hp_symbols(void) { HPM->share(party,"party"); HPM->share(storage,"storage"); HPM->share(trade,"trade"); + HPM->share(iStatus,"iStatus"); /* partial */ HPM->share(mapit,"mapit"); /* sql link */ @@ -5289,6 +5290,7 @@ void load_defaults(void) { party_defaults(); storage_defaults(); trade_defaults(); + status_defaults(); } int do_init(int argc, char *argv[]) { @@ -5476,7 +5478,7 @@ int do_init(int argc, char *argv[]) read_map_zone_db();/* read after item and skill initalization */ do_init_mob(); pc->do_init_pc(); - do_init_status(); + iStatus->do_init_status(); party->do_init_party(); guild->init(); storage->init(); |