diff options
| author | Susu <bruant.bastien@gmail.com> | 2013-07-04 12:20:51 +0200 |
|---|---|---|
| committer | Susu <bruant.bastien@gmail.com> | 2013-07-04 12:20:51 +0200 |
| commit | b9889903e89bd4127c7503a512cfe215b9ccc740 (patch) | |
| tree | 52eb8dffbdf4eb3cc3e8f9c8ce5da13bde188a71 /src/map/npc.c | |
| parent | 38ad0593dd7d6c3357c2a2219fe59122969c84b9 (diff) | |
| download | hercules-b9889903e89bd4127c7503a512cfe215b9ccc740.tar.gz hercules-b9889903e89bd4127c7503a512cfe215b9ccc740.tar.bz2 hercules-b9889903e89bd4127c7503a512cfe215b9ccc740.tar.xz hercules-b9889903e89bd4127c7503a512cfe215b9ccc740.zip | |
- Added interface iStatus (needed to renamed it because A LOT of variables are already called 'status')
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 33d0c48f1..97f84d73d 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2085,7 +2085,7 @@ struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short nd->subtype = WARP; npc_setcells(nd); iMap->addblock(&nd->bl); - status_set_viewdata(&nd->bl, nd->class_); + iStatus->set_viewdata(&nd->bl, nd->class_); nd->ud = &npc_base_ud; if( map[nd->bl.m].users ) clif->spawn(&nd->bl); @@ -2150,7 +2150,7 @@ static const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const nd->subtype = WARP; npc_setcells(nd); iMap->addblock(&nd->bl); - status_set_viewdata(&nd->bl, nd->class_); + iStatus->set_viewdata(&nd->bl, nd->class_); nd->ud = &npc_base_ud; if( map[nd->bl.m].users ) clif->spawn(&nd->bl); @@ -2262,7 +2262,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const if( m >= 0 ) {// normal shop npc iMap->addnpc(m,nd); iMap->addblock(&nd->bl); - status_set_viewdata(&nd->bl, nd->class_); + iStatus->set_viewdata(&nd->bl, nd->class_); nd->ud = &npc_base_ud; nd->dir = dir; if( map[nd->bl.m].users ) @@ -2454,7 +2454,7 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons npc_setcells(nd); iMap->addblock(&nd->bl); if( class_ >= 0 ) { - status_set_viewdata(&nd->bl, nd->class_); + iStatus->set_viewdata(&nd->bl, nd->class_); if( map[nd->bl.m].users ) clif->spawn(&nd->bl); } @@ -2610,7 +2610,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch npc_setcells(nd); iMap->addblock(&nd->bl); if( class_ >= 0 ) { - status_set_viewdata(&nd->bl, nd->class_); + iStatus->set_viewdata(&nd->bl, nd->class_); if( map[nd->bl.m].users ) clif->spawn(&nd->bl); } @@ -2680,7 +2680,7 @@ int npc_duplicate4instance(struct npc_data *snd, int16 m) { wnd->subtype = WARP; npc_setcells(wnd); iMap->addblock(&wnd->bl); - status_set_viewdata(&wnd->bl, wnd->class_); + iStatus->set_viewdata(&wnd->bl, wnd->class_); wnd->ud = &npc_base_ud; if( map[wnd->bl.m].users ) clif->spawn(&wnd->bl); @@ -2813,7 +2813,7 @@ void npc_setclass(struct npc_data* nd, short class_) if( map[nd->bl.m].users ) clif->clearunit_area(&nd->bl, CLR_OUTSIGHT);// fade out nd->class_ = class_; - status_set_viewdata(&nd->bl, class_); + iStatus->set_viewdata(&nd->bl, class_); if( map[nd->bl.m].users ) clif->spawn(&nd->bl);// fade in } |