diff --git a/.gitignore b/.gitignore index 34b3384e..8c82f1aa 100644 --- a/.gitignore +++ b/.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 diff --git a/.travis.yml b/.travis.yml index 7e0904e4..d2afd86c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ addons: #Set the build environment env: + - SMVERSION=1.7 - SMVERSION=1.8 - SMVERSION=1.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index ba91f04c..88a9a923 100644 --- a/CHANGELOG.md +++ b/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* diff --git a/addons/sourcemod/plugins/MyJailbreak/catch.smx b/addons/sourcemod/plugins/MyJailbreak/catch.smx index 878ebe0e..efd4e677 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/catch.smx and b/addons/sourcemod/plugins/MyJailbreak/catch.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/cowboy.smx b/addons/sourcemod/plugins/MyJailbreak/cowboy.smx index 380c0276..9486f7a9 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/cowboy.smx and b/addons/sourcemod/plugins/MyJailbreak/cowboy.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/dealdamage.smx b/addons/sourcemod/plugins/MyJailbreak/dealdamage.smx index f3c38968..0fe5cc3b 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/dealdamage.smx and b/addons/sourcemod/plugins/MyJailbreak/dealdamage.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/drunk.smx b/addons/sourcemod/plugins/MyJailbreak/drunk.smx index c37fe8cb..1a036446 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/drunk.smx and b/addons/sourcemod/plugins/MyJailbreak/drunk.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/duckhunt.smx b/addons/sourcemod/plugins/MyJailbreak/duckhunt.smx index 951fc076..aa34ab6f 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/duckhunt.smx and b/addons/sourcemod/plugins/MyJailbreak/duckhunt.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/ffa.smx b/addons/sourcemod/plugins/MyJailbreak/ffa.smx index bccea4b7..792a8420 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/ffa.smx and b/addons/sourcemod/plugins/MyJailbreak/ffa.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/freeday.smx b/addons/sourcemod/plugins/MyJailbreak/freeday.smx index 72c3889b..9ba1910a 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/freeday.smx and b/addons/sourcemod/plugins/MyJailbreak/freeday.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/hebattle.smx b/addons/sourcemod/plugins/MyJailbreak/hebattle.smx index e78310a9..b3fee2ed 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/hebattle.smx and b/addons/sourcemod/plugins/MyJailbreak/hebattle.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/hide.smx b/addons/sourcemod/plugins/MyJailbreak/hide.smx index 860fc480..370ad0ae 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/hide.smx and b/addons/sourcemod/plugins/MyJailbreak/hide.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/hud.smx b/addons/sourcemod/plugins/MyJailbreak/hud.smx index f216197d..71101d13 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/hud.smx and b/addons/sourcemod/plugins/MyJailbreak/hud.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/knife.smx b/addons/sourcemod/plugins/MyJailbreak/knife.smx index cc7df476..40e9a1b5 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/knife.smx and b/addons/sourcemod/plugins/MyJailbreak/knife.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/lastguard.smx b/addons/sourcemod/plugins/MyJailbreak/lastguard.smx index 39065daa..9abcc51c 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/lastguard.smx and b/addons/sourcemod/plugins/MyJailbreak/lastguard.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/menu.smx b/addons/sourcemod/plugins/MyJailbreak/menu.smx index c7c57350..0a88e1a9 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/menu.smx and b/addons/sourcemod/plugins/MyJailbreak/menu.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/myjailbreak.smx b/addons/sourcemod/plugins/MyJailbreak/myjailbreak.smx index feaf572a..017c3154 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/myjailbreak.smx and b/addons/sourcemod/plugins/MyJailbreak/myjailbreak.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/noscope.smx b/addons/sourcemod/plugins/MyJailbreak/noscope.smx index a65f7d1e..7ccdec1b 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/noscope.smx and b/addons/sourcemod/plugins/MyJailbreak/noscope.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/playertags.smx b/addons/sourcemod/plugins/MyJailbreak/playertags.smx index ba6f9b66..b77795e0 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/playertags.smx and b/addons/sourcemod/plugins/MyJailbreak/playertags.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/ratio.smx b/addons/sourcemod/plugins/MyJailbreak/ratio.smx index c7d2b8b1..0580cedd 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/ratio.smx and b/addons/sourcemod/plugins/MyJailbreak/ratio.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/request.smx b/addons/sourcemod/plugins/MyJailbreak/request.smx index 60dc52b3..001e9485 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/request.smx and b/addons/sourcemod/plugins/MyJailbreak/request.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/suicide.smx b/addons/sourcemod/plugins/MyJailbreak/suicide.smx index d520d8f1..df5faaf5 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/suicide.smx and b/addons/sourcemod/plugins/MyJailbreak/suicide.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/torch.smx b/addons/sourcemod/plugins/MyJailbreak/torch.smx index be123ab1..3728ab6c 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/torch.smx and b/addons/sourcemod/plugins/MyJailbreak/torch.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/war.smx b/addons/sourcemod/plugins/MyJailbreak/war.smx index 51f39676..6933cf59 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/war.smx and b/addons/sourcemod/plugins/MyJailbreak/war.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/warden.smx b/addons/sourcemod/plugins/MyJailbreak/warden.smx index a4101fbc..3f5c16e4 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/warden.smx and b/addons/sourcemod/plugins/MyJailbreak/warden.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/weapons.smx b/addons/sourcemod/plugins/MyJailbreak/weapons.smx index a0230c79..5ae21e90 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/weapons.smx and b/addons/sourcemod/plugins/MyJailbreak/weapons.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/zeus.smx b/addons/sourcemod/plugins/MyJailbreak/zeus.smx index 2f5e3f01..a738dd09 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/zeus.smx and b/addons/sourcemod/plugins/MyJailbreak/zeus.smx differ diff --git a/addons/sourcemod/plugins/MyJailbreak/zombie.smx b/addons/sourcemod/plugins/MyJailbreak/zombie.smx index 84472623..5ec3c5e2 100644 Binary files a/addons/sourcemod/plugins/MyJailbreak/zombie.smx and b/addons/sourcemod/plugins/MyJailbreak/zombie.smx differ diff --git a/addons/sourcemod/scripting/MyJailbreak/cowboy.sp b/addons/sourcemod/scripting/MyJailbreak/cowboy.sp index 1d484879..9889f89e 100644 --- a/addons/sourcemod/scripting/MyJailbreak/cowboy.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/dealdamage.sp b/addons/sourcemod/scripting/MyJailbreak/dealdamage.sp index 5c62739f..c8970ccf 100644 --- a/addons/sourcemod/scripting/MyJailbreak/dealdamage.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/drunk.sp b/addons/sourcemod/scripting/MyJailbreak/drunk.sp index efae43e7..8867a4d6 100644 --- a/addons/sourcemod/scripting/MyJailbreak/drunk.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/ffa.sp b/addons/sourcemod/scripting/MyJailbreak/ffa.sp index cdc3e03c..57a22e5d 100644 --- a/addons/sourcemod/scripting/MyJailbreak/ffa.sp +++ b/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)) { diff --git a/addons/sourcemod/scripting/MyJailbreak/hebattle.sp b/addons/sourcemod/scripting/MyJailbreak/hebattle.sp index b165e353..3f38f959 100644 --- a/addons/sourcemod/scripting/MyJailbreak/hebattle.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/knife.sp b/addons/sourcemod/scripting/MyJailbreak/knife.sp index 2d5fe36a..d52cb829 100644 --- a/addons/sourcemod/scripting/MyJailbreak/knife.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/noscope.sp b/addons/sourcemod/scripting/MyJailbreak/noscope.sp index 8fb6aa9b..31850945 100644 --- a/addons/sourcemod/scripting/MyJailbreak/noscope.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/torch.sp b/addons/sourcemod/scripting/MyJailbreak/torch.sp index 885a16e9..5dec628b 100644 --- a/addons/sourcemod/scripting/MyJailbreak/torch.sp +++ b/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)) { diff --git a/addons/sourcemod/scripting/MyJailbreak/war.sp b/addons/sourcemod/scripting/MyJailbreak/war.sp index 06a08015..8b2f45b9 100644 --- a/addons/sourcemod/scripting/MyJailbreak/war.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/zeus.sp b/addons/sourcemod/scripting/MyJailbreak/zeus.sp index da8a4c14..d7d832cc 100644 --- a/addons/sourcemod/scripting/MyJailbreak/zeus.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/MyJailbreak/zombie.sp b/addons/sourcemod/scripting/MyJailbreak/zombie.sp index 63cab61e..452be333 100644 --- a/addons/sourcemod/scripting/MyJailbreak/zombie.sp +++ b/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); } diff --git a/addons/sourcemod/scripting/include/basecomm.inc b/addons/sourcemod/scripting/include/basecomm.inc new file mode 100644 index 00000000..7e5ee2cb --- /dev/null +++ b/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 . + * + * 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 . + * + * 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 diff --git a/addons/sourcemod/scripting/include/myjailbreak.inc b/addons/sourcemod/scripting/include/myjailbreak.inc index 025bd9f5..71e279cd 100644 --- a/addons/sourcemod/scripting/include/myjailbreak.inc +++ b/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) { diff --git a/thread.txt b/thread.txt index 244b8d9b..196392c8 100644 --- a/thread.txt +++ b/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] diff --git a/wiki b/wiki index e0e70eb5..aba90f6a 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit e0e70eb5ccf92ecece8f0f9a1b03ddfa6f4aa2d4 +Subproject commit aba90f6a914b5165d15e89e872dabb1a46a9cff5