diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp index 7b3d87a7c..a86f9d176 100644 --- a/apps/openmw/mwgui/jailscreen.cpp +++ b/apps/openmw/mwgui/jailscreen.cpp @@ -124,7 +124,16 @@ namespace MWGui for (int i=0; irest(true); - MWBase::Environment::get().getWorld()->advanceTime(mDays * 24); + + /* + Start of tes3mp change (major) + + Multiplayer requires that time not get advanced here + */ + //MWBase::Environment::get().getWorld()->advanceTime(mDays * 24); + /* + End of tes3mp change (major) + */ std::set skills; for (int day=0; dayrest(false); MWBase::Environment::get().getMechanicsManager()->rest(false); - MWBase::Environment::get().getWorld ()->advanceTime (2); + + /* + Start of tes3mp change (major) + + Multiplayer requires that time not get advanced here + */ + //MWBase::Environment::get().getWorld ()->advanceTime (2); + /* + End of tes3mp change (major) + */ setVisible(false); mProgressBar.setVisible(true); diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index 7b65eb771..81c977bd0 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/apps/openmw/mwgui/travelwindow.cpp @@ -177,7 +177,16 @@ namespace MWGui { MWBase::Environment::get().getMechanicsManager ()->rest (true); } - MWBase::Environment::get().getWorld()->advanceTime(hours); + + /* + Start of tes3mp change (major) + + Multiplayer requires that time not get advanced here + */ + //MWBase::Environment::get().getWorld()->advanceTime(hours); + /* + End of tes3mp change (major) + */ } MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Travel); diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 61febf315..24eedd6ac 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -228,7 +228,16 @@ namespace MWGui { mProgressBar.setProgress(cur, total); MWBase::Environment::get().getMechanicsManager()->rest(mSleeping); - MWBase::Environment::get().getWorld()->advanceTime(1); + + /* + Start of tes3mp change (major) + + Multiplayer requires that time not get advanced here + */ + //MWBase::Environment::get().getWorld()->advanceTime(1); + /* + End of tes3mp change (major) + */ MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); if (player.getClass().getCreatureStats(player).isDead())