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

Fix formatting in Core.cpp

develop
Petr Mrázek 2011-08-07 08:41:46 +02:00
parent fedb6150f4
commit d93032de3b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Core.cpp
Unescape Escape View File

@ -430,6 +430,7 @@ bool Core::Init()
// create mutex for syncing with interactive tasks // create mutex for syncing with interactive tasks
StackMutex = new mutex(); StackMutex = new mutex();
AccessMutex = new mutex(); AccessMutex = new mutex();
misc_data_mutex=new mutex();
core_cond = new Core::Cond(); core_cond = new Core::Cond();
// create plugin manager // create plugin manager
plug_mgr = new PluginManager(this); plug_mgr = new PluginManager(this);
@ -442,7 +443,6 @@ bool Core::Init()
HotkeyMutex = new mutex(); HotkeyMutex = new mutex();
HotkeyCond = new condition_variable(); HotkeyCond = new condition_variable();
thread * HK = new thread(fHKthread, (void *) temp); thread * HK = new thread(fHKthread, (void *) temp);
misc_data_mutex=new mutex();
started = true; started = true;
return true; return true;
} }
@ -475,19 +475,19 @@ std::string Core::getHotkeyCmd( void )
return returner; return returner;
} }
void Core::RegisterData(void *p,std::string key) void Core::RegisterData( void *p, std::string key )
{ {
misc_data_mutex->lock(); misc_data_mutex->lock();
misc_data_map[key]=p; misc_data_map[key] = p;
misc_data_mutex->unlock(); misc_data_mutex->unlock();
} }
void *Core::GetData(std::string key) void *Core::GetData( std::string key )
{ {
misc_data_mutex->lock(); misc_data_mutex->lock();
std::map<std::string,void*>::iterator it=misc_data_map.find(key); std::map<std::string,void*>::iterator it=misc_data_map.find(key);
if (it!=misc_data_map.end()) if ( it != misc_data_map.end() )
{ {
void *p=it->second; void *p=it->second;
misc_data_mutex->unlock(); misc_data_mutex->unlock();