diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-06 07:49:17 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-06 07:49:17 +0000 |
| commit | 34c5fb016f35aa69aa5de058162ced688cecd3eb (patch) | |
| tree | 89531b902a1e87bcc177d79750042c720f0fb0ca | |
| parent | 759691f121b3af537b04a10267bada2aa8655e9c (diff) | |
| download | hercules-34c5fb016f35aa69aa5de058162ced688cecd3eb.tar.gz hercules-34c5fb016f35aa69aa5de058162ced688cecd3eb.tar.bz2 hercules-34c5fb016f35aa69aa5de058162ced688cecd3eb.tar.xz hercules-34c5fb016f35aa69aa5de058162ced688cecd3eb.zip | |
typo -> should be checkoption 1 and 2, not 2 and 3 ^^;
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@473 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Changelog.txt b/Changelog.txt index 00233f8f4..d80598abf 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,7 +1,7 @@ Date Added 12/6 * 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] 12/5 diff --git a/src/map/script.c b/src/map/script.c index 6a6b0c932..7e8fe020a 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -289,9 +289,8 @@ int buildin_npcspeed(struct script_state *st); // [Valaris] int buildin_npcwalkto(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_checkoption1(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); int run_func(struct script_state *st); @@ -501,8 +500,8 @@ struct { {buildin_npcwalkto,"npcwalkto","ii"}, // [Valaris] {buildin_npcstop,"npcstop",""}, // [Valaris] {buildin_getmapxy,"getmapxy","siii*"}, //by Lorky [Lupus] - {buildin_checkoption2,"checkoption2","i"}, - {buildin_checkoption3,"checkoption3","i"}, + {buildin_checkoption1,"checkoption1","i"}, + {buildin_checkoption2,"checkoption2","i"}, {NULL,NULL,NULL}, }; 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; 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])); sd=script_rid2sd(st); - if(sd->opt2 & type){ + if(sd->opt1 & type){ push_val(st->stack,C_INT,1); } else { 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; 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])); sd=script_rid2sd(st); - if(sd->opt3 & type){ + if(sd->opt2 & type){ push_val(st->stack,C_INT,1); } else { push_val(st->stack,C_INT,0); |