diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index ea04e3b3c..ffae131ca 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -384,16 +384,7 @@ bool OMW::Engine::frame(float frametime) { double hours = (frametime * mEnvironment.getWorld()->getTimeScaleFactor()) / 3600.0; mEnvironment.getWorld()->advanceTime(hours, true); - - /* - Start of tes3mp change (major) - - Don't unilaterally recharge world items on clients - */ - //mEnvironment.getWorld()->rechargeItems(frametime, true); - /* - End of tes3mp change (major) - */ + mEnvironment.getWorld()->rechargeItems(frametime, true); } } } diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 99fab075d..ec7a8572b 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -3916,6 +3916,12 @@ namespace MWWorld MWWorld::Ptr player = getPlayerPtr(); player.getClass().getInventoryStore(player).rechargeItems(duration); + /* + Start of tes3mp change (major) + + Don't unilaterally recharge world items on clients + */ + /* if (activeOnly) { for (auto &cell : mWorldScene->getActiveCells()) @@ -3925,6 +3931,10 @@ namespace MWWorld } else mCells.recharge(duration); + */ + /* + End of tes3mp change (major) + */ } void World::teleportToClosestMarker (const MWWorld::Ptr& ptr,