Merge branch 'master' of https://github.com/alliedmodders/sourcemod into mapchooser-updates

This commit is contained in:
Ross Bemrose 2015-01-09 09:42:07 -05:00
commit 691d891794
3 changed files with 13 additions and 7 deletions

View File

@ -119,15 +119,15 @@
}
"CalcIsAttackCriticalHelper"
{
"windows" "385"
"linux" "392"
"mac" "392"
"windows" "384"
"linux" "391"
"mac" "391"
}
"CalcIsAttackCriticalHelperNoCrits"
{
"windows" "386"
"linux" "393"
"mac" "393"
"windows" "385"
"linux" "392"
"mac" "392"
}
// CTFGameRules::IsHolidayActive

View File

@ -174,6 +174,11 @@ class Thread
if (!initialized_)
delete data;
}
~Thread() {
if (!Succeeded())
return;
pthread_detach(thread_);
}
bool Succeeded() const {
return initialized_;
@ -183,6 +188,7 @@ class Thread
if (!Succeeded())
return;
pthread_join(thread_, NULL);
initialized_ = false;
}
private:

View File

@ -21,7 +21,7 @@ Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
This file sure has gotten big.
sawce is rukia and loves anime, sushi, and macs
ur
she calls it a mayonegg
oh, it's so cute. she calls it a mayonegg
not me
javaliabuf64k..
"line 29" rhymes... kinda. <-- CONFIRMED