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

- Improved a bit the menu entries counting code (using a while with strchr should yield better performance that a for done on the string's strlen, right? However, it bugs me that strchr's man-page says it won't work on multi-byte characters. But does a strchr(str,':') works any worse than (str[i]== ':')?

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9706 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-01-24 15:11:42 +00:00
parent 9342b7e4d5
commit f904054ce8
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/map/script.c
View File

@ -4371,8 +4371,8 @@ int buildin_close2(struct script_state *st)
*/ */
int buildin_menu(struct script_state *st) int buildin_menu(struct script_state *st)
{ {
char *buf; char *buf, *ptr;
int len,i, max = 1; int len,i;
struct map_session_data *sd = script_rid2sd(st); struct map_session_data *sd = script_rid2sd(st);
nullpo_retr(0, sd); nullpo_retr(0, sd);
@ -4399,11 +4399,11 @@ int buildin_menu(struct script_state *st)
strcat(buf,":"); strcat(buf,":");
} }
} }
for(i=0; (unsigned int)i < strlen(buf); i++){
if(buf[i] == ':') ptr = buf;
max++; sd->npc_menu = 0; //Reuse to store max menu entries. Avoids the need of an extra variable.
} while (ptr && (ptr = strchr(ptr, ':')) != NULL)
sd->npc_menu = max; //Reuse to store max menu entries. Avoids the need of an extra variable. { sd->npc_menu++; ptr++; }
clif_scriptmenu(sd,st->oid,buf); clif_scriptmenu(sd,st->oid,buf);
aFree(buf); aFree(buf);
} else if(sd->npc_menu==0xff){ // cancel } else if(sd->npc_menu==0xff){ // cancel
@ -10614,8 +10614,8 @@ int buildin_jump_zero(struct script_state *st) {
int buildin_select(struct script_state *st) int buildin_select(struct script_state *st)
{ {
char *buf; char *buf, *ptr;
int len,i,max = 1; int len,i;
struct map_session_data *sd; struct map_session_data *sd;
sd=script_rid2sd(st); sd=script_rid2sd(st);
@ -10633,11 +10633,12 @@ int buildin_select(struct script_state *st)
strcat(buf,st->stack->stack_data[i].u.str); strcat(buf,st->stack->stack_data[i].u.str);
strcat(buf,":"); strcat(buf,":");
} }
for(i=0; (unsigned int)i < strlen(buf); i++){
if(buf[i] == ':') ptr = buf;
max++; sd->npc_menu = 0; //Reuse to store max menu entries. Avoids the need of an extra variable.
} while (ptr && (ptr = strchr(ptr, ':')) != NULL)
sd->npc_menu = max; //Reuse to store max menu entries. Avoids the need of an extra variable. { sd->npc_menu++; ptr++; }
clif_scriptmenu(sd,st->oid,buf); clif_scriptmenu(sd,st->oid,buf);
aFree(buf); aFree(buf);
} else if(sd->npc_menu==0xff){ } else if(sd->npc_menu==0xff){
@ -10659,8 +10660,8 @@ int buildin_select(struct script_state *st)
int buildin_prompt(struct script_state *st) int buildin_prompt(struct script_state *st)
{ {
char *buf; char *buf, *ptr;
int len,i,max = 1; int len,i;
struct map_session_data *sd; struct map_session_data *sd;
sd=script_rid2sd(st); sd=script_rid2sd(st);
@ -10679,11 +10680,12 @@ int buildin_prompt(struct script_state *st)
strcat(buf,st->stack->stack_data[i].u.str); strcat(buf,st->stack->stack_data[i].u.str);
strcat(buf,":"); strcat(buf,":");
} }
for(i=0; (unsigned int)i < strlen(buf); i++){
if(buf[i] == ':') ptr = buf;
max++; sd->npc_menu = 0; //Reuse to store max menu entries. Avoids the need of an extra variable.
} while (ptr && (ptr = strchr(ptr, ':')) != NULL)
sd->npc_menu = max; //Reuse to store max menu entries. Avoids the need of an extra variable. { sd->npc_menu++; ptr++; }
clif_scriptmenu(sd,st->oid,buf); clif_scriptmenu(sd,st->oid,buf);
aFree(buf); aFree(buf);
} else { } else {