Merge branch 'master' of https://github.com/alliedmodders/sourcemod into mapchooser-updates
This commit is contained in:
commit
691d891794
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user