mirror of
https://github.com/OpenMW/openmw.git
synced 2025-04-01 19:36:40 +00:00
Place ESM4::ItemMod into the scene
This commit is contained in:
parent
9a6c2fd2cc
commit
03c3818229
9 changed files with 20 additions and 3 deletions
|
@ -11,6 +11,7 @@
|
||||||
#include <components/esm4/loaddoor.hpp>
|
#include <components/esm4/loaddoor.hpp>
|
||||||
#include <components/esm4/loadflor.hpp>
|
#include <components/esm4/loadflor.hpp>
|
||||||
#include <components/esm4/loadfurn.hpp>
|
#include <components/esm4/loadfurn.hpp>
|
||||||
|
#include <components/esm4/loadimod.hpp>
|
||||||
#include <components/esm4/loadingr.hpp>
|
#include <components/esm4/loadingr.hpp>
|
||||||
#include <components/esm4/loadligh.hpp>
|
#include <components/esm4/loadligh.hpp>
|
||||||
#include <components/esm4/loadmisc.hpp>
|
#include <components/esm4/loadmisc.hpp>
|
||||||
|
@ -84,6 +85,7 @@ namespace MWClass
|
||||||
ESM4Named<ESM4::Flora>::registerSelf();
|
ESM4Named<ESM4::Flora>::registerSelf();
|
||||||
ESM4Named<ESM4::Furniture>::registerSelf();
|
ESM4Named<ESM4::Furniture>::registerSelf();
|
||||||
ESM4Named<ESM4::Ingredient>::registerSelf();
|
ESM4Named<ESM4::Ingredient>::registerSelf();
|
||||||
|
ESM4Named<ESM4::ItemMod>::registerSelf();
|
||||||
ESM4Light::registerSelf();
|
ESM4Light::registerSelf();
|
||||||
ESM4Named<ESM4::MiscItem>::registerSelf();
|
ESM4Named<ESM4::MiscItem>::registerSelf();
|
||||||
ESM4Named<ESM4::MovableStatic>::registerSelf();
|
ESM4Named<ESM4::MovableStatic>::registerSelf();
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include <components/esm4/loaddoor.hpp>
|
#include <components/esm4/loaddoor.hpp>
|
||||||
#include <components/esm4/loadflor.hpp>
|
#include <components/esm4/loadflor.hpp>
|
||||||
#include <components/esm4/loadfurn.hpp>
|
#include <components/esm4/loadfurn.hpp>
|
||||||
|
#include <components/esm4/loadimod.hpp>
|
||||||
#include <components/esm4/loadingr.hpp>
|
#include <components/esm4/loadingr.hpp>
|
||||||
#include <components/esm4/loadligh.hpp>
|
#include <components/esm4/loadligh.hpp>
|
||||||
#include <components/esm4/loadmisc.hpp>
|
#include <components/esm4/loadmisc.hpp>
|
||||||
|
@ -232,6 +233,9 @@ namespace MWLua
|
||||||
case ESM::REC_FURN4:
|
case ESM::REC_FURN4:
|
||||||
cell.mStore->template forEachType<ESM4::Furniture>(visitor);
|
cell.mStore->template forEachType<ESM4::Furniture>(visitor);
|
||||||
break;
|
break;
|
||||||
|
case ESM::REC_IMOD4:
|
||||||
|
cell.mStore->template forEachType<ESM4::ItemMod>(visitor);
|
||||||
|
break;
|
||||||
case ESM::REC_INGR4:
|
case ESM::REC_INGR4:
|
||||||
cell.mStore->template forEachType<ESM4::Ingredient>(visitor);
|
cell.mStore->template forEachType<ESM4::Ingredient>(visitor);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -45,6 +45,7 @@ namespace MWLua
|
||||||
constexpr std::string_view ESM4Flora = "ESM4Flora";
|
constexpr std::string_view ESM4Flora = "ESM4Flora";
|
||||||
constexpr std::string_view ESM4Furniture = "ESM4Furniture";
|
constexpr std::string_view ESM4Furniture = "ESM4Furniture";
|
||||||
constexpr std::string_view ESM4Ingredient = "ESM4Ingredient";
|
constexpr std::string_view ESM4Ingredient = "ESM4Ingredient";
|
||||||
|
constexpr std::string_view ESM4ItemMod = "ESM4ItemMod";
|
||||||
constexpr std::string_view ESM4Light = "ESM4Light";
|
constexpr std::string_view ESM4Light = "ESM4Light";
|
||||||
constexpr std::string_view ESM4MiscItem = "ESM4Miscellaneous";
|
constexpr std::string_view ESM4MiscItem = "ESM4Miscellaneous";
|
||||||
constexpr std::string_view ESM4MovableStatic = "ESM4MovableStatic";
|
constexpr std::string_view ESM4MovableStatic = "ESM4MovableStatic";
|
||||||
|
@ -90,6 +91,7 @@ namespace MWLua
|
||||||
{ ESM::REC_FLOR4, ObjectTypeName::ESM4Flora },
|
{ ESM::REC_FLOR4, ObjectTypeName::ESM4Flora },
|
||||||
{ ESM::REC_FURN4, ObjectTypeName::ESM4Furniture },
|
{ ESM::REC_FURN4, ObjectTypeName::ESM4Furniture },
|
||||||
{ ESM::REC_INGR4, ObjectTypeName::ESM4Ingredient },
|
{ ESM::REC_INGR4, ObjectTypeName::ESM4Ingredient },
|
||||||
|
{ ESM::REC_IMOD4, ObjectTypeName::ESM4ItemMod },
|
||||||
{ ESM::REC_LIGH4, ObjectTypeName::ESM4Light },
|
{ ESM::REC_LIGH4, ObjectTypeName::ESM4Light },
|
||||||
{ ESM::REC_MISC4, ObjectTypeName::ESM4MiscItem },
|
{ ESM::REC_MISC4, ObjectTypeName::ESM4MiscItem },
|
||||||
{ ESM::REC_MSTT4, ObjectTypeName::ESM4MovableStatic },
|
{ ESM::REC_MSTT4, ObjectTypeName::ESM4MovableStatic },
|
||||||
|
@ -230,6 +232,7 @@ namespace MWLua
|
||||||
addType(ObjectTypeName::ESM4Flora, { ESM::REC_FLOR4 });
|
addType(ObjectTypeName::ESM4Flora, { ESM::REC_FLOR4 });
|
||||||
addType(ObjectTypeName::ESM4Furniture, { ESM::REC_FURN4 });
|
addType(ObjectTypeName::ESM4Furniture, { ESM::REC_FURN4 });
|
||||||
addType(ObjectTypeName::ESM4Ingredient, { ESM::REC_INGR4 });
|
addType(ObjectTypeName::ESM4Ingredient, { ESM::REC_INGR4 });
|
||||||
|
addType(ObjectTypeName::ESM4ItemMod, { ESM::REC_IMOD4 });
|
||||||
addType(ObjectTypeName::ESM4Light, { ESM::REC_LIGH4 });
|
addType(ObjectTypeName::ESM4Light, { ESM::REC_LIGH4 });
|
||||||
addType(ObjectTypeName::ESM4MiscItem, { ESM::REC_MISC4 });
|
addType(ObjectTypeName::ESM4MiscItem, { ESM::REC_MISC4 });
|
||||||
addType(ObjectTypeName::ESM4MovableStatic, { ESM::REC_MSTT4 });
|
addType(ObjectTypeName::ESM4MovableStatic, { ESM::REC_MSTT4 });
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#include <components/esm4/loaddoor.hpp>
|
#include <components/esm4/loaddoor.hpp>
|
||||||
#include <components/esm4/loadflor.hpp>
|
#include <components/esm4/loadflor.hpp>
|
||||||
#include <components/esm4/loadfurn.hpp>
|
#include <components/esm4/loadfurn.hpp>
|
||||||
|
#include <components/esm4/loadimod.hpp>
|
||||||
#include <components/esm4/loadingr.hpp>
|
#include <components/esm4/loadingr.hpp>
|
||||||
#include <components/esm4/loadligh.hpp>
|
#include <components/esm4/loadligh.hpp>
|
||||||
#include <components/esm4/loadmisc.hpp>
|
#include <components/esm4/loadmisc.hpp>
|
||||||
|
|
|
@ -72,6 +72,7 @@ namespace ESM4
|
||||||
struct Furniture;
|
struct Furniture;
|
||||||
struct Flora;
|
struct Flora;
|
||||||
struct Ingredient;
|
struct Ingredient;
|
||||||
|
struct ItemMod;
|
||||||
struct MiscItem;
|
struct MiscItem;
|
||||||
struct MovableStatic;
|
struct MovableStatic;
|
||||||
struct Terminal;
|
struct Terminal;
|
||||||
|
@ -96,7 +97,7 @@ namespace MWWorld
|
||||||
CellRefList<ESM4::Static>, CellRefList<ESM4::Light>, CellRefList<ESM4::Activator>, CellRefList<ESM4::Potion>,
|
CellRefList<ESM4::Static>, CellRefList<ESM4::Light>, CellRefList<ESM4::Activator>, CellRefList<ESM4::Potion>,
|
||||||
CellRefList<ESM4::Ammunition>, CellRefList<ESM4::Armor>, CellRefList<ESM4::Book>, CellRefList<ESM4::Clothing>,
|
CellRefList<ESM4::Ammunition>, CellRefList<ESM4::Armor>, CellRefList<ESM4::Book>, CellRefList<ESM4::Clothing>,
|
||||||
CellRefList<ESM4::Container>, CellRefList<ESM4::Door>, CellRefList<ESM4::Flora>, CellRefList<ESM4::Ingredient>,
|
CellRefList<ESM4::Container>, CellRefList<ESM4::Door>, CellRefList<ESM4::Flora>, CellRefList<ESM4::Ingredient>,
|
||||||
CellRefList<ESM4::Terminal>, CellRefList<ESM4::Tree>, CellRefList<ESM4::MiscItem>,
|
CellRefList<ESM4::ItemMod>, CellRefList<ESM4::Terminal>, CellRefList<ESM4::Tree>, CellRefList<ESM4::MiscItem>,
|
||||||
CellRefList<ESM4::MovableStatic>, CellRefList<ESM4::Weapon>, CellRefList<ESM4::Furniture>,
|
CellRefList<ESM4::MovableStatic>, CellRefList<ESM4::Weapon>, CellRefList<ESM4::Furniture>,
|
||||||
CellRefList<ESM4::Creature>, CellRefList<ESM4::Npc>>;
|
CellRefList<ESM4::Creature>, CellRefList<ESM4::Npc>>;
|
||||||
|
|
||||||
|
|
|
@ -91,6 +91,7 @@ namespace ESM4
|
||||||
struct Hair;
|
struct Hair;
|
||||||
struct HeadPart;
|
struct HeadPart;
|
||||||
struct Ingredient;
|
struct Ingredient;
|
||||||
|
struct ItemMod;
|
||||||
struct Land;
|
struct Land;
|
||||||
struct LandTexture;
|
struct LandTexture;
|
||||||
struct LevelledCreature;
|
struct LevelledCreature;
|
||||||
|
@ -140,8 +141,8 @@ namespace MWWorld
|
||||||
Store<ESM4::Activator>, Store<ESM4::ActorCharacter>, Store<ESM4::ActorCreature>, Store<ESM4::Ammunition>,
|
Store<ESM4::Activator>, Store<ESM4::ActorCharacter>, Store<ESM4::ActorCreature>, Store<ESM4::Ammunition>,
|
||||||
Store<ESM4::Armor>, Store<ESM4::ArmorAddon>, Store<ESM4::Book>, Store<ESM4::Cell>, Store<ESM4::Clothing>,
|
Store<ESM4::Armor>, Store<ESM4::ArmorAddon>, Store<ESM4::Book>, Store<ESM4::Cell>, Store<ESM4::Clothing>,
|
||||||
Store<ESM4::Container>, Store<ESM4::Creature>, Store<ESM4::Door>, Store<ESM4::Furniture>,
|
Store<ESM4::Container>, Store<ESM4::Creature>, Store<ESM4::Door>, Store<ESM4::Furniture>,
|
||||||
Store<ESM4::Flora>, Store<ESM4::Hair>, Store<ESM4::HeadPart>, Store<ESM4::Ingredient>, Store<ESM4::Land>,
|
Store<ESM4::Flora>, Store<ESM4::Hair>, Store<ESM4::HeadPart>, Store<ESM4::Ingredient>, Store<ESM4::ItemMod>,
|
||||||
Store<ESM4::LandTexture>, Store<ESM4::LevelledCreature>, Store<ESM4::LevelledItem>,
|
Store<ESM4::Land>, Store<ESM4::LandTexture>, Store<ESM4::LevelledCreature>, Store<ESM4::LevelledItem>,
|
||||||
Store<ESM4::LevelledNpc>, Store<ESM4::Light>, Store<ESM4::MiscItem>, Store<ESM4::MovableStatic>,
|
Store<ESM4::LevelledNpc>, Store<ESM4::Light>, Store<ESM4::MiscItem>, Store<ESM4::MovableStatic>,
|
||||||
Store<ESM4::Npc>, Store<ESM4::Outfit>, Store<ESM4::Potion>, Store<ESM4::Race>, Store<ESM4::Reference>,
|
Store<ESM4::Npc>, Store<ESM4::Outfit>, Store<ESM4::Potion>, Store<ESM4::Race>, Store<ESM4::Reference>,
|
||||||
Store<ESM4::Static>, Store<ESM4::Terminal>, Store<ESM4::Tree>, Store<ESM4::Weapon>, Store<ESM4::World>>;
|
Store<ESM4::Static>, Store<ESM4::Terminal>, Store<ESM4::Tree>, Store<ESM4::Weapon>, Store<ESM4::World>>;
|
||||||
|
|
|
@ -1362,6 +1362,7 @@ template class MWWorld::TypedDynamicStore<ESM4::Furniture>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::Hair>;
|
template class MWWorld::TypedDynamicStore<ESM4::Hair>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::HeadPart>;
|
template class MWWorld::TypedDynamicStore<ESM4::HeadPart>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::Ingredient>;
|
template class MWWorld::TypedDynamicStore<ESM4::Ingredient>;
|
||||||
|
template class MWWorld::TypedDynamicStore<ESM4::ItemMod>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::Land>;
|
template class MWWorld::TypedDynamicStore<ESM4::Land>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::LandTexture>;
|
template class MWWorld::TypedDynamicStore<ESM4::LandTexture>;
|
||||||
template class MWWorld::TypedDynamicStore<ESM4::LevelledCreature>;
|
template class MWWorld::TypedDynamicStore<ESM4::LevelledCreature>;
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
#include <components/esm4/loadfurn.hpp>
|
#include <components/esm4/loadfurn.hpp>
|
||||||
#include <components/esm4/loadhair.hpp>
|
#include <components/esm4/loadhair.hpp>
|
||||||
#include <components/esm4/loadhdpt.hpp>
|
#include <components/esm4/loadhdpt.hpp>
|
||||||
|
#include <components/esm4/loadimod.hpp>
|
||||||
#include <components/esm4/loadingr.hpp>
|
#include <components/esm4/loadingr.hpp>
|
||||||
#include <components/esm4/loadland.hpp>
|
#include <components/esm4/loadland.hpp>
|
||||||
#include <components/esm4/loadligh.hpp>
|
#include <components/esm4/loadligh.hpp>
|
||||||
|
|
|
@ -1875,6 +1875,9 @@
|
||||||
--- Functions for @{#ESM4Ingredient} objects
|
--- Functions for @{#ESM4Ingredient} objects
|
||||||
-- @field [parent=#types] #ESM4Ingredient ESM4Ingredient
|
-- @field [parent=#types] #ESM4Ingredient ESM4Ingredient
|
||||||
|
|
||||||
|
--- Functions for @{#ESM4ItemMod} objects
|
||||||
|
-- @field [parent=#types] #ESM4ItemMod ESM4ItemMod
|
||||||
|
|
||||||
--- Functions for @{#ESM4Light} objects
|
--- Functions for @{#ESM4Light} objects
|
||||||
-- @field [parent=#types] #ESM4Light ESM4Light
|
-- @field [parent=#types] #ESM4Light ESM4Light
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue