immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed system mouse setting

master
krzys-h 2015-07-14 21:03:27 +02:00
parent 1183ed1980
commit a1a96c62ab
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/object/robotmain.cpp
View File

@ -283,6 +283,8 @@ void CRobotMain::Create(bool loadProfile)
m_engine->SetMovieLock(m_movieLock); m_engine->SetMovieLock(m_movieLock);
m_app->SetMouseMode(MOUSE_ENGINE);
m_movie->Flush(); m_movie->Flush();
FlushDisplayInfo(); FlushDisplayInfo();
@ -661,11 +663,6 @@ void CRobotMain::ChangePhase(Phase phase)
} }
} }
if (m_phase == PHASE_LOADING)
m_app->SetMouseMode(MOUSE_NONE);
else
m_app->SetMouseMode(MOUSE_ENGINE);
m_engine->LoadAllTextures(); m_engine->LoadAllTextures();
} }
@ -2553,8 +2550,6 @@ void CRobotMain::AbortMovie()
automat->Abort(); automat->Abort();
} }
} }
m_app->SetMouseMode(MOUSE_ENGINE);
} }
@ -5857,11 +5852,6 @@ void CRobotMain::SetMovieLock(bool lock)
CreateShortcuts(); CreateShortcuts();
m_map->ShowMap(!m_movieLock && m_mapShow); m_map->ShowMap(!m_movieLock && m_mapShow);
if (m_movieLock) HiliteClear(); if (m_movieLock) HiliteClear();
if (m_movieLock)
m_app->SetMouseMode(MOUSE_NONE);
else
m_app->SetMouseMode(MOUSE_ENGINE);
} }
bool CRobotMain::GetMovieLock() bool CRobotMain::GetMovieLock()