MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swaps static variable instantiation order in pause.cpp

develop
Josh Cooper 2022-10-13 23:22:51 -07:00
parent 5c785d4bd7
commit ffed499057
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/spectate/pause.cpp
Unescape Escape View File

@ -12,6 +12,9 @@ using namespace DFHack;
using namespace Pausing; using namespace Pausing;
using namespace df::enums; using namespace df::enums;
std::unordered_set<Lock*> PlayerLock::locks;
std::unordered_set<Lock*> AnnouncementLock::locks;
namespace pausing { namespace pausing {
AnnouncementLock announcementLock("monitor"); AnnouncementLock announcementLock("monitor");
PlayerLock playerLock("monitor"); PlayerLock playerLock("monitor");
@ -39,9 +42,6 @@ namespace pausing {
} }
using namespace pausing; using namespace pausing;
std::unordered_set<Lock*> PlayerLock::locks;
std::unordered_set<Lock*> AnnouncementLock::locks;
template<typename Locks> template<typename Locks>
inline bool any_lock(Locks locks) { inline bool any_lock(Locks locks) {
return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); }); return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });