View difference between Paste ID: Seseuh2x and WJfsVYer

 /*----------------------------------------------------------------------------*\
-					===========================
+                    ===========================
-					 foreach efficient looping
+                     foreach efficient looping
-					===========================
+                    ===========================
 Description:
-	Provides efficient looping through sparse data sets, such as connected
+    Provides efficient looping through sparse data sets, such as connected
-	players.  Significantly improved from the original version to be a generic
+    players.  Significantly improved from the original version to be a generic
-	loop system, rather then purely a player loop system.  When used for
+    loop system, rather then purely a player loop system.  When used for
-	players this has constant time O(n) for number of connected players (n),
+    players this has constant time O(n) for number of connected players (n),
-	unlike standard player loops which are O(MAX_PLAYERS), regardless of the
+    unlike standard player loops which are O(MAX_PLAYERS), regardless of the
-	actual number of connected players.  Even when n is MAX_PLAYERS this is
+    actual number of connected players.  Even when n is MAX_PLAYERS this is
-	still faster.
+    still faster.
 Legal:
-	Version: MPL 1.1
+    Version: MPL 1.1
-
+
-	The contents of this file are subject to the Mozilla Public License Version
+    The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
+    1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
+    the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
+    [url]http://www.mozilla.org/MPL/[/url]
-
+
-	Software distributed under the License is distributed on an "AS IS" basis,
+    Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
+    for the specific language governing rights and limitations under the
-	License.
+    License.
-
+
-	The Original Code is the YSI foreach include.
+    The Original Code is the YSI foreach include.
-
+
-	The Initial Developer of the Original Code is Alex "Y_Less" Cole.
+    The Initial Developer of the Original Code is Alex "Y_Less" Cole.
-	Portions created by the Initial Developer are Copyright (C) 2011
+    Portions created by the Initial Developer are Copyright (C) 2011
-	the Initial Developer. All Rights Reserved.
+    the Initial Developer. All Rights Reserved.
-
+
-	Contributors:
+    Contributors:
-		ZeeX, koolk, JoeBullet/Google63, g_aSlice/Slice
+        ZeeX, koolk, JoeBullet/Google63, g_aSlice/Slice
-
+
-	Thanks:
+    Thanks:
-		JoeBullet/Google63 - Handy arbitrary ASM jump code using SCTRL.
+        JoeBullet/Google63 - Handy arbitrary ASM jump code using SCTRL.
-		ZeeX - Very productive conversations.
+        ZeeX - Very productive conversations.
-		koolk - IsPlayerinAreaEx code.
+        koolk - IsPlayerinAreaEx code.
-		TheAlpha - Danish translation.
+        TheAlpha - Danish translation.
-		breadfish - German translation.
+        breadfish - German translation.
-		Fireburn - Dutch translation.
+        Fireburn - Dutch translation.
-		yom - French translation.
+        yom - French translation.
-		50p - Polish translation.
+        50p - Polish translation.
-		Zamaroht - Spanish translation.
+        Zamaroht - Spanish translation.
-		Dracoblue, sintax, mabako, Xtreme, other coders - Producing other modes
+        Dracoblue, sintax, mabako, Xtreme, other coders - Producing other modes
-			for me to strive to better.
+            for me to strive to better.
-		Pixels^ - Running XScripters where the idea was born.
+        Pixels^ - Running XScripters where the idea was born.
-		Matite - Pestering me to release it and using it.
+        Matite - Pestering me to release it and using it.
-
+
-	Very special thanks to:
+    Very special thanks to:
-		Thiadmer - PAWN, whose limits continue to amaze me!
+        Thiadmer - PAWN, whose limits continue to amaze me!
-		Kye/Kalcor - SA:MP.
+        Kye/Kalcor - SA:MP.
-		SA:MP Team past, present and future - SA:MP.
+        SA:MP Team past, present and future - SA:MP.
-
+
 Version:
-	0.4
+    0.4
 Changelog:
-	05/01/12:
+    17/10/12:
-		Fixed multi-dimensional iterators.
+        Fixed a bug that was here but not in "foreach.inc".
-		Fixed "FOREACH_NO_BOTS".
+    04/10/12:
-		Made "Iterator:" support multi-dimensional arrays.
+        Added a tiny tweak to detect tag-returning iterator functions.
-	07/12/11:
+        Added Iter_InternalSize.
-		Underlying implementation tweak for more consistent code.
+    13/01/12:
-		Added Iter_Contains.
+        Fixed the count thanks to AndreT.
-	06/12/11:
+    05/01/12:
-		Minor fixes.
+        Fixed multi-dimensional iterators.
-	31/10/11:
+        Fixed "FOREACH_NO_BOTS".
-		Changed the underlying loop code to be slightly faster.
+        Made "Iterator:" support multi-dimensional arrays.
-		Added support for Iter_SafeRemove, prompting refactoring.
+    24/12/11:
-	17/09/11:
+        Added _YSI_SPECIAL_DEBUG support.
-		Fixed arrays under the new syntax.
+        Added fix for function iterators.
-	28/04/11:
+        Ported back to YSI.
-		Moved iterator identifiers to end of variables.
+        Changed to use internal YSI "__" natives.
-		Rewrote "foreach" to accept two syntaxes for "foreach (new i : Iter)".
+        Fixed calls order by using ALS.
-	16/08/10:
+    31/10/11:
-		Removed all the "2" versions of the functions.
+        Changed the underlying loop code to be slightly faster.
-	14/08/10:
+        Added support for Iter_SafeRemove, prompting refactoring.
-		Added Iter_Clear to reset an array.
+    17/09/11:
-	06/08/10:
+        Fixed arrays under the new syntax.
-		Added special array declaration format.
+    28/04/11:
-	18/12/09:
+        Moved iterator identifiers to end of variables.
-		Added Itter_Func2 functions for multi-dimensional iterators.
+        Rewrote "foreach" to accept two syntaxes for "foreach (new i : Iter)".
-		Renamed foreact et al as keywords in the documentation.
+    16/08/10:
-		Changed licensing from GPL to MPL.
+        Removed all the "2" versions of the functions.
-	02/09/09:
+    14/08/10:
-		Fixed (again) for 0.3.
+        Added Iter_Clear to reset an array.
-		Added free slot finding.
+    06/08/10:
-	21/08/09:
+        Added special array declaration format.
-		Updated to include random functions.
+    18/12/09:
-		Made entirely stand alone.
+        Added Itter_Func2 functions for multi-dimensional iterators.
-		Ported to 0.3 (separate version).
+        Renamed foreact et al as keywords in the documentation.
-		Added automatic callback hook code.
+        Changed licensing from GPL to MPL.
-		Removed debug information from stand alone version.
+    02/09/09:
-	06/01/08:
+        Fixed (again) for 0.3.
-		Added debug information.
+        Added free slot finding.
-	09/10/07:
+    21/08/09:
-		Moved to system.
+        Updated to include random functions.
-	16/09/07:
+        Made entirely stand alone.
-		Added list sorting.
+        Ported to 0.3 (separate version).
-		Made this part of Y SeRver Includes, not Y Sever Includes.
+        Added automatic callback hook code.
-		Made list sorting optional.
+        Removed debug information from stand alone version.
-		Fixed version number.
+    06/01/08:
-	08/09/07:
+        Added debug information.
-		First version.
+    09/10/07:
         Moved to system.
-	Public:
+    16/09/07:
-		OnPlayerDisconnect - Called when a player leaves to remove them.
+        Added list sorting.
-		OnPlayerConnect - Called when a player connects to add them.
+        Made this part of Y SeRver Includes, not Y Sever Includes.
-	Core:
+        Made list sorting optional.
-		-
+        Fixed version number.
-	Stock:
+    08/09/07:
-		Itter_ShowArray - Displays the contents of the array.
+        First version.
-		Itter_AddInternal - Add a value to an itterator.
+
-		Itter_RemoveInternal - Remove a value from an itterator.
+    Public:
-		Itter_RandomInternal - Get a random item from an itterator.
+        OnPlayerDisconnect - Called when a player leaves to remove them.
-		Itter_FreeInternal - Gets the first free slot in the itterator.
+        OnPlayerConnect - Called when a player connects to add them.
-		Itter_InitInternal - Initialises a multi-dimensional itterator.
+    Core:
-		Itter_ContainsInternal - Checks if a value is in an iterator.
+        -
-	Static:
+    Stock:
-		-
+        Itter_ShowArray - Displays the contents of the array.
-	Inline:
+        Itter_AddInternal - Add a value to an itterator.
-		Itter_Create - Create a new itterator value set.
+        Itter_RemoveInternal - Remove a value from an itterator.
-		Itter_Add - Wraps Itter_AddInternal.
+        Itter_RandomInternal - Get a random item from an itterator.
-		Itter_SafeRemove - Wraps Itter_SafeRemoveInternal.
+        Itter_FreeInternal - Gets the first free slot in the itterator.
-		Itter_Remove - Wraps Itter_RemoveInternal.
+        Itter_InitInternal - Initialises a multi-dimensional itterator.
-		Itter_Random - Wraps Itter_RandomInternal.
+    Static:
-		Itter_Count - Gets the number of items in an itterator.
+        -
-		Itter_Debug - Wraps around Itter_ShowArray.
+    Inline:
-		Itter_Free - Wraps around Itter_FreeInternal.
+        Itter_Create - Create a new itterator value set.
-		Itter_Contains - Wraps around Itter_ContainsInternal.
+        Itter_Add - Wraps Itter_AddInternal.
-	API:
+        Itter_Remove - Wraps Itter_RemoveInternal.
-		-
+        Itter_Random - Wraps Itter_RandomInternal.
         Itter_Count - Gets the number of items in an itterator.
-	-
+        Itter_Debug - Wraps around Itter_ShowArray.
         Itter_Free - Wraps around Itter_FreeInternal.
-	Itter_OnPlayerConnect - Hook for the OnPlayerConnect callback.
+        Itter_Create2 - Create a new itterator array value set.
-	Itter_OnPlayerDisconnect - Hook for the OnPlayerDisconnect callback.
+        Itter_Add2 - Wraps Itter_AddInternal for arrays.
-	Itter_OnGameModeInit - Only exists to make the code compile correctly...
+        Itter_Remove2 - Wraps Itter_RemoveInternal for arrays.
         Itter_Random2 - Wraps Itter_RandomInternal for arrays.
-	-
+        Itter_Count2 - Gets the number of items in an itterator array.
         Itter_Debug2 - Wraps around Itter_ShowArray for arrays.
-	-
+        Itter_Free2 - Wraps around Itter_FreeInternal for arrays.
     API:
-	-
+        -
 Callbacks:
-	foreach - Command to loop an iterator.
+    -
-	foreachex - Like foreach but without a new variable.
+
-	foreach2 - Command to loop through an iterator array.
+    Itter_OnPlayerConnect - Hook for the OnPlayerConnect callback.
-	foreachex - Like foreach2 but without a new variable.
+    Itter_OnPlayerDisconnect - Hook for the OnPlayerDisconnect callback.
     Itter_OnGameModeInit - Only exists to make the code compile correctly...
-	Iterator - Declare an iterator.
+
     -
-	Global:
+
-		-
+    -
-	Static:
+
-		YSI_g_OPC - Records wether Itter_OnPlayerConnect exists for speed.
+    -
-		YSI_g_OPDC - Records wether Itter_OnPlayerDisconnect exists for speed.
+
     foreach - Command to loop an iterator.
-	-
+    foreachex - Like foreach but without a new variable.
     foreach2 - Command to loop through an iterator array.
-	YSI_ITTER_NO_SORT - Removed.
+    foreachex - Like foreach2 but without a new variable.
-	FOREACH_NO_BOTS - Remove the bot iterators for smaller code.
+
-	FOREACH_NO_PLAYERS - Remove all default code for player itteration.
+    Iterator - Declare an iterator.
 Variables:
-	-
+    Global:
         -
-	Player - List of all players connected.
+    Static:
-	Bot - List of all bots (npcs) connected.
+        YSI_g_OPC - Records wether Itter_OnPlayerConnect exists for speed.
-	NPC - Alias of Bot.
+        YSI_g_OPDC - Records wether Itter_OnPlayerDisconnect exists for speed.
-	Character - All players and bots.
+
     -
 Compile options:
-#define _FOREACH_LOCAL_VERSION        13
+    YSI_ITTER_NO_SORT - Removed.
     FOREACH_NO_BOTS - Remove the bot iterators for smaller code.
     FOREACH_NO_PLAYERS - Remove all default code for player itteration.
 Operators:
-	#define _FOREACH_CUR_VERSION _FOREACH_LOCAL_VERSION
+    -
-	#endinput
+
     Player - List of all players connected.
     Bot - List of all bots (npcs) connected.
-	#define _FOREACH_INC_TEST
+    NPC - Alias of Bot.
-	#tryinclude <YSI\y_iterate>
+    Character - All players and bots.
-	#undef _FOREACH_INC_TEST
+
-	// <foreach> exists - test which is newer.
+
-	#if defined _inc_y_iterate
+// "y_iterate" is always higher than "foreach".
-		#if _FOREACH_CUR_VERSION > _FOREACH_LOCAL_VERSION
+#define _FOREACH_LOCAL_VERSION        19
-			// Foreach is newer.
+
-			#undef _inc_y_iterate
+
-			#define _FOREACH_NO_TEST
+
-			#include <YSI\y_iterate>
+    #define _FOREACH_CUR_VERSION _FOREACH_LOCAL_VERSION
-			#endinput
+    #endinput
-		#endif
+
-	#endif
+
     #define _FOREACH_INC_TEST
     #tryinclude <YSI\y_iterate>
     #undef _FOREACH_INC_TEST
-	#error "Please include a_samp or a_npc before foreach"
+    // <foreach> exists - test which is newer.
     #if defined _inc_y_iterate
         #if !defined _FOREACH_CUR_VERSION
-//#include <YSI\y_debug>
+            // Foreach exists, but it's an old version - don't try use this
-//#include <YSI\y_hooks>
+            // system or the variables will conflict.
             #error "Old foreach.inc files are no longer compatible with YSI."
             #endinput
-	#define BOTSYNC_IS_BOT     (true)
+        #endif
         #if _FOREACH_CUR_VERSION > _FOREACH_LOCAL_VERSION
             // Foreach is newer.
             #undef _inc_y_iterate
-	#define _FOREACH_BOT
+            #define _FOREACH_NO_TEST
             #include <YSI\y_iterate>
             #endinput
         #endif
-	#error YSI_ITTER_NO_SORT is no longer supported by foreach.
+    #endif
 #endif
 
 #if !defined _samp_included
     #error "Please include a_samp or a_npc before foreach"
 #endif
 
 #if defined _YSI_SPECIAL_DEBUG
-#define _Y_ITER_C2:sizeof%0(%1)@YSII_Ag-1;_:(%2=_Y_ITER_ARRAY:%3(%4)@YSII_Ag[%5])!=_Y_ITER_ARRAY_SIZE(%6);) -1;_:(%2=%3@YSII_Ag(%4,%5))!=-1;)
+    #define PS_IS_PLAYER_CONNECTED(%0) (%0 != INVALID_PLAYER_ID)
 #else
     #define PS_IS_PLAYER_CONNECTED IsPlayerConnected
 #endif
 
-	static stock
+//#include "y_debug"
-		YSI_g_sCallbacks = 0;
+//#include "y_hooks"
 
 #include <YSI\internal\y_natives>
 #include <YSI\y_debug>
 
-	Itter_Create2
+
     #define BOTSYNC_IS_BOT     (true)
-	name - Itterator identifier.
+
-	size0 - Number of iterators.
+
-	size1 - Number of items per iterator.
+
     #define _FOREACH_BOT
-	-
+
 
-	Creates a new array of itterator start/array pair.
+
     #error YSI_ITTER_NO_SORT is no longer supported by foreach.
 #endif
 
 #define _Y_ITER_ARRAY: _:_Y_ITER_C0:
 #define _Y_ITER_ARRAY_SIZE(%1) _:_Y_ITER_C1:_Y_ITER_C2:sizeof %1@YSII_Ag-1
-	new \
+
-		%1@YSII_Sg[%2] = {-1, ...}, \
+
-		%1@YSII_Cg[%2] = {0}, \
+
-		%1@YSII_Ag[%2][%3]*/
+#define _Y_ITER_C2:sizeof%0(%1)@YSII_Ag-1;_:(%2=_Y_ITER_ARRAY:%3(%4)@YSII_Ag[%5])!=%9_Y_ITER_ARRAY_SIZE(%6);) -1;_:(%2=%3@YSII_Ag(%4,%5))!=-1;)
 
 #define _Y_ITER_C3:%0[%1]@YSII_Cg,%2[%3]@YSII_Ag[%4]={%5} _Y_ITER_C3:%0@YSII_Cg[%4-1],%0@YSII_Ag[%1][%4]
 
 #if !defined BOTSYNC_IS_BOT
     static stock
-	Iterator
+        YSI_g_sCallbacks = 0;
 #endif
-	Creates a new itterator start/array pair.
+
 #if !defined BOTSYNC_IS_BOT
     forward Itter_OPDCInternal(playerid);
 #endif
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Create2
-	Itter_Init2
+
     name - Itterator identifier.
-	itter - Name of the itterator array to initialise.
+    size0 - Number of iterators.
     size1 - Number of items per iterator.
-	-
+
     -
-	Wrapper for Itter_InitInternal.
+
     Creates a new array of itterator start/array pair.
 \*----------------------------------------------------------------------------*/
 
 // If this ever changes, update the size reference in y_users.
 /*#define Iter_Create2 Itter_Create2
 #define Itter_Create2(%1,%2,%3) \
     new \
-	Itter_InitInternal(%1@YSII_Ag,sizeof %1@YSII_Ag,sizeof %1@YSII_Ag[])
+        %1@YSII_Sg[%2] = {-1, ...}, \
         %1@YSII_Cg[%2] = {0}, \
         %1@YSII_Ag[%2][%3]*/
 
-	Itter_Create
+
 
-	name - Itterator identifier.
+
-	size - Number of values.
+
     Iterator
-	-
+
     Creates a new itterator start/array pair.
-	Creates a new itterator start/array pair.
+
 
 #define Iterator:%1<%2> _Y_ITER_C3:%1@YSII_Cg,%1@YSII_Ag[(%2)+1]={(%2)*2,(%2)*2-1,...}
 #define iterator%0<%1> Iterator:%0<%1>
 
 /*----------------------------------------------------------------------------*\
-	new \
+
-		%1@YSII_Sg = -1, \
+    Itter_Init2
-		%1@YSII_Cg = 0, \
+
-		%1@YSII_Ag[%2] = {-1, ...}*/
+    itter - Name of the itterator array to initialise.
 Return:
     -
 Notes:
-	Itter_Add
+    Wrapper for Itter_InitInternal.
 
-	itter - Name of the itterator to add the data to.
+
-	value - Value to add to the itterator.
+
 \*----------------------------------------------------------------------------*/
-	-
+
 #define Iter_Init Itter_Init
-	Wrapper for Itter_AddInternal.
+
     Itter_InitInternal(%1@YSII_Ag,sizeof %1@YSII_Ag,sizeof %1@YSII_Ag[]-1)
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Create
 Params:
     name - Itterator identifier.
     size - Number of values.
 Return:
     -
-	Itter_AddSafeInternal(%1@YSII_Sg, %1@YSII_Cg, %1@YSII_Ag, %1@YSII_Rg, %2)*/
+
     Creates a new itterator start/array pair.
 \*----------------------------------------------------------------------------*/
 
-	Itter_Free
+
 /*#define Iter_Create Itter_Create
-	itter - Name of the itterator to get the first free slot in.
+
     new \
-	-
+        %1@YSII_Sg = -1, \
         %1@YSII_Cg = 0, \
-	Wrapper for Itter_FreeInternal.
+        %1@YSII_Ag[%2] = {-1, ...}*/
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Add
 Params:
     itter - Name of the itterator to add the data to.
     value - Value to add to the itterator.
 Return:
     -
 Notes:
-	Itter_Remove
+    Wrapper for Itter_AddInternal.
 
-	itter - Name of the itterator to remove data from.
+
-	value - Data to remove.
+
 \*----------------------------------------------------------------------------*/
-	-
+
 #define Iter_Add Itter_Add
-	Wrapper for Itter_RemoveInternal.
+
 
 /*#define Iter_AddSafe Itter_AddSafe
 #define Itter_AddSafe(%1,%2) \
     Itter_AddSafeInternal(%1@YSII_Sg, %1@YSII_Cg, %1@YSII_Ag, %1@YSII_Rg, %2)*/
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Free
 Params:
     itter - Name of the itterator to get the first free slot in.
-	Itter_Contains
+
     -
-	itter - Name of the itterator to check membership of.
+
-	value - Value to check.
+    Wrapper for Itter_FreeInternal.
 
-	-
+
 
-	Checks if the given value is in the given iterator.
+
 
 #define Iter_Free Itter_Free
 #define Itter_Free(%1) Itter_FreeInternal(_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Remove
 Params:
     itter - Name of the itterator to remove data from.
     value - Data to remove.
-	Itter_SafeRemove
+
     -
-	itter - Name of the itterator to remove data from.
+
-	value - Data to remove.
+    Wrapper for Itter_RemoveInternal.
-	next - Container for the pointer to the next element.
+
 native Iter_Remove(Iterator:Name<>, value);
-	-
+
 \*----------------------------------------------------------------------------*/
-	Wrapper for Itter_SafeRemoveInternal.  Common use:
+
-
+
-	Iter_SafeRemove(iter, i, i);
+
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Contains
 Params:
     itter - Name of the itterator to check membership of.
     value - Value to check.
 Return:
     -
 Notes:
-	Itter_Random
+    Checks if the given value is in the given iterator.
 
-	itter - Name of the itterator to get a random slot from.
+
 
-	-
+
 
-	Wrapper for Itter_RandomInternal.
+
 #define Itter_Contains(%1,%2) Itter_ContainsInternal(_Y_ITER_ARRAY:%1@YSII_Ag,%2,_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_SafeRemove
 Params:
     itter - Name of the itterator to remove data from.
     value - Data to remove.
     next - Container for the pointer to the next element.
 Return:
-	Itter_Debug
+    -
 Notes:
-	itter - Name of the itterator to output debug information from.
+    Wrapper for Itter_SafeRemoveInternal.  Common use:
 
-	-
+    Iter_SafeRemove(iter, i, i);
 
-	Wrapper for Itter_ShowArray.
+
 
 \*----------------------------------------------------------------------------*/
 
 #define Iter_SafeRemove Itter_SafeRemove
 #define Itter_SafeRemove(%1,%2,%3) Itter_SafeRemoveInternal(_Y_ITER_ARRAY:%1@YSII_Cg,_Y_ITER_ARRAY:%1@YSII_Ag,%2,%3,_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
-	Itter_Count
+
     Itter_Random
-	itter - Name of the itterator to get a random slot from4.
+
     itter - Name of the itterator to get a random slot from.
-	-
+
     -
-	Returns the number of items in this itterator.
+
     Wrapper for Itter_RandomInternal.
 
 native Iter_Random(Iterator:Name<>);
 
 \*----------------------------------------------------------------------------*/
 
 #define Iter_Random Itter_Random
 #define Itter_Random(%1) Itter_RandomInternal(_Y_ITER_ARRAY:%1@YSII_Cg,_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
-	Itter_Clear
+
     Itter_Debug
-	itter - Name of the itterator empty.
+
     itter - Name of the itterator to output debug information from.
-	-
+
     -
-	Wrapper for Itter_ClearInternal.
+
     Wrapper for Itter_ShowArray.
 \*----------------------------------------------------------------------------*/
 
 //#define Iter_Debug Itter_Debug
 //#define Itter_Debug(%1) Itter_ShowArray(_Y_ITER_ARRAY:%1@YSII_Cg,_Y_ITER_ARRAY:%1@YSII_Ag)
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_Count
 Params:
     itter - Name of the itterator to get a random slot from4.
 Return:
     -
-	new
+
-		Iterator:Player<MAX_PLAYERS>;
+    Returns the number of items in this itterator.
-
+
-	#if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
+
-		new
+
-			Iterator:Bot<MAX_PLAYERS>,
+
-			Iterator:Character<MAX_PLAYERS>;
+
-
+
-		//#define NPC@YSII_Sg Bot@YSII_Sg
+
-		#define NPC@YSII_Cg Bot@YSII_Cg
+
-		#define NPC@YSII_Ag Bot@YSII_Ag
+
-		//#define NPC@YSII_Eg Bot@YSII_Eg
+
-		//#define NPC@YSII_Rg Bot@YSII_Rg
+    Itter_Clear
-	#endif
+
     itter - Name of the itterator empty.
 Return:
     -
 Notes:
-	foreach
+    Wrapper for Itter_ClearInternal.
 
-	data - Data to itterate through.
+
-	as - Variable to set value to.
+
 \*----------------------------------------------------------------------------*/
-	-
+
 #define Iter_Clear Itter_Clear
-	Not exactly the same as PHP foreach, just itterates through a list and
+
-	returns the value of the current slot but uses that slot as the next index
+
-	too.  Variables must be in the form @YSII_<gname>S for the start index and
+
-	@YSII_<gname>A for the data array where <name> is what's entered in data.
+
 \*----------------------------------------------------------------------------*/
 
 #if !defined BOTSYNC_IS_BOT
-//	for (new %2 = %1@YSII_Sg; _:%2 != -1; %2 = %1@YSII_Ag[%2])
+    new
         Iterator:Player<MAX_PLAYERS>;
 
     #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
         new
             Iterator:Bot<MAX_PLAYERS>,
             Iterator:Character<MAX_PLAYERS>;
 
         //#define NPC@YSII_Sg Bot@YSII_Sg
         #define NPC@YSII_Cg Bot@YSII_Cg
         #define NPC@YSII_Ag Bot@YSII_Ag
         //#define NPC@YSII_Eg Bot@YSII_Eg
         //#define NPC@YSII_Rg Bot@YSII_Rg
     #endif
 #endif
-#define Y_FOREACH_SEVENTH|||%9Y_FOREACH_SIXTH;%0|||%1|||%2||| new %0:%1=%0:_Y_ITER_ARRAY_SIZE(%2);_:(%1=_Y_ITER_ARRAY:%2@YSII_Ag[%1])!=_Y_ITER_ARRAY_SIZE(%2);
+
 /*----------------------------------------------------------------------------*\
     Variables to optimise memory usage by only having one copy of each string.
     Note that only strings used more than once are put here because only they
     have any gain to being located in only one place.
 \*----------------------------------------------------------------------------*/
 
 static stock
     YSI_gsOnPlayerConnect[] = "Itter_OnPlayerConnect",
     YSI_gsOnPlayerDisconnect[] = "Itter_OnPlayerDisconnect",
     YSI_gsOnGameModeInit[] = "Itter_OnGameModeInit",
     YSI_gsSpecifier@i[] = "i",
     YSI_gsSpecifier@[] = "";
 
 /*----------------------------------------------------------------------------*\
 Function:
     foreach
 Params:
     data - Data to itterate through.
     as - Variable to set value to.
 Return:
     -
 Notes:
-	foreachex
+    Not exactly the same as PHP foreach, just itterates through a list and
     returns the value of the current slot but uses that slot as the next index
-	data - Data to itterate through.
+    too.  Variables must be in the form @YSII_<gname>S for the start index and
-	as - Variable to set value to.
+    @YSII_<gname>A for the data array where <name> is what's entered in data.
 \*----------------------------------------------------------------------------*/
-	-
+
 //#define foreach(%1,%2)
-	Similar to foreach but doesn't declare a new variable for the itterator.
+//  for (new %2 = %1@YSII_Sg; _:%2 != -1; %2 = %1@YSII_Ag[%2])
 #define foreach%1(%0) for(new Y_FOREACH_SECOND|||Y_FOREACH_THIRD|||%0|||)
 // This allows us to use "new" multiple times - stripping off ONLY whole words.
 #define new%0|||%9|||%1:%2||| %9|||%0|||%1|||%2|||
-	//for (%2=_Y_ITER_ARRAY_SIZE(%1);(%2=_Y_ITER_ARRAY:%1@YSII_Ag[%2])!=_Y_ITER_ARRAY_SIZE(%1);)
+
 // This one is called if the new syntax is required, but the state of "new" is
 // as-yet unknown.  This attempts to call "%1" as a macro, if it starts with
 // "new" as a whole word then it will (and will also helpfully strip off the
-	Itter_OnPlayerConnect
+
 #define Y_FOREACH_THIRD|||%0|||%1|||%2||| %1=Y_FOREACH_FIFTH|||Y_FOREACH_FOURTH|||%1:%2|||
-	playerid - Player who joined.
+
 // This is called if the "new" macro is called for a second time.
-	-
+
 
-	Adds a player to the loop data.  Now sorts the list too.  Note that I found
+
-	the most bizzare bug ever (I *think* it may be a compiler but, but it
+#define Y_FOREACH_SEVENTH|||%9Y_FOREACH_SIXTH;%0|||%1|||%2||| new %0:%1=%0:_Y_ITER_ARRAY_SIZE(%2);_:(%1=_Y_ITER_ARRAY:%2@YSII_Ag[%1])!=%0:_Y_ITER_ARRAY_SIZE(%2);
-	requires further investigation), basically it seems that multiple variables
+
-	were being treated as the same variable (namely @YSII_EgotS and
+
-	@YSII_CgharacterS were the same and @YSII_EgotC and @YSII_CgharacterC were the
+
-	same).  Adding print statements which reference these variables seem to fix
+
-	the problem, and I've tried to make sure that the values will never actually
+
-	get printed.
+
 // Move any tags from the second half to the first half.
 //#define hta:%0=hta:%1:%2;_:%3!=-1;%4=hta:%5:%6[%7] %0:%1=%2;_:%1!=-1;%1=%6[%1]
 
-	public OnPlayerConnect(playerid)
+
-	{
+
-		#if defined _FOREACH_BOT
+
-			if (!IsPlayerNPC(playerid))
+
-			{
+
-				Itter_Add(Player, playerid);
+
-			}
+
-			#if !defined FOREACH_NO_BOTS
+
-				else
+
-				{
+
-					Itter_Add(Bot, playerid);
+
-				}
+
-				#pragma tabsize 4
+
-				Itter_Add(Character, playerid);
+    foreachex
-			#endif
+
-		#else
+    data - Data to itterate through.
-			Itter_Add(Player, playerid);
+    as - Variable to set value to.
-		#endif
+
-		if (YSI_g_sCallbacks & 2)
+    -
-		{
+
-			CallLocalFunction("Itter_OnPlayerConnect", "i", playerid);
+    Similar to foreach but doesn't declare a new variable for the itterator.
-		}
+
-		return 1;
+
-	}
+
-
+    //for (%2=_Y_ITER_ARRAY_SIZE(%1);(%2=_Y_ITER_ARRAY:%1@YSII_Ag[%2])!=_Y_ITER_ARRAY_SIZE(%1);)
-	#if defined _ALS_OnPlayerConnect
+
-		#undef OnPlayerConnect
+
-	#else
+
-		#define _ALS_OnPlayerConnect
+    Itter_OnPlayerConnect
-	#endif
+
-	#define OnPlayerConnect Itter_OnPlayerConnect
+    playerid - Player who joined.
-	forward OnPlayerConnect(playerid);
+
     -
 Notes:
     Adds a player to the loop data.  Now sorts the list too.  Note that I found
     the most bizzare bug ever (I *think* it may be a compiler but, but it
-	Itter_OnGameModeInit
+    requires further investigation), basically it seems that multiple variables
     were being treated as the same variable (namely @YSII_EgotS and
-	-
+    @YSII_CgharacterS were the same and @YSII_EgotC and @YSII_CgharacterC were the
     same).  Adding print statements which reference these variables seem to fix
-	-
+    the problem, and I've tried to make sure that the values will never actually
     get printed.
-	There are WIERD bugs in this script, seemingly caused by the compiler, so
+
-	this hopefully fixes them.  The OnFilterScriptInit code is written to be
+
-	very fast by utilising the internal array structure instead of the regular
+
-	Add functions.
+    public OnPlayerConnect(playerid)
     {
         P:0("Iter_OnPlayerConnect: %d", playerid);
         #if defined _FOREACH_BOT
-	public OnGameModeInit()
+            if (!IsPlayerNPC(playerid))
-	{
+            {
-		// Clear everything.
+                Itter_Add(Player, playerid);
-		if (funcidx("Itter_OnPlayerDisconnect") != -1)
+            }
-		{
+            #if !defined FOREACH_NO_BOTS
-			YSI_g_sCallbacks |= 1;
+                else
-		}
+                {
-		if (funcidx("Itter_OnPlayerConnect") != -1)
+                    Itter_Add(Bot, playerid);
-		{
+                }
-			YSI_g_sCallbacks |= 2;
+                #pragma tabsize 4
-		}
+                Itter_Add(Character, playerid);
-		if (!Player@YSII_Cg)
+            #endif
-		{
+        #else
-			#if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
+            Itter_Add(Player, playerid);
-				CallLocalFunction("Itter_OnGameModeInit", "", Bot@YSII_Cg, Character@YSII_Cg, Player@YSII_Cg);
+        #endif
-			#else
+        if (YSI_g_sCallbacks & 2)
-				CallLocalFunction("Itter_OnGameModeInit", "", Player@YSII_Cg);
+        {
-			#endif
+            CallLocalFunction(YSI_gsOnPlayerConnect, YSI_gsSpecifier@i, playerid);
-			return 1;
+        }
-		}
+        P:0("Iter_OnPlayerConnect end");
-		// Do the forward iterator list.
+        return 1;
-		#if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
+    }
-			Bot@YSII_Cg = _Y_ITER_C3:0;
+
-			Bot@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
+    #if defined _ALS_OnPlayerConnect
-			Character@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
+        #undef OnPlayerConnect
-			Character@YSII_Cg = _Y_ITER_C3:0;
+    #else
-			new
+        #define _ALS_OnPlayerConnect
-				lastBot = MAX_PLAYERS,
+    #endif
-				lastCharacter = MAX_PLAYERS;
+    #define OnPlayerConnect Itter_OnPlayerConnect
-		#endif
+    forward OnPlayerConnect(playerid);
-		Player@YSII_Cg = _Y_ITER_C3:0;
+
-		Player@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
+
-		new
+
-			lastPlayer = MAX_PLAYERS;
+
-		for (new i = 0; i != MAX_PLAYERS; ++i)
+    Itter_OnFilterScriptInit
-		{
+
-			if (IsPlayerConnected(i))
+    -
-			{
+
-				#if defined _FOREACH_BOT
+    -
-					// Had to do "if ! else" due to compile options.
+
-					if (!IsPlayerNPC(i))
+    Fixes a bug where callbacks are not detected when "loadfs" is used after the
-					{
+    GM has already started.  If this is a GM this is just never used called.
-						Player@YSII_Ag[lastPlayer] = i;
+
-						++Player@YSII_Cg;
+
-						lastPlayer = i;
+
-					}
+    public OnFilterScriptInit()
-					#if !defined FOREACH_NO_BOTS
+    {
-						else
+        P:0("Iter_OnFilterScriptInit start: %d", MAX_PLAYERS);
-						{
+        if (funcidx(YSI_gsOnPlayerDisconnect) != -1)
-							Bot@YSII_Ag[lastBot] = i;
+        {
-							++Bot@YSII_Cg;
+            YSI_g_sCallbacks |= 1;
-							lastBot = i;
+        }
-						}
+        if (funcidx(YSI_gsOnPlayerConnect) != -1)
-						#pragma tabsize 4
+        {
-						Character@YSII_Ag[lastCharacter] = i;
+            YSI_g_sCallbacks |= 2;
-						++Character@YSII_Cg;
+        }
-						lastCharacter = i;
+        #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
-					#endif
+            Bot@YSII_Cg = _Y_ITER_C3:0;
-				#else
+            Character@YSII_Cg = _Y_ITER_C3:0;
-					Player@YSII_Ag[lastPlayer] = i;
+            new
-					++Player@YSII_Cg;
+                lastBot = MAX_PLAYERS,
-					lastPlayer = i;
+                lastCharacter = MAX_PLAYERS;
-				#endif
+        #endif
-			}
+        Player@YSII_Cg = _Y_ITER_C3:0;
-			else
+        new
-			{
+            lastPlayer = MAX_PLAYERS;
-				#if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
+        for (new i = 0; i != MAX_PLAYERS; ++i)
-					Bot@YSII_Ag[i] = MAX_PLAYERS + 1;
+        {
-					//Bot@YSII_Rg[i] = -1;
+            if (IsPlayerConnected(i))
-					Character@YSII_Ag[i] = MAX_PLAYERS + 1;
+            {
-					//Character@YSII_Rg[i] = -1;
+                #if defined _FOREACH_BOT
-				#endif
+                    // Had to do "if ! else" due to compile options.
-				Player@YSII_Ag[i] = MAX_PLAYERS + 1;
+                    if (!IsPlayerNPC(i))
-				//Player@YSII_Rg[i] = -1;
+                    {
-			}
+                        Player@YSII_Ag[lastPlayer] = i;
-		}
+                        ++Player@YSII_Cg;
-		#if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
+                        lastPlayer = i;
-			Bot@YSII_Ag[lastPlayer] = MAX_PLAYERS;
+                    }
-			Character@YSII_Ag[lastPlayer] = MAX_PLAYERS;
+                    #if !defined FOREACH_NO_BOTS
-		#endif
+                        else
-		Player@YSII_Ag[lastPlayer] = MAX_PLAYERS;
+                        {
-		CallLocalFunction("Itter_OnGameModeInit", "");
+                            Bot@YSII_Ag[lastBot] = i;
-		return 1;
+                            ++Bot@YSII_Cg;
-	}
+                            lastBot = i;
-
+                        }
-	#if defined _ALS_OnGameModeInit
+                        #pragma tabsize 4
-		#undef OnGameModeInit
+                        Character@YSII_Ag[lastCharacter] = i;
-	#else
+                        ++Character@YSII_Cg;
-		#define _ALS_OnGameModeInit
+                        lastCharacter = i;
-	#endif
+                    #endif
-	#define OnGameModeInit Itter_OnGameModeInit
+                #else
-	forward OnGameModeInit();
+                    Player@YSII_Ag[lastPlayer] = i;
                     ++Player@YSII_Cg;
                     lastPlayer = i;
                 #endif
             }
-	Itter_OnPlayerDisconnect
+            else
             {
-	playerid - Player who left.
+                #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
                     Bot@YSII_Ag[i] = MAX_PLAYERS + 1;
-	-
+                    //Bot@YSII_Rg[i] = -1;
                     Character@YSII_Ag[i] = MAX_PLAYERS + 1;
-	Removes a player from the loop data.  No longer uses "hook" to ENSURE that
+                    //Character@YSII_Rg[i] = -1;
-	this is always last.  Previously I think that the order of evaluation in
+                #endif
-	y_hooks meant that this got called before the user "OnPlayerDisconnect".
+                Player@YSII_Ag[i] = MAX_PLAYERS + 1;
                 //Player@YSII_Rg[i] = -1;
             }
         }
-	public OnPlayerDisconnect(playerid, reason)
+        #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
-	{
+            Bot@YSII_Ag[lastPlayer] = MAX_PLAYERS;
-		if (YSI_g_sCallbacks & 1)
+            Character@YSII_Ag[lastPlayer] = MAX_PLAYERS;
-		{
+        #endif
-			CallLocalFunction("Itter_OnPlayerDisconnect", "ii", playerid, reason);
+        Player@YSII_Ag[lastPlayer] = MAX_PLAYERS;
-		}
+        CallLocalFunction("Itter_OnFilterScriptInit", YSI_gsSpecifier@);
-		#if defined _FOREACH_BOT
+        P:0("Iter_OnFilterScriptInit end");
-			if (!IsPlayerNPC(playerid))
+        return 1;
-			{
+    }
-				Itter_Remove(Player, playerid);
+
-			}
+    #if defined _ALS_OnFilterScriptInit
-			#if !defined FOREACH_NO_BOTS
+        #undef OnFilterScriptInit
-				else
+    #else
-				{
+        #define _ALS_OnFilterScriptInit
-					Itter_Remove(Bot, playerid);
+    #endif
-				}
+    #define OnFilterScriptInit Itter_OnFilterScriptInit
-				#pragma tabsize 4
+    forward OnFilterScriptInit();
-				Itter_Remove(Character, playerid);
+
-			#endif
+
-		#else
+
-			Itter_Remove(Player, playerid);
+
-		#endif
+    Itter_OnGameModeInit
-		return 1;
+
-	}
+    -
-
+
-	#if defined _ALS_OnPlayerDisconnect
+    -
-		#undef OnPlayerDisconnect
+
-	#else
+    There are WIERD bugs in this script, seemingly caused by the compiler, so
-		#define _ALS_OnPlayerDisconnect
+    this hopefully fixes them.  The OnFilterScriptInit code is written to be
-	#endif
+    very fast by utilising the internal array structure instead of the regular
-	#define OnPlayerDisconnect Itter_OnPlayerDisconnect
+    Add functions.
-	forward OnPlayerDisconnect(playerid, reason);
+
 
 #if !defined BOTSYNC_IS_BOT
     public OnGameModeInit()
     {
-	Itter_ShowArray
+        P:0("Iter_OnGameModeInit start: %d", MAX_PLAYERS);
         // Clear everything.
-	start - Itterator start point.
+        if (funcidx(YSI_gsOnPlayerDisconnect) != -1)
-	members[] - Itterator contents.
+        {
-	size - Number of itterator values
+            YSI_g_sCallbacks |= 1;
         }
-	-
+        if (funcidx(YSI_gsOnPlayerConnect) != -1)
         {
-	Pure debug function.  Has regular prints not debug prints
+            YSI_g_sCallbacks |= 2;
-	as it's only called when debug is on.
+        }
         if (!Player@YSII_Cg)
         {
             #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
-	Itter_ShowArray(size, members[])
+                CallLocalFunction(YSI_gsOnGameModeInit, YSI_gsSpecifier@, Bot@YSII_Cg, Character@YSII_Cg, Player@YSII_Cg);
             #else
-	static
+                CallLocalFunction(YSI_gsOnGameModeInit, YSI_gsSpecifier@, Player@YSII_Cg);
-		sString[61];
+            #endif
-	new
+            #if defined _YSI_SPECIAL_DEBUG
-		i,
+                for (new i = 0; i != MAX_PLAYERS; ++i)
-		j = 10;
+                {
-	printf("Start: %d", start);
+                    Player@YSII_Ag[i] = i + 1;
-	printf("Size:  %d", size);
+                }
-	while (i < size)
+                Player@YSII_Ag[MAX_PLAYERS] = 0;
-	{
+                Player@YSII_Cg = _Y_ITER_C3:MAX_PLAYERS;
-		sString[0] = '\0';
+            #endif
-		while (i < j && i < size)
+            P:0("Iter_OnGameModeInit: first");
-		{
+            return 1;
-			format(sString, sizeof (sString), "%s, %d", sString, members[i]);
+        }
-			i++;
+        // Do the forward iterator list.
-		}
+        #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
-		printf("Array (%d): %s", j, sString);
+            Bot@YSII_Cg = _Y_ITER_C3:0;
-		j += 10;
+            Bot@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
-	}
+            Character@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
             Character@YSII_Cg = _Y_ITER_C3:0;
             new
                 lastBot = MAX_PLAYERS,
                 lastCharacter = MAX_PLAYERS;
-	Itter_RandomInternal
+        #endif
         Player@YSII_Cg = _Y_ITER_C3:0;
-	count - Number of items in the itterator.
+        Player@YSII_Ag[MAX_PLAYERS] = MAX_PLAYERS;
-	array[] - Itterator data.
+        new
-	size - Size of the iterator.
+            lastPlayer = MAX_PLAYERS;
         for (new i = 0; i != MAX_PLAYERS; ++i)
-	-
+        {
             if (IsPlayerConnected(i))
-	Returns a random value from an iterator.
+            {
                 #if defined _FOREACH_BOT
                     // Had to do "if ! else" due to compile options.
                     if (!IsPlayerNPC(i))
-	Itter_RandomInternal(count, array[], size)
+                    {
                         Player@YSII_Ag[lastPlayer] = i;
-	if (count == 0)
+                        ++Player@YSII_Cg;
-	{
+                        lastPlayer = i;
-		return -1;
+                    }
-	}
+                    #if !defined FOREACH_NO_BOTS
-	new
+                        else
-		rnd = random(count),
+                        {
-		cur = array[size];
+                            Bot@YSII_Ag[lastBot] = i;
-	while (cur != size)
+                            ++Bot@YSII_Cg;
-	{
+                            lastBot = i;
-		if (rnd-- == 0)
+                        }
-		{
+                        #pragma tabsize 4
-			return cur;
+                        Character@YSII_Ag[lastCharacter] = i;
-		}
+                        ++Character@YSII_Cg;
-		cur = array[cur];
+                        lastCharacter = i;
-	}
+                    #endif
-	return -1;
+                #else
                     Player@YSII_Ag[lastPlayer] = i;
                     ++Player@YSII_Cg;
                     lastPlayer = i;
                 #endif
-	Itter_FreeInternal
+            }
             else
-	count - Number of items in the itterator.
+            {
-	array[] - Itterator data.
+                #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
-	size - Size of the itterator.
+                    Bot@YSII_Ag[i] = MAX_PLAYERS + 1;
                     //Bot@YSII_Rg[i] = -1;
-	-
+                    Character@YSII_Ag[i] = MAX_PLAYERS + 1;
                     //Character@YSII_Rg[i] = -1;
-	Finds the first free slot in the itterator.  Itterators now HAVE to be
+                #endif
-	sorted for this function to work correctly as it uses that fact to decide
+                Player@YSII_Ag[i] = MAX_PLAYERS + 1;
-	wether a slot is unused or the last one.  If you want to use the slot
+                //Player@YSII_Rg[i] = -1;
-	straight after finding it the itterator will need to re-find it to add in
+            }
-	the data.
+        }
         #if defined _FOREACH_BOT && !defined FOREACH_NO_BOTS
             Bot@YSII_Ag[lastPlayer] = MAX_PLAYERS;
             Character@YSII_Ag[lastPlayer] = MAX_PLAYERS;
-	Itter_FreeInternal(array[], size)
+        #endif
         Player@YSII_Ag[lastPlayer] = MAX_PLAYERS;
-	for (new i = 0; i != size; ++i)
+        P:0("Iter_OnGameModeInit: lastplayer = %d", lastPlayer);
-	{
+        CallLocalFunction(YSI_gsOnGameModeInit, YSI_gsSpecifier@);
-		if (array[i] > size)
+        #if defined _YSI_SPECIAL_DEBUG
-		{
+            for (new i = 0; i != MAX_PLAYERS; ++i)
-			return i;
+            {
-		}
+                Player@YSII_Ag[i] = i + 1;
-	}
+            }
-	return -1;
+            Player@YSII_Ag[MAX_PLAYERS] = 0;
             Player@YSII_Cg = _Y_ITER_C3:MAX_PLAYERS;
         #endif
         return 1;
     }
-	Itter_AddInternal
+
     #if defined _ALS_OnGameModeInit
-	&start - Array start index.
+        #undef OnGameModeInit
-	&count - Number of items in the itterator.
+    #else
-	array[] - Itterator data.
+        #define _ALS_OnGameModeInit
-	value - Item to add.
+    #endif
     #define OnGameModeInit Itter_OnGameModeInit
-	-
+    forward OnGameModeInit();
 #endif
-	Adds a value to a given itterator set.  Now detects when you try and add the
+
-	last item multiple times, as well as all the other items.  Now simplified even
+
-	further with the new internal representation.
+
     Itter_OnPlayerDisconnect
 Params:
     playerid - Player who left.
-	Itter_AddInternal(&count, array[], value, size)
+
     -
-	if (0 <= value < size && array[value] > size)
+
-	{
+    Removes a player from the loop data.  No longer uses "hook" to ENSURE that
-		new
+    this is always last.  Previously I think that the order of evaluation in
-			last = size,
+    y_hooks meant that this got called before the user "OnPlayerDisconnect".
-			next = array[last];
+
-		while (next < value)
+
-		{
+
-			last = next;
+    public OnPlayerDisconnect(playerid, reason)
-			next = array[last];
+    {
-		}
+        if (YSI_g_sCallbacks & 1)
-		array[last] = value;
+        {
-		array[value] = next;
+            CallLocalFunction(YSI_gsOnPlayerDisconnect, "ii", playerid, reason);
-		++count;
+        }
-		return 1;
+        SetTimerEx("Itter_OPDCInternal", 0, false, YSI_gsSpecifier@i, playerid);
-	}
+        return 1;
-	return 0;
+    }
 
     #if defined _ALS_OnPlayerDisconnect
         #undef OnPlayerDisconnect
     #else
-	Itter_RemoveInternal
+        #define _ALS_OnPlayerDisconnect
     #endif
-	&count - Number of items in the itterator.
+    #define OnPlayerDisconnect Itter_OnPlayerDisconnect
-	array[] - Itterator data.
+    forward OnPlayerDisconnect(playerid, reason);
-	value - Item to remove.
+
 
-	-
+
 Function:
-	Removes a value from an itterator.
+    Itter_OPDCInternal
 Params:
     playerid - Player who left.
 Return:
-	Itter_RemoveInternal(&count, array[], value, size)
+    -
 Notes:
-	new
+    Called AFTER "OnPlayerDisconnect" so that using "Kick" inside a "foreach"
-		last;
+    loop doesn't crash the server due to an OOB error.
-	return Itter_SafeRemoveInternal(count, array, value, last, size);
+
 
 #if !defined BOTSYNC_IS_BOT
     public Itter_OPDCInternal(playerid)
     {
-	Itter_SafeRemoveInternal
+        if (IsPlayerConnected(playerid))
         {
-	&count - Number of items in the itterator.
+            return;
-	array[] - Iterator data.
+        }
-	back[] - Reverse iterator data.
+        #if defined _FOREACH_BOT
-	value - Item to remove.
+            if (!IsPlayerNPC(playerid))
-	&last - Pointer in which to store the last pointer.
+            {
                 Itter_Remove(Player, playerid);
-	-
+            }
             #if !defined FOREACH_NO_BOTS
-	Removes a value from an itterator safely.
+                else
                 {
                     Itter_Remove(Bot, playerid);
                 }
-	Itter_SafeRemoveInternal(&count, array[], value, &last, size)
+                #pragma tabsize 4
                 Itter_Remove(Character, playerid);
-	if (0 <= value < size && array[value] <= size)
+            #endif
-	{
+        #else
-		last = size;
+            Itter_Remove(Player, playerid);
-		new
+        #endif
-			next = array[last];
+    }
-		while (next != value)
+
-		{
+
-			last = next;
+
-			next = array[last];
+
-		}
+    Itter_ShowArray
-		array[last] = array[value];
+
-		array[value] = size + 1;
+    start - Itterator start point.
-		--count;
+    members[] - Itterator contents.
-		return 1;
+    size - Number of itterator values
-	}
+
-	return 0;
+    -
 Notes:
     Pure debug function.  Has regular prints not debug prints
     as it's only called when debug is on.
 \*----------------------------------------------------------------------------*/
-	Itter_ContainsInternal
+
 /*stock
-	array[] - Itterator data.
+    Itter_ShowArray(size, members[])
-	value - Item to check.
+
-	size - Size of the iterator.
+    static
         sString[61];
-	-
+    new
         i,
-	Checks if this item is in the iterator.
+        j = 10;
     printf("Start: %d", start);
     printf("Size:  %d", size);
     while (i < size)
-	Itter_ContainsInternal(array[], value, size)
+    {
         sString[0] = '\0';
-	return 0 <= value < size && array[value] <= size;
+        while (i < j && i < size)
         {
             format(sString, sizeof (sString), "%s, %d", sString, members[i]);
             i++;
         }
-	Itter_ClearInternal
+        printf("Array (%d): %s", j, sString);
         j += 10;
-	&count - Number of items in the itterator.
+    }
-	array[] - Itterator data.
+
-	back[] - Reverse data.
+
-	size - Size of the iterator.
+
 Function:
-	-
+    Itter_RandomInternal
 Params:
-	Resets an iterator.
+    count - Number of items in the itterator.
     array[] - Itterator data.
     size - Size of the iterator.
 Return:
-	Itter_ClearInternal(&count, array[], size)
+    -
 Notes:
-	for (new i = 0, t = size + 1; i < size; ++i)
+    Returns a random value from an iterator.
-	{
+
-		array[i] = t;
+
-	}
+
-	array[size] = size;
+    Itter_RandomInternal(count, array[], size)
-	count = 0;
+
     if (count == 0)
     {
         return -1;
     }
-	Itter_InitInternal
+    new
         rnd = random(count),
-	array[][] - Itterator array to initialise.
+        cur = array[size];
-	s0 - Size of first dimension.
+    while (cur != size)
-	s1 - Size of second dimension.
+    {
         if (rnd-- == 0)
-	-
+        {
             return cur;
-	Multi-dimensional arrays can't be initialised at compile time, so need to be
+        }
-	done at run time, which is slightly annoying.
+        cur = array[cur];
     }
     return -1;
 }
-	Itter_InitInternal(arr[][], s0, s1)
+
 /*----------------------------------------------------------------------------*\
-	for (new i = 0, t = s1 + 1; i < s0; ++i)
+
-	{
+    Itter_FreeInternal
-		for (new j = 0; j < s1; ++j)
+
-		{
+    count - Number of items in the itterator.
-			arr[i][j] = t;
+    array[] - Itterator data.
-		}
+    size - Size of the itterator.
-		arr[i][s1] = s1;
+
-	}
+    -
-}
+
     Finds the first free slot in the itterator.  Itterators now HAVE to be
     sorted for this function to work correctly as it uses that fact to decide
     wether a slot is unused or the last one.  If you want to use the slot
     straight after finding it the itterator will need to re-find it to add in
     the data.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_FreeInternal(array[], size)
 {
     for (new i = 0; i != size; ++i)
     {
         if (array[i] > size)
         {
             return i;
         }
     }
     return -1;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_AddInternal
 Params:
     &start - Array start index.
     &count - Number of items in the itterator.
     array[] - Itterator data.
     value - Item to add.
 Return:
     -
 Notes:
     Adds a value to a given itterator set.  Now detects when you try and add the
     last item multiple times, as well as all the other items.  Now simplified even
     further with the new internal representation.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_AddInternal(&count, array[], value, size)
 {
     if (0 <= value < size && array[value] > size)
     {
         new
             last = size,
             next = array[last];
         while (next < value)
         {
             last = next;
             next = array[last];
         }
         array[last] = value;
         array[value] = next;
         ++count;
         return 1;
     }
     return 0;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_RemoveInternal
 Params:
     &count - Number of items in the itterator.
     array[] - Itterator data.
     value - Item to remove.
 Return:
     -
 Notes:
     Removes a value from an itterator.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_RemoveInternal(&count, array[], value, size)
 {
     new
         last;
     return Itter_SafeRemoveInternal(count, array, value, last, size);
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_SafeRemoveInternal
 Params:
     &count - Number of items in the itterator.
     array[] - Iterator data.
     back[] - Reverse iterator data.
     value - Item to remove.
     &last - Pointer in which to store the last pointer.
 Return:
     -
 Notes:
     Removes a value from an itterator safely.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_SafeRemoveInternal(&count, array[], value, &last, size)
 {
     if (0 <= value < size && array[value] <= size)
     {
         last = size;
         new
             next = array[last];
         while (next != value)
         {
             last = next;
             next = array[last];
         }
         array[last] = array[value];
         array[value] = size + 1;
         --count;
         return 1;
     }
     return 0;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_ContainsInternal
 Params:
     array[] - Itterator data.
     value - Item to check.
     size - Size of the iterator.
 Return:
     -
 Notes:
     Checks if this item is in the iterator.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_ContainsInternal(array[], value, size)
 {
     return 0 <= value < size && array[value] <= size;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_ClearInternal
 Params:
     &count - Number of items in the itterator.
     array[] - Itterator data.
     back[] - Reverse data.
     size - Size of the iterator.
 Return:
     -
 Notes:
     Resets an iterator.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_ClearInternal(&count, array[], size)
 {
     for (new i = 0, t = size + 1; i < size; ++i)
     {
         array[i] = t;
     }
     array[size] = size;
     count = 0;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_InitInternal
 Params:
     array[][] - Itterator array to initialise.
     s0 - Size of first dimension.
     s1 - Size of second dimension.
 Return:
     -
 Notes:
     Multi-dimensional arrays can't be initialised at compile time, so need to be
     done at run time, which is slightly annoying.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_InitInternal(arr[][], s0, s1)
 {
     for (new i = 0, t = s1 + 1; i < s0; ++i)
     {
         for (new j = 0; j < s1; ++j)
         {
             arr[i][j] = t;
         }
         arr[i][s1] = s1;
     }
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Itter_PrevInternal
 Params:
     array[] - Itterator data.
     size - Size of the iterator.
     slot - The current slot.
 Return:
     -
 Notes:
     Gets the element in an iterator that points to the current element.
 \*----------------------------------------------------------------------------*/
 
 stock
     Itter_PrevInternal(array[], size, slot)
 {
     if (0 <= slot <= size && array[slot] <= size)
     {
         for (new last = slot; last--; )
         {
             if (array[last] == slot)
             {
                 return last;
             }
         }
     }
     return size;
 }
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_Begin
 Params:
     iter - Name of the iterator to get the start of.
 Return:
     -
 Notes:
     Gets a point BEFORE the start of the iterator (the theoretical beginning).
 \*----------------------------------------------------------------------------*/
 
 #define Iter_Begin(%1) (_Y_ITER_ARRAY_SIZE(%1))
 #define Itter_Begin(%1) (_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_End
 Params:
     iter - Name of the iterator to get the end of.
 Return:
     -
 Notes:
     Gets a point AFTER the end of the iterator (think "MAX_PLAYERS").
 \*----------------------------------------------------------------------------*/
 
 #define Iter_End(%1) (_Y_ITER_ARRAY_SIZE(%1))
 #define Itter_End(%1) (_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_First
 Params:
     iter - Name of the iterator to get the first valid element in.
 Return:
     -
 Notes:
     Gets the first element in an iterator.
 \*----------------------------------------------------------------------------*/
 
 #define Iter_First(%1) (_Y_ITER_ARRAY:%1@YSII_Ag[_Y_ITER_ARRAY_SIZE(%1)])
 #define Itter_First(%1) (_Y_ITER_ARRAY:%1@YSII_Ag[_Y_ITER_ARRAY_SIZE(%1)])
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_Last
 Params:
     iter - Name of the iterator to
 Return:
     -
 Notes:
     Gets the last element in an iterator.
 \*----------------------------------------------------------------------------*/
 
 #define Iter_Last(%1) Itter_PrevInternal(_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1),_Y_ITER_ARRAY_SIZE(%1))
 #define Itter_Last(%1) Itter_PrevInternal(_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1),_Y_ITER_ARRAY_SIZE(%1))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_Next
 Params:
     iter - Name of the iterator to get the next element in.
     cur - The current element.
 Return:
     -
 Notes:
     Gets the element in an interator after the current one.
 \*----------------------------------------------------------------------------*/
 
 #define Iter_Next(%1,%2) (_Y_ITER_ARRAY:%1@YSII_Ag[(%2)])
 #define Itter_Next(%1,%2) (_Y_ITER_ARRAY:%1@YSII_Ag[(%2)])
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_Prev
 Params:
     iter - Name of the iterator to get the previous element in.
     cur - The current element.
 Return:
     -
 Notes:
     Gets the element in an iterator before the current one.  Slow.
 \*----------------------------------------------------------------------------*/
 
 #define Iter_Prev(%1,%2) Itter_PrevInternal(_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1),(%2))
 #define Itter_Prev(%1,%2) Itter_PrevInternal(_Y_ITER_ARRAY:%1@YSII_Ag,_Y_ITER_ARRAY_SIZE(%1),(%2))
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_InternalArray
 Params:
     iter - Name of the iterator to get the true name of.
 Return:
     -
 Notes:
     Accesses the internal array of an iterator.
 \*----------------------------------------------------------------------------*/
 
 #define Iter_InternalArray(%1) (_Y_ITER_ARRAY:%1@YSII_Ag)
 #define Itter_InternalArray(%1) (_Y_ITER_ARRAY:%1@YSII_Ag)
 
 /*----------------------------------------------------------------------------*\
 Function:
     Iter_InternalSize
 Params:
     iter - Name of the iterator to get the true size of.
 Return:
     -
 Notes:
     Accesses the internal size of an iterator.
 \*----------------------------------------------------------------------------*/
 
 #define _Y_ITER_INT_SIZE:%0(%2[%1]@YSII_Ag)) %0(%2@YSII_Ag[]))
 
 #define Iter_InternalSize(%1) (_:_Y_ITER_INT_SIZE:sizeof (%1@YSII_Ag))
 #define Itter_InternalSize(%1) (_:_Y_ITER_INT_SIZE:sizeof (%1@YSII_Ag))