Beta 7.2: compatibility issues with sm 1.7

.gitignore

@@ -13,7 +13,6 @@ addons/sourcemod/scripting/include/adt_stack.inc
 addons/sourcemod/scripting/include/adt_trie.inc
 addons/sourcemod/scripting/include/autoexecconfig.inc
 addons/sourcemod/scripting/include/banning.inc
-addons/sourcemod/scripting/include/basecomm.inc
 addons/sourcemod/scripting/include/bitbuffer.inc
 addons/sourcemod/scripting/include/clientprefs.inc
 addons/sourcemod/scripting/include/clients.inc

.travis.yml

@@ -8,6 +8,7 @@ addons:
 
 #Set the build environment
 env:
+    - SMVERSION=1.7
     - SMVERSION=1.8
     - SMVERSION=1.9
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 ### Change Log
 
+**[Beta 7.2]** - fix for 1.7.x
+
+*Fixed*
+*  Compatibility issues with sourcemod 1.7.x
+
+
+
 **[Beta 7.1]** - smaller fixes
 
 *Fixed*

addons/sourcemod/scripting/MyJailbreak/cowboy.sp

@@ -401,7 +401,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 					SetEntData(client, FindSendPropInfo("CBaseEntity", "m_CollisionGroup"), 2, 4, true);
 					SetEntProp(client, Prop_Data, "m_takedamage", 0, 1);
 
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/MyJailbreak/dealdamage.sp

@@ -417,7 +417,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 						SetEntData(client, FindSendPropInfo("CBaseEntity", "m_CollisionGroup"), 2, 4, true); //NoBlock
 						CreateInfoPanel(client);
 						SetEntProp(client, Prop_Data, "m_takedamage", 0, 1); //disable damage
-						if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn  //spawn Terrors to CT Spawn
+						if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn  //spawn Terrors to CT Spawn
 						{
 							TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 						}

addons/sourcemod/scripting/MyJailbreak/drunk.sp

@@ -394,7 +394,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 						SetEntData(client, FindSendPropInfo("CBaseEntity", "m_CollisionGroup"), 2, 4, true); //NoBlock
 						SendPanelToClient(DrunkMenu, client, Handler_NullCancel, 20); //open info Panel
 						SetEntProp(client, Prop_Data, "m_takedamage", 0, 1); //disable damage
-						if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn  //spawn Terrors to CT Spawn
+						if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn  //spawn Terrors to CT Spawn
 						{
 							TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 						}

addons/sourcemod/scripting/MyJailbreak/ffa.sp

@@ -372,7 +372,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 			{
 				LoopClients(client)
 				{
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						if (IsClientInGame(client))
 						{

addons/sourcemod/scripting/MyJailbreak/hebattle.sp

@@ -392,7 +392,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 					{
 						SetEntityGravity(client, gc_fGravValue.FloatValue);	
 					}
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/MyJailbreak/knife.sp

@@ -411,7 +411,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 					{
 						ClientCommand(client, "thirdperson");
 					}
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/MyJailbreak/noscope.sp

@@ -412,7 +412,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 					{
 						SetEntityGravity(client, gc_fGravValue.FloatValue);	
 					}
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/MyJailbreak/torch.sp

@@ -418,7 +418,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 			{
 				LoopClients(client)
 				{
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						if (IsClientInGame(client))
 						{

addons/sourcemod/scripting/MyJailbreak/war.sp

@@ -386,7 +386,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 			{
 				for(int client=1; client <= MaxClients; client++)
 				{
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn )
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn )
 					{
 						if (IsClientInGame(client))
 						{
@@ -424,7 +424,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 
 			g_iFreezeTime--;
 
-			if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn )
+			if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn )
 			{
 				FreezeTimer = CreateTimer(1.0, Timer_FreezeOnStart, _, TIMER_REPEAT);
 			}

addons/sourcemod/scripting/MyJailbreak/zeus.sp

@@ -386,7 +386,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 					SetEntProp(client, Prop_Data, "m_takedamage", 0, 1);
 					ClientTimer[client] = CreateTimer(0.5, Timer_GiveZeus, client);
 
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/MyJailbreak/zombie.sp

@@ -415,7 +415,7 @@ public void Event_RoundStart(Event event, char[] name, bool dontBroadcast)
 						GivePlayerItem(client, "weapon_hegrenade");
 						GivePlayerItem(client, "weapon_molotov");
 					}
-					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && !SJD_IsCurrentMapConfigured)) //spawn Terrors to CT Spawn 
+					if (!gc_bSpawnCell.BoolValue || (gc_bSpawnCell.BoolValue && (SJD_IsCurrentMapConfigured() != true))) //spawn Terrors to CT Spawn 
 					{
 						TeleportEntity(client, g_fPos, NULL_VECTOR, NULL_VECTOR);
 					}

addons/sourcemod/scripting/include/basecomm.inc

@@ -0,0 +1,109 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod (C)2004-2011 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This file is part of the SourceMod/SourcePawn SDK.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#if defined _basecomm_included
+ #endinput
+#endif
+#define _basecomm_included
+
+/**
+ * Called when a client is muted or unmuted
+ * 
+ * @param	client		Client index
+ * @param	muteState	True if client was muted, false otherwise
+ */
+ forward void BaseComm_OnClientMute(int client, bool muteState);
+
+ /**
+ * Called when a client is gagged or ungagged
+ * 
+ * @param	client		Client index
+ * @param	gagState	True if client was gaged, false otherwise
+ */
+ forward void BaseComm_OnClientGag(int client, bool gagState);
+
+/**
+ * Returns whether or not a client is gagged
+ *
+ * @param client		Client index.
+ * @return				True if client is gagged, false otherwise.
+ */
+native bool BaseComm_IsClientGagged(int client);
+
+/**
+ * Returns whether or not a client is muted
+ *
+ * @param client		Client index.
+ * @return				True if client is muted, false otherwise.
+ */
+native bool BaseComm_IsClientMuted(int client);
+
+/**
+ * Sets a client's gag state
+ *
+ * @param client		Client index.
+ * @param gagState		True to gag client, false to ungag.
+ * @return				True if this caused a change in gag state, false otherwise.
+ */
+native bool BaseComm_SetClientGag(int client, bool gagState);
+
+/**
+ * Sets a client's mute state
+ *
+ * @param client		Client index.
+ * @param muteState		True to mute client, false to unmute.
+ * @return				True if this caused a change in mute state, false otherwise.
+ */
+native bool BaseComm_SetClientMute(int client, bool muteState);
+
+/* DO NOT EDIT BELOW THIS LINE */
+
+public SharedPlugin __pl_basecomm = 
+{
+	name = "basecomm",
+	file = "basecomm.smx",
+#if defined REQUIRE_PLUGIN
+	required = 1,
+#else
+	required = 0,
+#endif
+};
+
+#if !defined REQUIRE_PLUGIN
+public void __pl_basecomm_SetNTVOptional()
+{
+	MarkNativeAsOptional("BaseComm_IsClientGagged");
+	MarkNativeAsOptional("BaseComm_IsClientMuted");
+	MarkNativeAsOptional("BaseComm_SetClientGag");
+	MarkNativeAsOptional("BaseComm_SetClientMute");
+}
+#endif

addons/sourcemod/scripting/include/myjailbreak.inc

@@ -43,7 +43,7 @@ public SharedPlugin:__pl_myjailbreak =
 
 
 //Defines
-#define PLUGIN_VERSION "Beta 7.1"
+#define PLUGIN_VERSION "Beta 7.2"
 #define URL_LINK "https://github.com/shanapu/MyJailbreak"
 
 
@@ -292,7 +292,7 @@ stock void ShowOverlayAll(char [] path, float deletetime)
 
 
 //Remove overlay from a client
-stock Action DeleteOverlay( Handle timer, any client ) 
+public Action DeleteOverlay( Handle timer, any client ) 
 {
 	if(IsValidClient(client, false, true))
 	{
@@ -379,7 +379,7 @@ stock void SetPlayerWeaponAmmo(int client, int weaponEnt, int clip = -1, int amm
 
 
 //Remove a players render color
-stock Action Timer_RemoveColor( Handle timer, any client ) 
+public Action Timer_RemoveColor( Handle timer, any client ) 
 {
 	if(IsValidClient(client, true, true))
 	{
@@ -454,7 +454,7 @@ stock bool CheckVipFlag(int client, const char[] flagsNeed)
 
 
 //Menu Handler for Panels
-stock int Handler_NullCancel(Handle menu, MenuAction action, int param1, int param2)
+public int Handler_NullCancel(Handle menu, MenuAction action, int param1, int param2)
 {
 	if (action == MenuAction_Select) 
 	{

thread.txt

@@ -1656,6 +1656,8 @@ native warden_get(client);
 [B][u]Latest Changes[/u][/B]
 
 [QUOTE] 
+[b][Beta 7.2][/b] - Compatibility issues with sourcemod 1.7.x
+
 [b][Beta 7.1][/b] - smaller fixes
 [SPOILER]  
 [i]Fixed[/i][LIST]