mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-14 00:09:41 +00:00
Merge remote-tracking branch 'greye/rc0-17'
This commit is contained in:
commit
e9b80c34fe
5 changed files with 6 additions and 16 deletions
apps/openmw
|
@ -254,7 +254,6 @@ namespace MWBase
|
|||
virtual bool toggleVanityMode(bool enable, bool force) = 0;
|
||||
virtual void allowVanityMode(bool allow) = 0;
|
||||
virtual void togglePlayerLooking(bool enable) = 0;
|
||||
virtual bool isVanityEnabled() = 0;
|
||||
|
||||
virtual void renderPlayer() = 0;
|
||||
};
|
||||
|
|
|
@ -107,10 +107,6 @@ namespace MWRender
|
|||
void getSightAngles(float &pitch, float &yaw);
|
||||
|
||||
void togglePlayerLooking(bool enable);
|
||||
|
||||
bool isVanityEnabled() {
|
||||
return mVanity.enabled;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -68,10 +68,6 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
|
|||
return mPlayer->toggleVanityMode(enable, force);
|
||||
}
|
||||
|
||||
bool isVanityEnabled() {
|
||||
return mPlayer->isVanityEnabled();
|
||||
}
|
||||
|
||||
void allowVanityMode(bool allow) {
|
||||
mPlayer->allowVanityMode(allow);
|
||||
}
|
||||
|
|
|
@ -209,6 +209,8 @@ namespace MWScript
|
|||
|
||||
class OpToggleVanityMode : public Interpreter::Opcode0
|
||||
{
|
||||
static bool sActivate;
|
||||
|
||||
public:
|
||||
|
||||
virtual void execute(Interpreter::Runtime &runtime)
|
||||
|
@ -219,16 +221,17 @@ namespace MWScript
|
|||
MWBase::World *world =
|
||||
MWBase::Environment::get().getWorld();
|
||||
|
||||
bool value = !world->isVanityEnabled();
|
||||
if (world->toggleVanityMode(value, true)) {
|
||||
if (world->toggleVanityMode(sActivate, true)) {
|
||||
context.report(
|
||||
(value) ? "Vanity Mode -> On" : "Vanity Mode -> Off"
|
||||
(sActivate) ? "Vanity Mode -> On" : "Vanity Mode -> Off"
|
||||
);
|
||||
sActivate = !sActivate;
|
||||
} else {
|
||||
context.report("Vanity Mode -> No");
|
||||
}
|
||||
}
|
||||
};
|
||||
bool OpToggleVanityMode::sActivate = true;
|
||||
|
||||
const int opcodeXBox = 0x200000c;
|
||||
const int opcodeOnActivate = 0x200000d;
|
||||
|
|
|
@ -298,10 +298,6 @@ namespace MWWorld
|
|||
}
|
||||
|
||||
virtual void renderPlayer();
|
||||
|
||||
virtual bool isVanityEnabled() {
|
||||
return mRendering->isVanityEnabled();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue