mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 06:40:09 +00:00
Code Issues Projects Releases Wiki Activity

Add a new option to show arrow damage (feature #2923)

Browse Source
This commit is contained in:
Andrei Kortunov 2017-03-18 08:07:36 +04:00
parent eb81ab5b24
commit 1286754fb3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwclass/weapon.cpp
View File

@ -1,6 +1,7 @@
#include "weapon.hpp" #include "weapon.hpp"
#include <components/esm/loadweap.hpp> #include <components/esm/loadweap.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
@ -261,8 +262,8 @@ namespace MWClass
std::string text; std::string text;
// weapon type & damage. arrows / bolts don't have his info. // weapon type & damage
if (ref->mBase->mData.mType < 12) if ((ref->mBase->mData.mType < 12 || Settings::Manager::getBool("show projectile damage", "Game")) && ref->mBase->mData.mType < 14)
{ {
text += "\n#{sType} "; text += "\n#{sType} ";
@ -279,6 +280,8 @@ namespace MWClass
mapping[ESM::Weapon::MarksmanBow] = std::make_pair("sSkillMarksman", ""); mapping[ESM::Weapon::MarksmanBow] = std::make_pair("sSkillMarksman", "");
mapping[ESM::Weapon::MarksmanCrossbow] = std::make_pair("sSkillMarksman", ""); mapping[ESM::Weapon::MarksmanCrossbow] = std::make_pair("sSkillMarksman", "");
mapping[ESM::Weapon::MarksmanThrown] = std::make_pair("sSkillMarksman", ""); mapping[ESM::Weapon::MarksmanThrown] = std::make_pair("sSkillMarksman", "");
mapping[ESM::Weapon::Arrow] = std::make_pair("sSkillMarksman", "");
mapping[ESM::Weapon::Bolt] = std::make_pair("sSkillMarksman", "");
std::string type = mapping[ref->mBase->mData.mType].first; std::string type = mapping[ref->mBase->mData.mType].first;
std::string oneOrTwoHanded = mapping[ref->mBase->mData.mType].second; std::string oneOrTwoHanded = mapping[ref->mBase->mData.mType].second;

3
files/settings-default.cfg
View File

@ -146,6 +146,9 @@ crosshair = true
# no color, 1 is tool tip only, 2 is crosshair only, and 3 is both). # no color, 1 is tool tip only, 2 is crosshair only, and 3 is both).
show owned = 0 show owned = 0
# Show damage bonus of arrow and bolts.
show projectile damage = false
# Always use the best mode of attack: e.g. chop, slash or thrust. # Always use the best mode of attack: e.g. chop, slash or thrust.
best attack = false best attack = false