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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gamedata/sm-tf2.games.txt
View File

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

6
public/amtl/am-thread-posix.h
View File

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

2
pushbuild.txt
View File

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