mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 09:39:41 +00:00
Code Issues Releases Wiki Activity

fiddlings

Browse source
This commit is contained in:
mckibbenta 2013-08-29 20:25:36 -04:00
parent 60fa69139e
commit eef9df504a
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/actors.cpp
View file

@ -272,7 +272,7 @@ namespace MWMechanics
// workaround: always keep player alive for now // workaround: always keep player alive for now
// \todo remove workaround, once player death can be handled // \todo remove workaround, once player death can be handled
if(iter->first.getRefData().getHandle()=="player") if(iter->first.getRefData().getHandle()=="player" && false)
{ {
MWMechanics::DynamicStat<float> stat(stats.getHealth()); MWMechanics::DynamicStat<float> stat(stats.getHealth());

3
apps/openmw/mwscript/miscextensions.cpp
View file

@ -726,8 +726,7 @@ namespace MWScript
bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode(); bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode();
// context.report (enabled ? "God Mode -> On" : "God Mode -> Off"); context.report (enabled ? "God Mode -> On" : "God Mode -> Off");
context.report("Unimplemented");
} }
}; };

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

@ -170,7 +170,7 @@ namespace MWWorld
mSky (true), mCells (mStore, mEsm), mSky (true), mCells (mStore, mEsm),
mActivationDistanceOverride (mActivationDistanceOverride), mActivationDistanceOverride (mActivationDistanceOverride),
mFallback(fallbackMap), mPlayIntro(0), mTeleportEnabled(true), mFallback(fallbackMap), mPlayIntro(0), mTeleportEnabled(true),
mFacedDistance(FLT_MAX) mFacedDistance(FLT_MAX), mGodMode(false)
{ {
mPhysics = new PhysicsSystem(renderer); mPhysics = new PhysicsSystem(renderer);
mPhysEngine = mPhysics->getEngine(); mPhysEngine = mPhysics->getEngine();
@ -1945,7 +1945,12 @@ namespace MWWorld
bool World::toggleGodMode() bool World::toggleGodMode()
{ {
return false; if (mGodMode)
mGodMode = false;
else
mGodMode = true;
return mGodMode;
} }
} }

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -68,6 +68,8 @@ namespace MWWorld
OEngine::Physic::PhysicEngine* mPhysEngine; OEngine::Physic::PhysicEngine* mPhysEngine;
bool mGodMode;
// not implemented // not implemented
World (const World&); World (const World&);
World& operator= (const World&); World& operator= (const World&);