diff options
| author | Earisu <bruant.bastien@gmail.com> | 2013-07-29 07:17:59 -0700 |
|---|---|---|
| committer | Earisu <bruant.bastien@gmail.com> | 2013-07-29 07:17:59 -0700 |
| commit | 309ffb2a4990596e86ff16fccd38fe80972ce49d (patch) | |
| tree | e0e393585bc5b831a0a53ec1c8d89d7401f2ce65 /src/map/npc.c | |
| parent | 15a3f6a5270943af44eb82fa01203464ce396aec (diff) | |
| parent | 328525e468c35e8b266b160adbf09792faa64669 (diff) | |
| download | hercules-309ffb2a4990596e86ff16fccd38fe80972ce49d.tar.gz hercules-309ffb2a4990596e86ff16fccd38fe80972ce49d.tar.bz2 hercules-309ffb2a4990596e86ff16fccd38fe80972ce49d.tar.xz hercules-309ffb2a4990596e86ff16fccd38fe80972ce49d.zip | |
Merge pull request #77 from Earisu/master
Added new HPM interface
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 911fbe1d4..8a2c0f746 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1710,7 +1710,7 @@ int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list) if( sd->inventory_data[idx]->type == IT_PETEGG && sd->status.inventory[idx].card[0] == CARD0_PET ) { if( search_petDB_index(sd->status.inventory[idx].nameid, PET_EGG) >= 0 ) { - intif_delete_petdata(MakeDWord(sd->status.inventory[idx].card[1], sd->status.inventory[idx].card[2])); + intif->delete_petdata(MakeDWord(sd->status.inventory[idx].card[1], sd->status.inventory[idx].card[2])); } } @@ -1817,7 +1817,7 @@ int npc_unload(struct npc_data* nd, bool single) { strdb_remove(npcname_db, nd->exname); if (nd->chat_id) // remove npc chatroom object and kick users - chat_deletenpcchat(nd); + chat->deletenpcchat(nd); #ifdef PCRE_SUPPORT npc_chat_finalize(nd); // deallocate npc PCRE data structures @@ -3865,7 +3865,7 @@ int npc_reload(void) { ShowStatus("Event '"CL_WHITE"OnInit"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n",npc_event_doall("OnInit")); // Execute rest of the startup events if connected to char-server. [Lance] - if(!CheckForCharServer()){ + if(!intif->CheckForCharServer()){ ShowStatus("Event '"CL_WHITE"OnInterIfInit"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnInterIfInit")); ShowStatus("Event '"CL_WHITE"OnInterIfInitOnce"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnInterIfInitOnce")); } |