mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-15 22:49:48 +00:00
125b21de20
The strong type is actually just a string underneath, but this will help in the future to have a distinction so it's easier to search and replace when we use an integer ID Slowly going through all the changes to make, still hundreds of errors a lot of functions/structures use std::string or stringview to designate an ID. So it takes time Continues slowly replacing ids. There are technically more and more compilation errors I have good hope that there is a point where the amount of errors will dramatically go down as all the main functions use the ESM::RefId type Continue moving forward, changes to the stores slowly moving along Starting to see the fruit of those changes. still many many error, but more and more Irun into a situation where a function is sandwiched between two functions that use the RefId type. More replacements. Things are starting to get easier I can see more and more often the issue is that the function is awaiting a RefId, but is given a string there is less need to go down functions and to fix a long list of them. Still moving forward, and for the first time error count is going down! Good pace, not sure about topics though, mId and mName are actually the same thing and are used interchangeably Cells are back to using string for the name, haven't fixed everything yet. Many other changes Under the bar of 400 compilation errors. more good progress <100 compile errors! More progress Game settings store can use string for find, it was a bit absurd how every use of it required to create refId from string some more progress on other fronts Mostly game settings clean one error opened a lot of other errors. Down to 18, but more will prbably appear only link errors left?? Fixed link errors OpenMW compiles, and launches, with some issues, but still!
99 lines
3.8 KiB
C++
99 lines
3.8 KiB
C++
#ifndef GAME_MWCLASS_CONTAINER_H
|
|
#define GAME_MWCLASS_CONTAINER_H
|
|
|
|
#include "../mwworld/containerstore.hpp"
|
|
#include "../mwworld/customdata.hpp"
|
|
#include "../mwworld/registeredclass.hpp"
|
|
|
|
namespace ESM
|
|
{
|
|
struct Container;
|
|
struct InventoryState;
|
|
}
|
|
|
|
namespace MWClass
|
|
{
|
|
class ContainerCustomData : public MWWorld::TypedCustomData<ContainerCustomData>
|
|
{
|
|
MWWorld::ContainerStore mStore;
|
|
|
|
public:
|
|
ContainerCustomData(const ESM::Container& container, MWWorld::CellStore* cell);
|
|
ContainerCustomData(const ESM::InventoryState& inventory);
|
|
|
|
ContainerCustomData& asContainerCustomData() override;
|
|
const ContainerCustomData& asContainerCustomData() const override;
|
|
|
|
friend class Container;
|
|
};
|
|
|
|
class Container : public MWWorld::RegisteredClass<Container>
|
|
{
|
|
friend MWWorld::RegisteredClass<Container>;
|
|
|
|
const bool mHarvestEnabled;
|
|
|
|
Container();
|
|
|
|
void ensureCustomData(const MWWorld::Ptr& ptr) const;
|
|
|
|
MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr& ptr, MWWorld::CellStore& cell) const override;
|
|
|
|
bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
|
|
|
|
public:
|
|
void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
|
|
MWRender::RenderingInterface& renderingInterface) const override;
|
|
///< Add reference into a cell for rendering
|
|
|
|
void insertObject(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
|
|
MWPhysics::PhysicsSystem& physics) const override;
|
|
void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
|
|
MWPhysics::PhysicsSystem& physics) const override;
|
|
|
|
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
|
|
///< \return name or ID; can return an empty string.
|
|
|
|
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
|
|
///< Generate action for activation
|
|
|
|
bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
|
|
///< @return true if this object has a tooltip when focused (default implementation: true)
|
|
|
|
MWGui::ToolTipInfo getToolTipInfo(const MWWorld::ConstPtr& ptr, int count) const override;
|
|
///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
|
|
|
|
MWWorld::ContainerStore& getContainerStore(const MWWorld::Ptr& ptr) const override;
|
|
///< Return container store
|
|
|
|
const ESM::RefId& getScript(const MWWorld::ConstPtr& ptr) const override;
|
|
///< Return name of the script attached to ptr
|
|
|
|
float getCapacity(const MWWorld::Ptr& ptr) const override;
|
|
///< Return total weight that fits into the object. Throws an exception, if the object can't
|
|
/// hold other objects.
|
|
|
|
float getEncumbrance(const MWWorld::Ptr& ptr) const override;
|
|
///< Returns total weight of objects inside this object (including modifications from magic
|
|
/// effects). Throws an exception, if the object can't hold other objects.
|
|
|
|
bool canLock(const MWWorld::ConstPtr& ptr) const override;
|
|
|
|
void readAdditionalState(const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const override;
|
|
///< Read additional state from \a state into \a ptr.
|
|
|
|
void writeAdditionalState(const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
|
|
///< Write additional state from \a ptr into \a state.
|
|
|
|
void respawn(const MWWorld::Ptr& ptr) const override;
|
|
|
|
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
|
|
|
|
bool useAnim() const override;
|
|
|
|
void modifyBaseInventory(const ESM::RefId& containerId, const ESM::RefId& itemId, int amount) const override;
|
|
};
|
|
}
|
|
|
|
#endif
|