UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 1.2 branch.

Browse Source
This commit is contained in:
David Anderson 2009-05-12 19:43:21 -04:00
commit 2af45da0a8
7 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/PlayerManager.cpp
View File

@ -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;

2
extensions/clientprefs/cookie.h
View File

@ -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];

1
gamedata/core.games/common.games.txt
View File

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

7
tools/buildbot/bootstrap.pl
View File

@ -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

1
tools/buildbot/build_type Normal file
View File

@ -0,0 +1 @@
dev

11
tools/buildbot/helpers.pm
View File

@ -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;

14
tools/buildbot/symstore.pl
View File

@ -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);