diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc_chat.c | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 12ae83ee9..6c78c0458 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,8 +4,6 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/03/23 - * Temporary resolved npc_chat.c macro issue. Please revise where to put - the macros. [Lance] * Major reconfiguration of the vs7 project files (+vs8 while I was at it) - added definitions _DEBUG and NDEBUG to tune system-specific stuff - reduced the build requirements (Pentium 4 was a bit too much) diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 1324d973c..22ea457eb 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -25,9 +25,6 @@ #include "pcre.h" -/// Returns the stack_data at the target index -#define script_getdata(st,i) &((st)->stack->stack_data[(st)->start+(i)]) - /** * Written by MouseJstr in a vision... (2/21/2005) * @@ -481,9 +478,9 @@ int mob_chat_sub(struct block_list *bl, va_list ap){ // Various script builtins used to support these functions int buildin_defpattern(struct script_state *st) { - int setid=conv_num(st, script_getdata(st,2)); - const char *pattern=conv_str(st, script_getdata(st,3)); - const char *label=conv_str(st, script_getdata(st,4)); + int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); + const char *pattern=conv_str(st,& (st->stack->stack_data[st->start+3])); + const char *label=conv_str(st,& (st->stack->stack_data[st->start+4])); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); npc_chat_def_pattern(nd, setid, pattern, label); @@ -492,23 +489,25 @@ int buildin_defpattern(struct script_state *st) { } int buildin_activatepset(struct script_state *st) { - int setid=conv_num(st, script_getdata(st,2)); + int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); activate_pcreset(nd, setid); return 0; } + int buildin_deactivatepset(struct script_state *st) { - int setid=conv_num(st, script_getdata(st,2)); + int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); deactivate_pcreset(nd, setid); return 0; } + int buildin_deletepset(struct script_state *st) { - int setid=conv_num(st, script_getdata(st,2)); + int setid=conv_num(st,& (st->stack->stack_data[st->start+2])); struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid); delete_pcreset(nd, setid); @@ -516,5 +515,4 @@ int buildin_deletepset(struct script_state *st) { return 0; } - #endif |