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

* Added 'cancel' button parsing in buildin_select menu system. Now scripts will continue to load if 'cancel' is pressed and 255 will be returned.

Browse Source 
modified   Changelog-Trunk.txt
modified   notice.txt
modified   src/map/script.c


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9258 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-11-19 04:15:32 +00:00
parent 8457ae228c
commit 97919b1a6f
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/11/19
* Added 'cancel' button parsing in buildin_select menu system. Now scripts will continue
to load if 'cancel' is pressed and 255 will be returned. [Lance]
2006/11/17 2006/11/17
* Corrected use of the party invitation reply packet, thanks to FlavioJS. * Corrected use of the party invitation reply packet, thanks to FlavioJS.
[Skotlex] [Skotlex]

4
notice.txt
View File

@ -1,8 +1,8 @@
//Notice\\ //Notice\\
This branch, "Trunk", might not be stable due to bugs and whatsoever. This branch, "Trunk", might not be stable due to bugs and whatsoever.
It is highly recommended, if you have any dobts on using this svn version, It is highly recommended, if you have any doubts on using this svn version,
it is best if you use an eAthena Official Version or use RC5. it is best if you use an eAthena Official Version or use the Stable branch.
on another note, if you found a bug, it is best if you report it on the eAthena on another note, if you found a bug, it is best if you report it on the eAthena
forums as http://eathena.ws/ . If you have made yourself a fix for forums as http://eathena.ws/ . If you have made yourself a fix for

6
src/map/script.c
View File

@ -10298,16 +10298,18 @@ int buildin_select(struct script_state *st)
} }
clif_scriptmenu(script_rid2sd(st),st->oid,buf); clif_scriptmenu(script_rid2sd(st),st->oid,buf);
aFree(buf); aFree(buf);
} else if(sd->npc_menu==0xff){ // cansel } /*else if(sd->npc_menu==0xff){ // Cancel will be parsed since this is select() [Lance]
sd->state.menu_or_input=0; sd->state.menu_or_input=0;
st->state=END; st->state=END;
} else { }*/ else {
if(sd->npc_menu != 0xff){
//Skip empty menu entries which weren't displayed on the client (Skotlex) //Skip empty menu entries which weren't displayed on the client (Skotlex)
for(i=st->start+2;i< (st->start+2+sd->npc_menu) && sd->npc_menu < (st->end-st->start-2);i++) { for(i=st->start+2;i< (st->start+2+sd->npc_menu) && sd->npc_menu < (st->end-st->start-2);i++) {
conv_str(st,& (st->stack->stack_data[i])); // we should convert variables to strings before access it [jA1983] [EoE] conv_str(st,& (st->stack->stack_data[i])); // we should convert variables to strings before access it [jA1983] [EoE]
if((int)strlen(st->stack->stack_data[i].u.str) < 1) if((int)strlen(st->stack->stack_data[i].u.str) < 1)
sd->npc_menu++; //Empty selection which wasn't displayed on the client. sd->npc_menu++; //Empty selection which wasn't displayed on the client.
} }
}
pc_setreg(sd,add_str((unsigned char *) "@menu"),sd->npc_menu); pc_setreg(sd,add_str((unsigned char *) "@menu"),sd->npc_menu);
sd->state.menu_or_input=0; sd->state.menu_or_input=0;
push_val(st->stack,C_INT,sd->npc_menu); push_val(st->stack,C_INT,sd->npc_menu);