Merge pull request #131 from Ravid-A/master

Update To Sourcemod 1.11.0 6930

Author: maxijabase

Deploy/SPCode_Beta.nsi

@@ -46,7 +46,7 @@ CreateDirectory "$APPDATA\spcodebeta\sourcepawn\errorfiles"
 CreateDirectory "$APPDATA\spcodebeta\sourcepawn\temp"
 CreateDirectory "$APPDATA\spcodebeta\sourcepawn\templates"
 CreateDirectory "$APPDATA\spcodebeta\sourcepawn\configs"
-CreateDirectory "$APPDATA\spcodebeta\sourcepawn\configs\sm_1_10_0_6509"
+CreateDirectory "$APPDATA\spcodebeta\sourcepawn\configs\sm_1_11_0_6930"
 
 SetOutPath $APPDATA\spcodebeta
 File /r ".\sourcepawn"

Deploy/SPCode_Stable.nsi

@@ -46,7 +46,7 @@ CreateDirectory "$APPDATA\spcode\sourcepawn\errorfiles"
 CreateDirectory "$APPDATA\spcode\sourcepawn\temp"
 CreateDirectory "$APPDATA\spcode\sourcepawn\templates"
 CreateDirectory "$APPDATA\spcode\sourcepawn\configs"
-CreateDirectory "$APPDATA\spcode\sourcepawn\configs\sm_1_10_0_6509"
+CreateDirectory "$APPDATA\spcode\sourcepawn\configs\sm_1_11_0_6930"
 
 SetOutPath $APPDATA\spcode
 File /r ".\sourcepawn"

Resources/Misc/Configurations/Configs.xml

@@ -1,3 +1,3 @@
 <Configurations>
-	<Config Name="Standard SM 1.10.0.6509" SMDirectory="" Standard="1" CopyDirectory="" AutoCopy="0" ServerFile="" ServerArgs="" PostCmd="" PreCmd="" OptimizationLevel="2" VerboseLevel="1" DeleteAfterCopy="0" FTPHost="ftp://localhost/" FTPUser="" FTPPassword="" FTPDir="" RConSourceEngine="1" RConIP="127.0.0.1" RConPort="27015" RConPassword="" RConCommands="" />
+	<Config Name="Standard SM 1.11.0.6930" SMDirectory="" Standard="1" CopyDirectory="" AutoCopy="0" ServerFile="" ServerArgs="" PostCmd="" PreCmd="" OptimizationLevel="2" VerboseLevel="1" DeleteAfterCopy="0" FTPHost="ftp://localhost/" FTPUser="" FTPPassword="" FTPDir="" RConSourceEngine="1" RConIP="127.0.0.1" RConPort="27015" RConPassword="" RConCommands="" />
 </Configurations>

Resources/Misc/Configurations/sm_1_10_0_6509/include/geoip.inc

@@ -191,6 +191,20 @@ methodmap AdminId {
 	// @param enabled       True to enable, false to disable.
 	public native void SetFlag(AdminFlag flag, bool enabled);
 
+	// Sets multiple bitwise flags to be enabled/disabled on an admin.
+	//
+	// @param flags         Bitwise admin flags (ADMFLAG_*).
+	// @param enabled       True to set the flag, false to unset/disable.
+	public void SetBitFlags(int flags, bool enabled)
+	{
+		AdminFlag flagArray[AdminFlags_TOTAL];
+		int num = FlagBitsToArray(flags, flagArray, sizeof(flagArray));
+		for (int i = 0; i < num; i++)
+		{
+			this.SetFlag(flagArray[i], enabled);
+		}
+	}
+
 	// Returns whether or not a flag is enabled on an admin.
 	//
 	// @param flag          Admin flag to use.
@@ -278,6 +292,20 @@ methodmap GroupId {
 	// @param enabled       True to set the flag, false to unset/disable.
 	public native void SetFlag(AdminFlag flag, bool enabled);
 
+	// Adds or removes multiple bitwise flags from a group's flag set.
+	//
+	// @param flags         Bitwise admin flags (ADMFLAG_*).
+	// @param enabled       True to set the flag, false to unset/disable.
+	public void SetBitFlags(int flags, bool enabled)
+	{
+		AdminFlag flagArray[AdminFlags_TOTAL];
+		int num = FlagBitsToArray(flags, flagArray, sizeof(flagArray));
+		for (int i = 0; i < num; i++)
+		{
+			this.SetFlag(flagArray[i], enabled);
+		}
+	}
+
 	// Returns the flag set that is added to users from this group.
 	//
 	// @return              Bitstring containing the flags enabled.
@@ -773,3 +801,32 @@ stock bool BitToFlag(int bit, AdminFlag &flag)
 
 	return false;
 }
+
+/**
+ * Converts a bit string to a string of flag characters.
+ *
+ * @param bits			Bit string containing the flags.
+ * @param flags			Output array to write a string of flag characters.
+ * @param maxSize		Maximum size of the string array.
+ * @return				Number of flag characters written.
+ */
+stock int FlagBitsToString(const int bits, char[] flags, const int maxSize)
+{
+	AdminFlag array[AdminFlags_TOTAL];
+	int numFlags = FlagBitsToArray(bits, array, AdminFlags_TOTAL);
+	if (numFlags > maxSize)
+	{
+		numFlags = maxSize;
+	}
+	int i, c, numId = 0;
+	for (i = 0; i < numFlags; ++i)
+	{
+		if(FindFlagChar(array[i], c))
+		{
+			flags[numId++] = c;
+		}
+	}
+	flags[numId] = '\0';
+
+	return numId;
+}

Resources/Misc/Configurations/sm_1_10_0_6509/spcomp.exe

@@ -159,7 +159,7 @@ methodmap ArrayList < Handle {
 	// @param value         String value to set.
 	// @return              Number of characters copied.
 	// @error               Invalid index.
-	public native void SetString(int index, const char[] value);
+	public native int SetString(int index, const char[] value);
 
 	// Sets an array of cells in an array.
 	//
@@ -169,7 +169,7 @@ methodmap ArrayList < Handle {
 	//                      blocksize.  Otherwise, the size passed is used.
 	// @return              Number of cells copied.
 	// @error               Invalid index.
-	public native void SetArray(int index, const any[] values, int size=-1);
+	public native int SetArray(int index, const any[] values, int size=-1);
 
 	// Shifts an array up.  All array contents after and including the given
 	// index are shifted up by one, and the given index is then "free."

…rations/sm_1_10_0_6509/include/admin.inc …rations/sm_1_11_0_6930/include/admin.incResources/Misc/Configurations/sm_1_10_0_6509/include/admin.inc renamed to Resources/Misc/Configurations/sm_1_11_0_6930/include/admin.inc Resources/Misc/Configurations/sm_1_10_0_6509/include/admin.inc renamed to Resources/Misc/Configurations/sm_1_11_0_6930/include/admin.inc

@@ -54,6 +54,17 @@ methodmap ArrayStack < Handle
 	//                     new Array[X][32]
 	public native ArrayStack(int blocksize=1);
 
+	// Clears a stack of all entries.
+	public native void Clear();
+
+	// Clones an stack, returning a new handle with the same size and data.
+	// This should NOT be confused with CloneHandle. This is a completely new
+	// handle with the same data but no relation to the original. It should
+	// closed when no longer needed.
+	//
+	// @return             New handle to the cloned stack object
+	public native ArrayStack Clone();
+
 	// Pushes a value onto the end of the stack, adding a new index.
 	//
 	// This may safely be used even if the stack has a blocksize
@@ -84,15 +95,15 @@ methodmap ArrayStack < Handle
 	// @param block        Optionally specify which block to read from
 	//                     (useful if the blocksize > 0).
 	// @param asChar       Optionally read as a byte instead of a cell.
-	// @return             True on success, false if the stack is empty.
+	// @return             Value popped from the stack.
 	// @error              The stack is empty.
 	public native any Pop(int block=0, bool asChar=false);
 
 	// Pops a string value from a stack.
 	//
 	// @param buffer       Buffer to store string.
 	// @param maxlength    Maximum size of the buffer.
-	// @oaram written      Number of characters written to buffer, not including
+	// @param written      Number of characters written to buffer, not including
 	//                     the null terminator.
 	// @error              The stack is empty.
 	public native void PopString(char[] buffer, int maxlength, int &written = 0);