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

Apply elsid's suggestion and revert 3a888ef543cf2c2a2cc0fce5bff6449a76d57047

Browse Source
This commit is contained in:
Evil Eye 2023-06-10 22:04:14 +02:00
parent 583a0b4d04
commit 3c588900dd
3 changed files with 208 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

434
apps/openmw/mwmechanics/weapontype.cpp
View File

@ -18,325 +18,253 @@ namespace MWMechanics
template <> template <>
struct Weapon<ESM::Weapon::None> struct Weapon<ESM::Weapon::None>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "",
{ /* long group */ "",
static const ESM::WeaponType value{ /* short group */ "", /* sound ID */ "",
/* long group */ "", /* attach bone */ "",
/* sound ID */ "", /* sheath bone */ "",
/* attach bone */ "", /* usage skill */ ESM::Skill::HandToHand,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::HandToHand, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ 0 };
/* ammo type */ ESM::Weapon::None,
/* flags */ 0 };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::PickProbe> struct Weapon<ESM::Weapon::PickProbe>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1h",
{ /* long group */ "pickprobe",
static const ESM::WeaponType value{ /* short group */ "1h", /* sound ID */ "",
/* long group */ "pickprobe", /* attach bone */ "",
/* sound ID */ "", /* sheath bone */ "",
/* attach bone */ "", /* usage skill */ ESM::Skill::Security,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::Security, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ 0 };
/* ammo type */ ESM::Weapon::None,
/* flags */ 0 };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::Spell> struct Weapon<ESM::Weapon::Spell>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "spell",
{ /* long group */ "spellcast",
static const ESM::WeaponType value{ /* short group */ "spell", /* sound ID */ "",
/* long group */ "spellcast", /* attach bone */ "",
/* sound ID */ "", /* sheath bone */ "",
/* attach bone */ "", /* usage skill */ ESM::Skill::HandToHand,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::HandToHand, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::HandToHand> struct Weapon<ESM::Weapon::HandToHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "hh",
{ /* long group */ "handtohand",
static const ESM::WeaponType value{ /* short group */ "hh", /* sound ID */ "",
/* long group */ "handtohand", /* attach bone */ "",
/* sound ID */ "", /* sheath bone */ "",
/* attach bone */ "", /* usage skill */ ESM::Skill::HandToHand,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::HandToHand, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::ShortBladeOneHand> struct Weapon<ESM::Weapon::ShortBladeOneHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1s",
{ /* long group */ "shortbladeonehand",
static const ESM::WeaponType value{ /* short group */ "1s", /* sound ID */ "Item Weapon Shortblade",
/* long group */ "shortbladeonehand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Shortblade", /* sheath bone */ "Bip01 ShortBladeOneHand",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::ShortBlade,
/* sheath bone */ "Bip01 ShortBladeOneHand", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::ShortBlade, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::LongBladeOneHand> struct Weapon<ESM::Weapon::LongBladeOneHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1h",
{ /* long group */ "weapononehand",
static const ESM::WeaponType value{ /* short group */ "1h", /* sound ID */ "Item Weapon Longblade",
/* long group */ "weapononehand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Longblade", /* sheath bone */ "Bip01 LongBladeOneHand",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::LongBlade,
/* sheath bone */ "Bip01 LongBladeOneHand", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::LongBlade, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::BluntOneHand> struct Weapon<ESM::Weapon::BluntOneHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1b",
{ /* long group */ "bluntonehand",
static const ESM::WeaponType value{ /* short group */ "1b", /* sound ID */ "Item Weapon Blunt",
/* long group */ "bluntonehand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 BluntOneHand",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::BluntWeapon,
/* sheath bone */ "Bip01 BluntOneHand", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::BluntWeapon, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::AxeOneHand> struct Weapon<ESM::Weapon::AxeOneHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1b",
{ /* long group */ "bluntonehand",
static const ESM::WeaponType value{ /* short group */ "1b", /* sound ID */ "Item Weapon Blunt",
/* long group */ "bluntonehand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 LongBladeOneHand",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::Axe,
/* sheath bone */ "Bip01 LongBladeOneHand", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::Axe, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::LongBladeTwoHand> struct Weapon<ESM::Weapon::LongBladeTwoHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "2c",
{ /* long group */ "weapontwohand",
static const ESM::WeaponType value{ /* short group */ "2c", /* sound ID */ "Item Weapon Longblade",
/* long group */ "weapontwohand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Longblade", /* sheath bone */ "Bip01 LongBladeTwoClose",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::LongBlade,
/* sheath bone */ "Bip01 LongBladeTwoClose", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::LongBlade, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::AxeTwoHand> struct Weapon<ESM::Weapon::AxeTwoHand>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "2b",
{ /* long group */ "blunttwohand",
static const ESM::WeaponType value{ /* short group */ "2b", /* sound ID */ "Item Weapon Blunt",
/* long group */ "blunttwohand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 AxeTwoClose",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::Axe,
/* sheath bone */ "Bip01 AxeTwoClose", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::Axe, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::BluntTwoClose> struct Weapon<ESM::Weapon::BluntTwoClose>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "2b",
{ /* long group */ "blunttwohand",
static const ESM::WeaponType value{ /* short group */ "2b", /* sound ID */ "Item Weapon Blunt",
/* long group */ "blunttwohand", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 BluntTwoClose",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::BluntWeapon,
/* sheath bone */ "Bip01 BluntTwoClose", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::BluntWeapon, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::BluntTwoWide> struct Weapon<ESM::Weapon::BluntTwoWide>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "2w",
{ /* long group */ "weapontwowide",
static const ESM::WeaponType value{ /* short group */ "2w", /* sound ID */ "Item Weapon Blunt",
/* long group */ "weapontwowide", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 BluntTwoWide",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::BluntWeapon,
/* sheath bone */ "Bip01 BluntTwoWide", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::BluntWeapon, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::SpearTwoWide> struct Weapon<ESM::Weapon::SpearTwoWide>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "2w",
{ /* long group */ "weapontwowide",
static const ESM::WeaponType value{ /* short group */ "2w", /* sound ID */ "Item Weapon Spear",
/* long group */ "weapontwowide", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Spear", /* sheath bone */ "Bip01 SpearTwoWide",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::Spear,
/* sheath bone */ "Bip01 SpearTwoWide", /* weapon class*/ ESM::WeaponType::Melee,
/* usage skill */ ESM::Skill::Spear, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Melee, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::None,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::MarksmanBow> struct Weapon<ESM::Weapon::MarksmanBow>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "bow",
{ /* long group */ "bowandarrow",
static const ESM::WeaponType value{ /* short group */ "bow", /* sound ID */ "Item Weapon Bow",
/* long group */ "bowandarrow", /* attach bone */ "Weapon Bone Left",
/* sound ID */ "Item Weapon Bow", /* sheath bone */ "Bip01 MarksmanBow",
/* attach bone */ "Weapon Bone Left", /* usage skill */ ESM::Skill::Marksman,
/* sheath bone */ "Bip01 MarksmanBow", /* weapon class*/ ESM::WeaponType::Ranged,
/* usage skill */ ESM::Skill::Marksman, /* ammo type */ ESM::Weapon::Arrow,
/* weapon class*/ ESM::WeaponType::Ranged, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::Arrow,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::MarksmanCrossbow> struct Weapon<ESM::Weapon::MarksmanCrossbow>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "crossbow",
{ /* long group */ "crossbow",
static const ESM::WeaponType value{ /* short group */ "crossbow", /* sound ID */ "Item Weapon Crossbow",
/* long group */ "crossbow", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Crossbow", /* sheath bone */ "Bip01 MarksmanCrossbow",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::Marksman,
/* sheath bone */ "Bip01 MarksmanCrossbow", /* weapon class*/ ESM::WeaponType::Ranged,
/* usage skill */ ESM::Skill::Marksman, /* ammo type */ ESM::Weapon::Bolt,
/* weapon class*/ ESM::WeaponType::Ranged, /* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
/* ammo type */ ESM::Weapon::Bolt,
/* flags */ ESM::WeaponType::HasHealth | ESM::WeaponType::TwoHanded };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::MarksmanThrown> struct Weapon<ESM::Weapon::MarksmanThrown>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "1t",
{ /* long group */ "throwweapon",
static const ESM::WeaponType value{ /* short group */ "1t", /* sound ID */ "Item Weapon Blunt",
/* long group */ "throwweapon", /* attach bone */ "Weapon Bone",
/* sound ID */ "Item Weapon Blunt", /* sheath bone */ "Bip01 MarksmanThrown",
/* attach bone */ "Weapon Bone", /* usage skill */ ESM::Skill::Marksman,
/* sheath bone */ "Bip01 MarksmanThrown", /* weapon class*/ ESM::WeaponType::Thrown,
/* usage skill */ ESM::Skill::Marksman, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Thrown, /* flags */ 0 };
/* ammo type */ ESM::Weapon::None,
/* flags */ 0 };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::Arrow> struct Weapon<ESM::Weapon::Arrow>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "",
{ /* long group */ "",
static const ESM::WeaponType value{ /* short group */ "", /* sound ID */ "Item Ammo",
/* long group */ "", /* attach bone */ "Bip01 Arrow",
/* sound ID */ "Item Ammo", /* sheath bone */ "",
/* attach bone */ "Bip01 Arrow", /* usage skill */ ESM::Skill::Marksman,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Ammo,
/* usage skill */ ESM::Skill::Marksman, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Ammo, /* flags */ 0 };
/* ammo type */ ESM::Weapon::None,
/* flags */ 0 };
return value;
}
}; };
template <> template <>
struct Weapon<ESM::Weapon::Bolt> struct Weapon<ESM::Weapon::Bolt>
{ {
inline static const ESM::WeaponType& getValue() inline static const ESM::WeaponType sValue{ /* short group */ "",
{ /* long group */ "",
static const ESM::WeaponType value{ /* short group */ "", /* sound ID */ "Item Ammo",
/* long group */ "", /* attach bone */ "ArrowBone",
/* sound ID */ "Item Ammo", /* sheath bone */ "",
/* attach bone */ "ArrowBone", /* usage skill */ ESM::Skill::Marksman,
/* sheath bone */ "", /* weapon class*/ ESM::WeaponType::Ammo,
/* usage skill */ ESM::Skill::Marksman, /* ammo type */ ESM::Weapon::None,
/* weapon class*/ ESM::WeaponType::Ammo, /* flags */ 0 };
/* ammo type */ ESM::Weapon::None,
/* flags */ 0 };
return value;
}
}; };
MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int* weaptype) MWWorld::ContainerStoreIterator getActiveWeapon(const MWWorld::Ptr& actor, int* weaptype)
@ -377,43 +305,43 @@ namespace MWMechanics
switch (static_cast<ESM::Weapon::Type>(weaponType)) switch (static_cast<ESM::Weapon::Type>(weaponType))
{ {
case ESM::Weapon::PickProbe: case ESM::Weapon::PickProbe:
return &Weapon<ESM::Weapon::PickProbe>::getValue(); return &Weapon<ESM::Weapon::PickProbe>::sValue;
case ESM::Weapon::HandToHand: case ESM::Weapon::HandToHand:
return &Weapon<ESM::Weapon::HandToHand>::getValue(); return &Weapon<ESM::Weapon::HandToHand>::sValue;
case ESM::Weapon::Spell: case ESM::Weapon::Spell:
return &Weapon<ESM::Weapon::Spell>::getValue(); return &Weapon<ESM::Weapon::Spell>::sValue;
case ESM::Weapon::None: case ESM::Weapon::None:
return &Weapon<ESM::Weapon::None>::getValue(); return &Weapon<ESM::Weapon::None>::sValue;
case ESM::Weapon::ShortBladeOneHand: case ESM::Weapon::ShortBladeOneHand:
return &Weapon<ESM::Weapon::ShortBladeOneHand>::getValue(); return &Weapon<ESM::Weapon::ShortBladeOneHand>::sValue;
case ESM::Weapon::LongBladeOneHand: case ESM::Weapon::LongBladeOneHand:
return &Weapon<ESM::Weapon::LongBladeOneHand>::getValue(); return &Weapon<ESM::Weapon::LongBladeOneHand>::sValue;
case ESM::Weapon::LongBladeTwoHand: case ESM::Weapon::LongBladeTwoHand:
return &Weapon<ESM::Weapon::LongBladeTwoHand>::getValue(); return &Weapon<ESM::Weapon::LongBladeTwoHand>::sValue;
case ESM::Weapon::BluntOneHand: case ESM::Weapon::BluntOneHand:
return &Weapon<ESM::Weapon::BluntOneHand>::getValue(); return &Weapon<ESM::Weapon::BluntOneHand>::sValue;
case ESM::Weapon::BluntTwoClose: case ESM::Weapon::BluntTwoClose:
return &Weapon<ESM::Weapon::BluntTwoClose>::getValue(); return &Weapon<ESM::Weapon::BluntTwoClose>::sValue;
case ESM::Weapon::BluntTwoWide: case ESM::Weapon::BluntTwoWide:
return &Weapon<ESM::Weapon::BluntTwoWide>::getValue(); return &Weapon<ESM::Weapon::BluntTwoWide>::sValue;
case ESM::Weapon::SpearTwoWide: case ESM::Weapon::SpearTwoWide:
return &Weapon<ESM::Weapon::SpearTwoWide>::getValue(); return &Weapon<ESM::Weapon::SpearTwoWide>::sValue;
case ESM::Weapon::AxeOneHand: case ESM::Weapon::AxeOneHand:
return &Weapon<ESM::Weapon::AxeOneHand>::getValue(); return &Weapon<ESM::Weapon::AxeOneHand>::sValue;
case ESM::Weapon::AxeTwoHand: case ESM::Weapon::AxeTwoHand:
return &Weapon<ESM::Weapon::AxeTwoHand>::getValue(); return &Weapon<ESM::Weapon::AxeTwoHand>::sValue;
case ESM::Weapon::MarksmanBow: case ESM::Weapon::MarksmanBow:
return &Weapon<ESM::Weapon::MarksmanBow>::getValue(); return &Weapon<ESM::Weapon::MarksmanBow>::sValue;
case ESM::Weapon::MarksmanCrossbow: case ESM::Weapon::MarksmanCrossbow:
return &Weapon<ESM::Weapon::MarksmanCrossbow>::getValue(); return &Weapon<ESM::Weapon::MarksmanCrossbow>::sValue;
case ESM::Weapon::MarksmanThrown: case ESM::Weapon::MarksmanThrown:
return &Weapon<ESM::Weapon::MarksmanThrown>::getValue(); return &Weapon<ESM::Weapon::MarksmanThrown>::sValue;
case ESM::Weapon::Arrow: case ESM::Weapon::Arrow:
return &Weapon<ESM::Weapon::Arrow>::getValue(); return &Weapon<ESM::Weapon::Arrow>::sValue;
case ESM::Weapon::Bolt: case ESM::Weapon::Bolt:
return &Weapon<ESM::Weapon::Bolt>::getValue(); return &Weapon<ESM::Weapon::Bolt>::sValue;
} }
return &Weapon<ESM::Weapon::ShortBladeOneHand>::getValue(); return &Weapon<ESM::Weapon::ShortBladeOneHand>::sValue;
} }
} }

28
components/esm3/loadskil.cpp
View File

@ -7,34 +7,6 @@
namespace ESM namespace ESM
{ {
const RefId Skill::Block = Skill::indexToRefId(0);
const RefId Skill::Armorer = Skill::indexToRefId(1);
const RefId Skill::MediumArmor = Skill::indexToRefId(2);
const RefId Skill::HeavyArmor = Skill::indexToRefId(3);
const RefId Skill::BluntWeapon = Skill::indexToRefId(4);
const RefId Skill::LongBlade = Skill::indexToRefId(5);
const RefId Skill::Axe = Skill::indexToRefId(6);
const RefId Skill::Spear = Skill::indexToRefId(7);
const RefId Skill::Athletics = Skill::indexToRefId(8);
const RefId Skill::Enchant = Skill::indexToRefId(9);
const RefId Skill::Destruction = Skill::indexToRefId(10);
const RefId Skill::Alteration = Skill::indexToRefId(11);
const RefId Skill::Illusion = Skill::indexToRefId(12);
const RefId Skill::Conjuration = Skill::indexToRefId(13);
const RefId Skill::Mysticism = Skill::indexToRefId(14);
const RefId Skill::Restoration = Skill::indexToRefId(15);
const RefId Skill::Alchemy = Skill::indexToRefId(16);
const RefId Skill::Unarmored = Skill::indexToRefId(17);
const RefId Skill::Security = Skill::indexToRefId(18);
const RefId Skill::Sneak = Skill::indexToRefId(19);
const RefId Skill::Acrobatics = Skill::indexToRefId(20);
const RefId Skill::LightArmor = Skill::indexToRefId(21);
const RefId Skill::ShortBlade = Skill::indexToRefId(22);
const RefId Skill::Marksman = Skill::indexToRefId(23);
const RefId Skill::Mercantile = Skill::indexToRefId(24);
const RefId Skill::Speechcraft = Skill::indexToRefId(25);
const RefId Skill::HandToHand = Skill::indexToRefId(26);
const std::string Skill::sSkillNames[Length] = { const std::string Skill::sSkillNames[Length] = {
"Block", "Block",
"Armorer", "Armorer",

54
components/esm3/loadskil.hpp
View File

@ -48,33 +48,33 @@ namespace ESM
std::string mIcon; std::string mIcon;
float mWerewolfValue{}; float mWerewolfValue{};
static const RefId Block; static constexpr IndexRefId Block{ sRecordId, 0 };
static const RefId Armorer; static constexpr IndexRefId Armorer{ sRecordId, 1 };
static const RefId MediumArmor; static constexpr IndexRefId MediumArmor{ sRecordId, 2 };
static const RefId HeavyArmor; static constexpr IndexRefId HeavyArmor{ sRecordId, 3 };
static const RefId BluntWeapon; static constexpr IndexRefId BluntWeapon{ sRecordId, 4 };
static const RefId LongBlade; static constexpr IndexRefId LongBlade{ sRecordId, 5 };
static const RefId Axe; static constexpr IndexRefId Axe{ sRecordId, 6 };
static const RefId Spear; static constexpr IndexRefId Spear{ sRecordId, 7 };
static const RefId Athletics; static constexpr IndexRefId Athletics{ sRecordId, 8 };
static const RefId Enchant; static constexpr IndexRefId Enchant{ sRecordId, 9 };
static const RefId Destruction; static constexpr IndexRefId Destruction{ sRecordId, 10 };
static const RefId Alteration; static constexpr IndexRefId Alteration{ sRecordId, 11 };
static const RefId Illusion; static constexpr IndexRefId Illusion{ sRecordId, 12 };
static const RefId Conjuration; static constexpr IndexRefId Conjuration{ sRecordId, 13 };
static const RefId Mysticism; static constexpr IndexRefId Mysticism{ sRecordId, 14 };
static const RefId Restoration; static constexpr IndexRefId Restoration{ sRecordId, 15 };
static const RefId Alchemy; static constexpr IndexRefId Alchemy{ sRecordId, 16 };
static const RefId Unarmored; static constexpr IndexRefId Unarmored{ sRecordId, 17 };
static const RefId Security; static constexpr IndexRefId Security{ sRecordId, 18 };
static const RefId Sneak; static constexpr IndexRefId Sneak{ sRecordId, 19 };
static const RefId Acrobatics; static constexpr IndexRefId Acrobatics{ sRecordId, 20 };
static const RefId LightArmor; static constexpr IndexRefId LightArmor{ sRecordId, 21 };
static const RefId ShortBlade; static constexpr IndexRefId ShortBlade{ sRecordId, 22 };
static const RefId Marksman; static constexpr IndexRefId Marksman{ sRecordId, 23 };
static const RefId Mercantile; static constexpr IndexRefId Mercantile{ sRecordId, 24 };
static const RefId Speechcraft; static constexpr IndexRefId Speechcraft{ sRecordId, 25 };
static const RefId HandToHand; static constexpr IndexRefId HandToHand{ sRecordId, 26 };
static constexpr int Length = 27; static constexpr int Length = 27;
static const std::string sSkillNames[Length]; static const std::string sSkillNames[Length];