Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed ArrayGetCell() to return the cell value instead of byreferencing the value.

Browse Source
This commit is contained in:
Steve Dudenhoeffer 2007-07-26 16:22:29 +00:00
parent 9ce9b142e7
commit 83c82387e3
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amxmodx/datastructs.cpp
View File

@ -136,13 +136,14 @@ static cell AMX_NATIVE_CALL ArrayGetCell(AMX* amx, cell* params)
return 0; return 0;
} }
if (vec->GetCell(params[2],get_amxaddr(amx, params[3]))!=1) cell ret;
if (vec->GetCell(params[2],&ret)!=1)
{ {
LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size()); LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
return 0; return 0;
} }
return 1; return ret;
} }
// ArrayGetString(Array:which, item, any:output[], size); // ArrayGetString(Array:which, item, any:output[], size);
static cell AMX_NATIVE_CALL ArrayGetString(AMX* amx, cell* params) static cell AMX_NATIVE_CALL ArrayGetString(AMX* amx, cell* params)

14
plugins/include/cellarray.inc
View File

@ -19,14 +19,14 @@
* *
* @param cellsize How many cells each entry in the array is. * @param cellsize How many cells each entry in the array is.
* @param reserved How many blank entries are created immediately when the array is created. These entries are not valid to read from until called with ArraySet. * @param reserved How many blank entries are created immediately when the array is created. These entries are not valid to read from until called with ArraySet.
* @return Handle to the array. * @return Handle to the array.
*/ */
native Array:ArrayCreate(cellsize=1, reserved=32); native Array:ArrayCreate(cellsize=1, reserved=32);
/** /**
* Clears all entries from the array. * Clears all entries from the array.
* *
* @param which The array to clear. * @param which The array to clear.
* @return 1 on success, 0 on failure. * @return 1 on success, 0 on failure.
*/ */
native ArrayClear(Array:which); native ArrayClear(Array:which);
@ -34,7 +34,7 @@ native ArrayClear(Array:which);
/** /**
* Returns the number of elements in the array. * Returns the number of elements in the array.
* *
* @param which The array to check. * @param which The array to check.
* @return How many elements are in the array. * @return How many elements are in the array.
*/ */
native ArraySize(Array:which); native ArraySize(Array:which);
@ -43,7 +43,7 @@ native ArraySize(Array:which);
* Returns data within an array. * Returns data within an array.
* Make sure the output buffer matches the size the array was created with! * Make sure the output buffer matches the size the array was created with!
* *
* @param which The array to retrieve the item from. * @param which The array to retrieve the item from.
* @param item The item to retrieve (zero-based). * @param item The item to retrieve (zero-based).
* @param output The output buffer to write. * @param output The output buffer to write.
*/ */
@ -53,11 +53,11 @@ native ArrayGetArray(Array:which, item, any:output[]);
* Returns a single cell of data from an array. * Returns a single cell of data from an array.
* Use this only with arrays that were created with a cellsize of 1! * Use this only with arrays that were created with a cellsize of 1!
* *
* @param which The array to retrieve the item from. * @param which The array to retrieve the item from.
* @param item The item to retrieve (zero-based). * @param item The item to retrieve (zero-based).
* @param output The variable to store the value in. * @return The value of the cell.
*/ */
native ArrayGetCell(Array:which, item, &any:output); native any:ArrayGetCell(Array:which, item);
/** /**
* Returns a string value from an array. * Returns a string value from an array.