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

typo -> should be checkoption 1 and 2, not 2 and 3 ^^;

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@473 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
celest 2004-12-06 07:49:17 +00:00
parent fc01eec347
commit 1bacf847c0
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -1,7 +1,7 @@
Date Added Date Added
12/6 12/6
* Updated Chase Walk [celest] * Updated Chase Walk [celest]
* Added 'checkoption2' and 'checkoption3' script functions - Refer to * Added 'checkoption1' and 'checkoption2' script functions - Refer to
/npc/sample/npc_testchkoption.txt for similiar examples [celest] /npc/sample/npc_testchkoption.txt for similiar examples [celest]
12/5 12/5

13
src/map/script.c
View File

@ -289,9 +289,8 @@ int buildin_npcspeed(struct script_state *st); // [Valaris]
int buildin_npcwalkto(struct script_state *st); // [Valaris] int buildin_npcwalkto(struct script_state *st); // [Valaris]
int buildin_npcstop(struct script_state *st); // [Valaris] int buildin_npcstop(struct script_state *st); // [Valaris]
int buildin_getmapxy(struct script_state *st); //get map position for player/npc/pet/mob by Lorky [Lupus] int buildin_getmapxy(struct script_state *st); //get map position for player/npc/pet/mob by Lorky [Lupus]
int buildin_checkoption1(struct script_state *st); // [celest]
int buildin_checkoption2(struct script_state *st); // [celest] int buildin_checkoption2(struct script_state *st); // [celest]
int buildin_checkoption3(struct script_state *st); // [celest]
void push_val(struct script_stack *stack,int type,int val); void push_val(struct script_stack *stack,int type,int val);
int run_func(struct script_state *st); int run_func(struct script_state *st);
@ -501,8 +500,8 @@ struct {
{buildin_npcwalkto,"npcwalkto","ii"}, // [Valaris] {buildin_npcwalkto,"npcwalkto","ii"}, // [Valaris]
{buildin_npcstop,"npcstop",""}, // [Valaris] {buildin_npcstop,"npcstop",""}, // [Valaris]
{buildin_getmapxy,"getmapxy","siii*"}, //by Lorky [Lupus] {buildin_getmapxy,"getmapxy","siii*"}, //by Lorky [Lupus]
{buildin_checkoption1,"checkoption1","i"},
{buildin_checkoption2,"checkoption2","i"}, {buildin_checkoption2,"checkoption2","i"},
{buildin_checkoption3,"checkoption3","i"},
{NULL,NULL,NULL}, {NULL,NULL,NULL},
}; };
int buildin_message(struct script_state *st); // [MouseJstr] int buildin_message(struct script_state *st); // [MouseJstr]
@ -3307,7 +3306,7 @@ int buildin_checkoption(struct script_state *st)
* *
*------------------------------------------ *------------------------------------------
*/ */
int buildin_checkoption2(struct script_state *st) int buildin_checkoption1(struct script_state *st)
{ {
int type; int type;
struct map_session_data *sd; struct map_session_data *sd;
@ -3315,7 +3314,7 @@ int buildin_checkoption2(struct script_state *st)
type=conv_num(st,& (st->stack->stack_data[st->start+2])); type=conv_num(st,& (st->stack->stack_data[st->start+2]));
sd=script_rid2sd(st); sd=script_rid2sd(st);
if(sd->opt2 & type){ if(sd->opt1 & type){
push_val(st->stack,C_INT,1); push_val(st->stack,C_INT,1);
} else { } else {
push_val(st->stack,C_INT,0); push_val(st->stack,C_INT,0);
@ -3327,7 +3326,7 @@ int buildin_checkoption2(struct script_state *st)
* *
*------------------------------------------ *------------------------------------------
*/ */
int buildin_checkoption3(struct script_state *st) int buildin_checkoption2(struct script_state *st)
{ {
int type; int type;
struct map_session_data *sd; struct map_session_data *sd;
@ -3335,7 +3334,7 @@ int buildin_checkoption3(struct script_state *st)
type=conv_num(st,& (st->stack->stack_data[st->start+2])); type=conv_num(st,& (st->stack->stack_data[st->start+2]));
sd=script_rid2sd(st); sd=script_rid2sd(st);
if(sd->opt3 & type){ if(sd->opt2 & type){
push_val(st->stack,C_INT,1); push_val(st->stack,C_INT,1);
} else { } else {
push_val(st->stack,C_INT,0); push_val(st->stack,C_INT,0);