Просмотр исходного кода

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

FlavioJS 18 лет назад
Родитель
Сommit
3e13b73efe
4 измененных файлов с 8 добавлено и 8 удалено
  1. 2 2
      src/char/char.c
  2. 2 2
      src/char_sql/char.c
  3. 2 2
      src/common/db.h
  4. 2 2
      src/map/script.c

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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) \

+ 2 - 2
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;
 			}