krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Don't advance time when waiting, traveling, training or jailed

Browse source
This commit is contained in:
David Cernat 2018-05-23 05:49:51 +03:00
parent 02ba641bef
commit 031a80ed5a
4 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/jailscreen.cpp
View file

@ -124,7 +124,16 @@ namespace MWGui
for (int i=0; i<mDays*24; ++i) for (int i=0; i<mDays*24; ++i)
MWBase::Environment::get().getMechanicsManager()->rest(true); MWBase::Environment::get().getMechanicsManager()->rest(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<int> skills; std::set<int> skills;
for (int day=0; day<mDays; ++day) for (int day=0; day<mDays; ++day)

11
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -194,7 +194,16 @@ namespace MWGui
// advance time // advance time
MWBase::Environment::get().getMechanicsManager()->rest(false); MWBase::Environment::get().getMechanicsManager()->rest(false);
MWBase::Environment::get().getMechanicsManager()->rest(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); setVisible(false);
mProgressBar.setVisible(true); mProgressBar.setVisible(true);

11
apps/openmw/mwgui/travelwindow.cpp
View file

@ -177,7 +177,16 @@ namespace MWGui
{ {
MWBase::Environment::get().getMechanicsManager ()->rest (true); 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); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Travel);

11
apps/openmw/mwgui/waitdialog.cpp
View file

@ -228,7 +228,16 @@ namespace MWGui
{ {
mProgressBar.setProgress(cur, total); mProgressBar.setProgress(cur, total);
MWBase::Environment::get().getMechanicsManager()->rest(mSleeping); 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(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
if (player.getClass().getCreatureStats(player).isDead()) if (player.getClass().getCreatureStats(player).isDead())