mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-07 02:15:32 +00:00
Code Issues Releases Wiki Activity

Add an option to restore MCP-like movement behavior

Browse source
This commit is contained in:
Capostrophic 2019-04-17 17:51:18 +03:00
parent c7ac06b960
commit 34ea9ea813
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/advancedpage.cpp
View file

@ -81,6 +81,7 @@ bool Launcher::AdvancedPage::loadSettings()
unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex); unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game"); loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game"); loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
// Input Settings // Input Settings
loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input"); loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
@ -141,6 +142,7 @@ void Launcher::AdvancedPage::saveSettings()
mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex); mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game"); saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game");
saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game"); saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
saveSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game");
// Input Settings // Input Settings
saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input"); saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");

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

@ -2372,7 +2372,7 @@ void CharacterController::update(float duration, bool animationOnly)
moved.x() *= scale; moved.x() *= scale;
moved.y() *= scale; moved.y() *= scale;
if(mPtr.getClass().isNpc()) if (mPtr.getClass().isNpc() && !Settings::Manager::getBool("normalise race speed", "Game"))
{ {
const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase; const ESM::NPC* npc = mPtr.get<ESM::NPC>()->mBase;
const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace); const ESM::Race* race = world->getStore().get<ESM::Race>().find(npc->mRace);

3
files/settings-default.cfg
View file

@ -261,6 +261,9 @@ only appropriate ammunition bypasses resistance = false
# Use casting animations for magic items, just as for spells # Use casting animations for magic items, just as for spells
use magic item animations = false use magic item animations = false
# Don't use race weight in NPC movement speed calculations
normalise race speed = false
[General] [General]
# Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16). # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).

10
files/ui/advancedpage.ui
View file

@ -159,6 +159,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="normaliseRaceSpeedCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don't use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Normalise race speed</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>