Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the npc_chat complication I committed yesterday

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10059 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage
2007-03-23 10:55:50 +00:00
parent dfd82cadb7
commit f4a864cfc4
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@@ -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)

18
src/map/npc_chat.c
View File

@@ -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