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

[Client] Update old comments for changes made by tes3mp

Browse source
This commit is contained in:
David Cernat 2018-05-26 05:11:41 +03:00
parent 416ee77639
commit c8ec77875c
2 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwscript/interpretercontext.cpp
View file

@ -270,12 +270,16 @@ namespace MWScript
bool InterpreterContext::menuMode() bool InterpreterContext::menuMode()
{ {
/* Disabled by tes3mp, because being in a menu should not pause scripts in it /*
Start of tes3mp change (major)
return MWBase::Environment::get().getWindowManager()->isGuiMode(); Being in a menu should not pause scripts in multiplayer, so always return false
*/ */
//return MWBase::Environment::get().getWindowManager()->isGuiMode();
return false; return false;
/*
End of tes3mp change (major)
*/
} }
int InterpreterContext::getGlobalShort (const std::string& name) const int InterpreterContext::getGlobalShort (const std::string& name) const
@ -672,10 +676,17 @@ namespace MWScript
Locals& locals = getMemberLocals (scriptId, global); Locals& locals = getMemberLocals (scriptId, global);
// Added by tes3mp so it can be reused by it /*
Start of tes3mp change (minor)
Declare an integer so it can be reused below for multiplayer script sync purposes
*/
int index = findLocalVariableIndex(scriptId, name, 's'); int index = findLocalVariableIndex(scriptId, name, 's');
locals.mShorts[index] = value; locals.mShorts[index] = value;
/*
End of tes3mp change (minor)
*/
/* /*
Start of tes3mp addition Start of tes3mp addition

34
apps/openmw/mwworld/worldimp.cpp
View file

@ -278,10 +278,11 @@ namespace MWWorld
{ {
ESM::Position pos; ESM::Position pos;
// Major change made by tes3mp /*
// Start of tes3mp change (major)
// If Pelagiad exists, spawn there; otherwise, spawn at 0,0
If Pelagiad exists, spawn there; otherwise, spawn at 0 ,0
*/
if (findExteriorPosition("Pelagiad", pos)) if (findExteriorPosition("Pelagiad", pos))
{ {
changeToExteriorCell(pos, true); changeToExteriorCell(pos, true);
@ -298,6 +299,9 @@ namespace MWWorld
pos.rot[2] = 0; pos.rot[2] = 0;
mWorldScene->changeToExteriorCell(pos, true); mWorldScene->changeToExteriorCell(pos, true);
} }
/*
End of tes3mp change (major)
*/
} }
} }
@ -2557,10 +2561,16 @@ namespace MWWorld
void World::hurtStandingActors(const ConstPtr &object, float healthPerSecond) void World::hurtStandingActors(const ConstPtr &object, float healthPerSecond)
{ {
/* Disabled by tes3mp, because being in a menu should not pause the game in it /*
Start of tes3mp change (major)
if (MWBase::Environment::get().getWindowManager()->isGuiMode()) Being in a menu should not prevent actors from being hurt in multiplayer,
return; so that check has been commented out
*/
//if (MWBase::Environment::get().getWindowManager()->isGuiMode())
// return;
/*
End of tes3mp change (major)
*/ */
std::vector<MWWorld::Ptr> actors; std::vector<MWWorld::Ptr> actors;
@ -2594,10 +2604,16 @@ namespace MWWorld
void World::hurtCollidingActors(const ConstPtr &object, float healthPerSecond) void World::hurtCollidingActors(const ConstPtr &object, float healthPerSecond)
{ {
/* Disabled by tes3mp, because being in a menu should not pause the game in it /*
Start of tes3mp change (major)
if (MWBase::Environment::get().getWindowManager()->isGuiMode()) Being in a menu should not prevent actors from being hurt in multiplayer,
return; so that check has been commented out
*/
//if (MWBase::Environment::get().getWindowManager()->isGuiMode())
// return;
/*
End of tes3mp change (major)
*/ */
std::vector<MWWorld::Ptr> actors; std::vector<MWWorld::Ptr> actors;