mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix tooltips in the main menu

Browse Source
This commit is contained in:
Andrei Kortunov 2024-01-19 15:16:46 +04:00
parent 6ead5f9321
commit b37aee21e3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/engine.cpp
View File

@ -321,11 +321,7 @@ bool OMW::Engine::frame(float frametime)
// update GUI by world data // update GUI by world data
{ {
ScopedProfile<UserStatsType::WindowManager> profile(frameStart, frameNumber, *timer, *stats); ScopedProfile<UserStatsType::WindowManager> profile(frameStart, frameNumber, *timer, *stats);
mWorld->updateWindowManager();
if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
{
mWorld->updateWindowManager();
}
} }
mLuaWorker->allowUpdate(); // if there is a separate Lua thread, it starts the update now mLuaWorker->allowUpdate(); // if there is a separate Lua thread, it starts the update now

4
apps/openmw/mwworld/worldimp.cpp
View File

@ -60,6 +60,7 @@
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"
#include "../mwbase/scriptmanager.hpp" #include "../mwbase/scriptmanager.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwbase/statemanager.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
@ -997,6 +998,9 @@ namespace MWWorld
{ {
MWWorld::Ptr facedObject; MWWorld::Ptr facedObject;
if (MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame)
return facedObject;
if (MWBase::Environment::get().getWindowManager()->isGuiMode() if (MWBase::Environment::get().getWindowManager()->isGuiMode()
&& MWBase::Environment::get().getWindowManager()->isConsoleMode()) && MWBase::Environment::get().getWindowManager()->isConsoleMode())
facedObject = getFacedObject(getMaxActivationDistance() * 50, false); facedObject = getFacedObject(getMaxActivationDistance() * 50, false);