Merge branch 'stable'

.travis.yml

@@ -18,9 +18,9 @@ install:
     - tar -xzf $(cat sourcemod-latest-linux)
 before_script:
     - cd addons/sourcemod/scripting/
-    - wget "http://hg.limetech.org/projects/tf2items/tf2items_source/raw-file/tip/pawn/tf2items.inc" -O include/tf2items.inc
+    - wget "https://raw.githubusercontent.com/asherkin/TF2Items/master/pawn/tf2items.inc" -O include/tf2items.inc
     - wget "http://www.doctormckay.com/download/scripting/include/morecolors.inc" -O include/morecolors.inc
-    - wget "http://hg.limetech.org/projects/steamtools/raw-file/tip/plugin/steamtools.inc" -O include/steamtools.inc
+    - wget "https://raw.githubusercontent.com/asherkin/SteamTools/master/plugin/steamtools.inc" -O include/steamtools.inc
     - wget "https://bitbucket.org/GoD_Tony/updater/raw/default/include/updater.inc" -O include/updater.inc
     - wget "https://raw.githubusercontent.com/Flyflo/SM-Goomba-Stomp/master/addons/sourcemod/scripting/include/goomba.inc" -O include/goomba.inc
     - wget "https://forums.alliedmods.net/attachment.php?attachmentid=115795&d=1360508618" -O include/rtd.inc

addons/sourcemod/scripting/freak_fortress_2.sp

@@ -36,10 +36,10 @@ Updated by Wliu, Chris, Lawd, and Carge after Powerlord quit FF2
 
 #define MAJOR_REVISION "1"
 #define MINOR_REVISION "10"
-#define STABLE_REVISION "13"
-//#define DEV_REVISION "Beta"
+#define STABLE_REVISION "14"
+#define DEV_REVISION "Beta"
 #if !defined DEV_REVISION
-	#define PLUGIN_VERSION MAJOR_REVISION..."."...MINOR_REVISION..."."...STABLE_REVISION  //1.10.13
+	#define PLUGIN_VERSION MAJOR_REVISION..."."...MINOR_REVISION..."."...STABLE_REVISION  //1.10.14
 #else
 	#define PLUGIN_VERSION MAJOR_REVISION..."."...MINOR_REVISION..."."...STABLE_REVISION..." "...DEV_REVISION
 #endif
@@ -298,7 +298,8 @@ static const String:ff2versiontitles[][]=
 	"1.10.10",
 	"1.10.11",
 	"1.10.12",
-	"1.10.13"
+	"1.10.13",
+	"1.10.14"
 };
 
 static const String:ff2versiondates[][]=
@@ -379,13 +380,20 @@ static const String:ff2versiondates[][]=
 	"August 1, 2016",		//1.10.10
 	"August 1, 2016",		//1.10.11
 	"August 4, 2016",		//1.10.12
-	"September 1, 2016"		//1.10.13
+	"September 1, 2016",	//1.10.13
+	"October 21, 2016"		//1.10.14
 };
 
 stock FindVersionData(Handle:panel, versionIndex)
 {
 	switch(versionIndex)
 	{
+		case 77:  //1.10.14
+		{
+			DrawPanelText(panel, "1) Fixed minions occasionally spawning on the wrong team (Wliu from various)");
+			DrawPanelText(panel, "2) Fixed ff2_start_music at the start of the round causing music to overlap (naydef)");
+			DrawPanelText(panel, "3) Fixed new clients not hearing music in certain circumstances (naydef)");
+		}
 		case 76:  //1.10.13
 		{
 			DrawPanelText(panel, "1) Fixed insta-backstab issues (Wliu from tom0034)");
@@ -2920,6 +2928,7 @@ public Action:Timer_PrepareBGM(Handle:timer, any:userid)
 			{
 				if(playBGM[client])
 				{
+					StopMusic(client);
 					PlayBGM(client);
 				}
 				else if(MusicTimer[client]!=INVALID_HANDLE)
@@ -2941,6 +2950,7 @@ public Action:Timer_PrepareBGM(Handle:timer, any:userid)
 	{
 		if(playBGM[client])
 		{
+			StopMusic(client);
 			PlayBGM(client);
 		}
 		else if(MusicTimer[client]!=INVALID_HANDLE)
@@ -4526,15 +4536,20 @@ public OnClientPostAdminCheck(client)
 		}
 	}
 
-	if(Enabled)
+	//We use the 0th index here because client indices can change.
+	//If this is false that means music is disabled for all clients, so don't play it for new clients either.
+	if(playBGM[0])
 	{
-		//We use the 0th index here because client indices can change.
-		//If this is false that means music is disabled for all clients, so don't play it for new clients either.
-		if(playBGM[0])
+		playBGM[client]=true;
+		if(Enabled)
 		{
 			CreateTimer(0.0, Timer_PrepareBGM, GetClientUserId(client), TIMER_FLAG_NO_MAPCHANGE);
 		}
 	}
+	else
+	{
+		playBGM[client]=false;
+	}
 }
 
 public OnClientDisconnect(client)
@@ -4565,7 +4580,6 @@ public OnClientDisconnect(client)
 	FF2flags[client]=0;
 	Damage[client]=0;
 	uberTarget[client]=-1;
-	playBGM[client]=true;
 
 	if(MusicTimer[client]!=INVALID_HANDLE)
 	{

addons/sourcemod/scripting/freaks/ff2_1st_set_abilities.sp

@@ -114,7 +114,7 @@ public Action:OnRoundEnd(Handle:event, const String:name[], bool:dontBroadcast)
 		if(IsClientInGame(client) && CloneOwnerIndex[client]!=-1 && GetClientTeam(client)==BossTeam)  //FIXME: IsClientInGame() shouldn't be needed
 		{
 			CloneOwnerIndex[client]=-1;
-			FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~(FF2FLAG_CLASSTIMERDISABLED|FF2FLAG_ALLOWSPAWNINBOSSTEAM));
+			FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~FF2FLAG_CLASSTIMERDISABLED);
 		}
 	}
 	return Plugin_Continue;
@@ -126,7 +126,7 @@ public OnClientDisconnect(client)
 	if(CloneOwnerIndex[client]!=-1)
 	{
 		CloneOwnerIndex[client]=-1;
-		FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~(FF2FLAG_CLASSTIMERDISABLED|FF2FLAG_ALLOWSPAWNINBOSSTEAM));
+		FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~FF2FLAG_CLASSTIMERDISABLED);
 	}
 }
 
@@ -870,7 +870,7 @@ public Action:OnPlayerDeath(Handle:event, const String:name[], bool:dontBroadcas
 			if(CloneOwnerIndex[target]==boss)
 			{
 				CloneOwnerIndex[target]=-1;
-				FF2_SetFF2flags(target, FF2_GetFF2flags(target) & ~(FF2FLAG_CLASSTIMERDISABLED|FF2FLAG_ALLOWSPAWNINBOSSTEAM));
+				FF2_SetFF2flags(target, FF2_GetFF2flags(target) & ~FF2FLAG_CLASSTIMERDISABLED);
 				if(IsClientInGame(target) && GetClientTeam(target)==BossTeam)
 				{
 					ChangeClientTeam(target, (BossTeam==_:TFTeam_Blue) ? (_:TFTeam_Red) : (_:TFTeam_Blue));
@@ -882,7 +882,7 @@ public Action:OnPlayerDeath(Handle:event, const String:name[], bool:dontBroadcas
 	if(CloneOwnerIndex[client]!=-1 && GetClientTeam(client)==BossTeam)  //Switch clones back to the other team after they die
 	{
 		CloneOwnerIndex[client]=-1;
-		FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~(FF2FLAG_CLASSTIMERDISABLED|FF2FLAG_ALLOWSPAWNINBOSSTEAM));
+		FF2_SetFF2flags(client, FF2_GetFF2flags(client) & ~FF2FLAG_CLASSTIMERDISABLED);
 		ChangeClientTeam(client, (BossTeam==_:TFTeam_Blue) ? (_:TFTeam_Red) : (_:TFTeam_Blue));
 	}
 	return Plugin_Continue;

update.txt

@@ -4,13 +4,13 @@
 	{
 		"Version"
 		{
-			"Latest"	"1.10.13"
-			"Previous"	"1.10.12"
+			"Latest"	"1.10.14"
+			"Previous"	"1.10.13"
 		}
 
-		"Notes"			"Fixed insta-backstab issues"
-		"Notes"			"Fixed team-changing exploit"
-		"Notes"			"[Server] Fixed an error message logging the wrong values"
+		"Notes"			"Fixed minions occasionally spawning on the wrong team"
+		"Notes"			"Fixed ff2_start_music at the start of the round causing music to overlap"
+		"Notes"			"Fixed new clients not hearing music in certain circumstances"
 	}
 
 	"Files"