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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10706 54d463be-8e91-2dee-dedb-b68131a5f0ec

Browse Source
This commit is contained in:
FlavioJS 2007-06-06 16:53:09 +00:00
parent 93d662ce87
commit 3e13b73efe
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/char/char.c
View File

@ -3134,8 +3134,8 @@ int parse_frommap(int fd)
default: size = 0; list = NULL; break; default: size = 0; list = NULL; break;
} }
ARR_FIND(0, size, player_pos, list[player_pos].id == cid); ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame); ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
if( player_pos == size && fame_pos == size ) if( player_pos == size && fame_pos == size )
;// not on list and not enough fame to get on it ;// not on list and not enough fame to get on it

4
src/char_sql/char.c
View File

@ -2833,8 +2833,8 @@ int parse_frommap(int fd)
default: size = 0; list = NULL; break; default: size = 0; list = NULL; break;
} }
ARR_FIND(0, size, player_pos, list[player_pos].id == cid); ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame); ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
if( player_pos == size && fame_pos == size ) if( player_pos == size && fame_pos == size )
;// not on list and not enough fame to get on it ;// not on list and not enough fame to get on it

4
src/common/db.h
View File

@ -715,7 +715,7 @@ void linkdb_final ( struct linkdb_node** head );
/// ///
/// ///
/// @param __from Initial index of the entry /// @param __from Initial index of the entry
/// @param __end Target index of the entry /// @param __to Target index of the entry
/// @param __arr Array /// @param __arr Array
/// @param __type Type of entry /// @param __type Type of entry
#define ARR_MOVE(__from, __to, __arr, __type) \ #define ARR_MOVE(__from, __to, __arr, __type) \
@ -738,7 +738,7 @@ void linkdb_final ( struct linkdb_node** head );
/// ex: ARR_MOVERIGHT(1, 4, list, int);// move index 1 to index 4 /// ex: ARR_MOVERIGHT(1, 4, list, int);// move index 1 to index 4
/// ///
/// @param __from Initial index of the entry /// @param __from Initial index of the entry
/// @param __end Target index of the entry /// @param __to Target index of the entry
/// @param __arr Array /// @param __arr Array
/// @param __type Type of entry /// @param __type Type of entry
#define ARR_MOVERIGHT(__from, __to, __arr, __type) \ #define ARR_MOVERIGHT(__from, __to, __arr, __type) \

4
src/map/script.c
View File

@ -4382,7 +4382,7 @@ BUILDIN_FUNC(menu)
if( data_isstring(data) && data_isint(data) ) if( data_isstring(data) && data_isint(data) )
{// not a string (or compatible) {// not a string (or compatible)
StringBuf_Free(buf); StringBuf_Free(buf);
ShowError("script:menu: argument #%d (from 1) is not a string or compatible.\n", (i - 1)); ShowError("script:menu: argument #%d (from 1) is not a string or compatible (op=%s).\n", (i - 1), script_op2name(data->type));
st->state = END; st->state = END;
return 1; return 1;
} }
@ -4393,7 +4393,7 @@ BUILDIN_FUNC(menu)
if( !data_islabel(data) ) if( !data_islabel(data) )
{// not a label {// not a label
StringBuf_Free(buf); StringBuf_Free(buf);
ShowError("script:menu: label argument of menu option #%d (from 1) is not a label.\n", (script_lastdata(st) - 1)); ShowError("script:menu: argument #%d (from 1) is not a label or label not found (op=%s).\n", i, script_op2name(data->type));
st->state = END; st->state = END;
return 1; return 1;
} }