diff options
| author | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-19 11:59:28 +0800 |
|---|---|---|
| committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-19 11:59:28 +0800 |
| commit | de7919f0f59f47473e6de709b5d5287a4a55e18d (patch) | |
| tree | 5967ef231271682ebf9db27185e7e86bbdbc57d4 /src/map/npc_chat.c | |
| parent | 98fe7e4770376ca66590b5a1e75ce3a848d032a9 (diff) | |
| parent | bd95eccf047bda9d72abcea0724ad34b31131ab0 (diff) | |
| download | hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.gz hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.bz2 hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.xz hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc_chat.c')
| -rw-r--r-- | src/map/npc_chat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 81373bbb6..c7faa2df6 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -411,7 +411,7 @@ int buildin_defpattern(struct script_state* st) int setid = script->conv_num(st,& (st->stack->stack_data[st->start+2])); const char* pattern = script->conv_str(st,& (st->stack->stack_data[st->start+3])); const char* label = script->conv_str(st,& (st->stack->stack_data[st->start+4])); - struct npc_data* nd = (struct npc_data *)map_id2bl(st->oid); + struct npc_data* nd = (struct npc_data *)iMap->id2bl(st->oid); npc_chat_def_pattern(nd, setid, pattern, label); @@ -421,7 +421,7 @@ int buildin_defpattern(struct script_state* st) int buildin_activatepset(struct script_state* st) { int setid = script->conv_num(st,& (st->stack->stack_data[st->start+2])); - struct npc_data* nd = (struct npc_data *)map_id2bl(st->oid); + struct npc_data* nd = (struct npc_data *)iMap->id2bl(st->oid); activate_pcreset(nd, setid); @@ -431,7 +431,7 @@ int buildin_activatepset(struct script_state* st) int buildin_deactivatepset(struct script_state* st) { int setid = script->conv_num(st,& (st->stack->stack_data[st->start+2])); - struct npc_data* nd = (struct npc_data *)map_id2bl(st->oid); + struct npc_data* nd = (struct npc_data *)iMap->id2bl(st->oid); deactivate_pcreset(nd, setid); @@ -441,7 +441,7 @@ int buildin_deactivatepset(struct script_state* st) int buildin_deletepset(struct script_state* st) { int setid = script->conv_num(st,& (st->stack->stack_data[st->start+2])); - struct npc_data* nd = (struct npc_data *)map_id2bl(st->oid); + struct npc_data* nd = (struct npc_data *)iMap->id2bl(st->oid); delete_pcreset(nd, setid); |