Merge from 1.2 branch.

core/PlayerManager.cpp

@@ -1327,6 +1327,11 @@ void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
 
 void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ )
 {
+	if (!m_FirstPass)
+	{
+		return;
+	}
+
 	if (newvalue == -1)
 	{
 		newvalue = gpGlobals->maxClients;

extensions/clientprefs/cookie.h

@@ -141,7 +141,7 @@ public:
 
 private:
 	KTrie<Cookie *> cookieTrie;
-	SourceHook::List<CookieData *> clientData[MAXCLIENTS];
+	SourceHook::List<CookieData *> clientData[MAXCLIENTS+1];
 
 	bool connected[MAXCLIENTS+1];
 	bool statsLoaded[MAXCLIENTS+1];

gamedata/core.games/common.games.txt

@@ -126,7 +126,6 @@
 			"game"					"pvkii"
 			"game"					"diprip"
 			"game"					"synergy"
-			"game"					"FortressForever"
 			"game"					"left4dead"
 			"game"					"obsidian"
 			"game"					"ageofchivalry"

tools/buildbot/bootstrap.pl

@@ -57,7 +57,12 @@ if ($^O eq "linux")
     Build::Command("flip -u tools/versionchanger.pl");
     Build::Command("chmod +x tools/versionchanger.pl");
 }
-Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');
+my ($build_type);
+$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type'));
+if ($build_type == "dev")
+{
+	Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');
+}
 
 #Bootstrap extensions that have complex dependencies
 

tools/buildbot/build_type

@@ -0,0 +1 @@
+dev

tools/buildbot/helpers.pm

@@ -142,4 +142,15 @@ sub SVN_Add
 	chdir($dir);
 }
 
+sub GetBuildType
+{
+	my ($file)=(@_);
+	my ($type);
+	open(TYPE, $file) or die("Could not open file: $!\n");
+	$type = <TYPE>;
+	close(TYPE);
+	chomp $type;
+	return $type;
+}
+
 return 1;

tools/buildbot/symstore.pl

@@ -22,13 +22,25 @@ my ($version);
 $version = Build::ProductVersion(Build::PathFormat('product.version'));
 $version .= '-hg' . Build::HgRevNum('.');
 
+my ($build_type);
+$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type'));
+
+if ($build_type == "dev")
+{
+	$build_type = "buildbot";
+}
+elsif ($build_type == "rel")
+{
+	$build_type = "release";
+}
+
 my ($line);
 while (<PDBLOG>)
 {
 	$line = $_;
 	$line =~ s/\.pdb/\*/;
 	chomp $line;
-	Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"buildbot\"");
+	Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\"");
 }
 
 close(PDBLOG);