summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-06 16:53:09 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-06 16:53:09 +0000
commit1d006194c8ddf8a24a963680e30c48cc5aef78d1 (patch)
treeddbcdc3a06e77ad67c43b0f6a66af83cbee499a4
parent47b43b6ee744786ccdfba23f8a987a0401dbd468 (diff)
downloadhercules-1d006194c8ddf8a24a963680e30c48cc5aef78d1.tar.gz
hercules-1d006194c8ddf8a24a963680e30c48cc5aef78d1.tar.bz2
hercules-1d006194c8ddf8a24a963680e30c48cc5aef78d1.tar.xz
hercules-1d006194c8ddf8a24a963680e30c48cc5aef78d1.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10706 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/char/char.c4
-rw-r--r--src/char_sql/char.c4
-rw-r--r--src/common/db.h4
-rw-r--r--src/map/script.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 059c9c9d8..aa58db78c 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3134,8 +3134,8 @@ int parse_frommap(int fd)
default: size = 0; list = NULL; break;
}
- ARR_FIND(0, size, player_pos, list[player_pos].id == cid);
- ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);
+ 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);// where the player should be
if( player_pos == size && fame_pos == size )
;// not on list and not enough fame to get on it
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 8cea55230..1bd9681b3 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2833,8 +2833,8 @@ int parse_frommap(int fd)
default: size = 0; list = NULL; break;
}
- ARR_FIND(0, size, player_pos, list[player_pos].id == cid);
- ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);
+ 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);// where the player should be
if( player_pos == size && fame_pos == size )
;// not on list and not enough fame to get on it
diff --git a/src/common/db.h b/src/common/db.h
index 5c7d42d87..ec6539bc6 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -715,7 +715,7 @@ void linkdb_final ( struct linkdb_node** head );
///
///
/// @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 __type Type of entry
#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
///
/// @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 __type Type of entry
#define ARR_MOVERIGHT(__from, __to, __arr, __type) \
diff --git a/src/map/script.c b/src/map/script.c
index 2194ae1a6..2248b3019 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4382,7 +4382,7 @@ BUILDIN_FUNC(menu)
if( data_isstring(data) && data_isint(data) )
{// not a string (or compatible)
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;
return 1;
}
@@ -4393,7 +4393,7 @@ BUILDIN_FUNC(menu)
if( !data_islabel(data) )
{// not a label
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;
return 1;
}