mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

added insertIntoContainer function to class hierarchy

Browse Source
actorid
Marc Zinnschlag 15 years ago
parent 10a63b10b5
commit 0a60bde834
28 changed files with 187 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
apps/openmw/CMakeLists.txt
Unescape Escape View File

@ -141,6 +141,7 @@ set(GAMECLASS_HEADER
mwclass/probe.hpp
mwclass/repair.hpp
mwclass/static.hpp
mwclass/containerutil.hpp
)
source_group(apps\\openmw\\mwclass FILES ${GAMECLASS} ${GAMECLASS_HEADER})

8
apps/openmw/mwclass/apparatus.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Apparatus::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Apparatus::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.appas);
}
std::string Apparatus::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/apparatus.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Armor::getName (const MWWorld::Ptr& ptr) const
@ -30,6 +32,12 @@ namespace MWClass
return ref->base->data.health;
}
void Armor::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.armors);
}
std::string Armor::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/armor.hpp
Unescape Escape View File

@ -19,6 +19,10 @@ namespace MWClass
virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Book::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Book::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.books);
}
std::string Book::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/book.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Clothing::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Clothing::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.clothes);
}
std::string Clothing::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/clothing.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

31
apps/openmw/mwclass/containerutil.hpp
Unescape Escape View File

@ -0,0 +1,31 @@
#ifndef GAME_MWCLASS_CONTAINERUTIL_H
#define GAME_MWCLASS_CONTAINERUTIL_H
#include <components/esm_store/cell_store.hpp>
#include "../mwworld/ptr.hpp"
#include "../mwworld/containerstore.hpp"
namespace MWClass
{
template<typename T>
void insertIntoContainerStore (const MWWorld::Ptr& ptr,
ESMS::CellRefList<T, MWWorld::RefData>& containerStore)
{
if (!ptr.isEmpty())
{
// TODO check stacking
ESMS::LiveCellRef<T, MWWorld::RefData> cellRef;
cellRef.base = ptr.get<T>()->base;
cellRef.ref = ptr.getCellRef();
cellRef.mData = ptr.getRefData();
containerStore.list.push_back (cellRef);
}
}
}
#endif

8
apps/openmw/mwclass/ingredient.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Ingredient::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.ingreds);
}
std::string Ingredient::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/ingredient.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/light.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Light::getName (const MWWorld::Ptr& ptr) const
@ -20,6 +22,12 @@ namespace MWClass
return ref->base->name;
}
void Light::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.lights);
}
std::string Light::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/light.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/lockpick.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Lockpick::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Lockpick::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.lockpicks);
}
std::string Lockpick::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/lockpick.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/misc.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Misc::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Misc::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.miscItems);
}
std::string Misc::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Misc, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/misc.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/potion.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Potion::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Potion::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.potions);
}
std::string Potion::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/potion.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/probe.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Probe::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Probe::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.probes);
}
std::string Probe::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/probe.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/repair.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Repair::getName (const MWWorld::Ptr& ptr) const
@ -17,6 +19,12 @@ namespace MWClass
return ref->base->name;
}
void Repair::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.repairs);
}
std::string Repair::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/repair.hpp
Unescape Escape View File

@ -13,6 +13,10 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

8
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -7,6 +7,8 @@
#include "../mwworld/ptr.hpp"
#include "containerutil.hpp"
namespace MWClass
{
std::string Weapon::getName (const MWWorld::Ptr& ptr) const
@ -30,6 +32,12 @@ namespace MWClass
return ref->base->data.health;
}
void Weapon::insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const
{
insertIntoContainerStore (ptr, containerStore.weapons);
}
std::string Weapon::getScript (const MWWorld::Ptr& ptr) const
{
ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =

4
apps/openmw/mwclass/weapon.hpp
Unescape Escape View File

@ -19,6 +19,10 @@ namespace MWClass
virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health
virtual void insertIntoContainer (const MWWorld::Ptr& ptr,
MWWorld::ContainerStore<MWWorld::RefData>& containerStore) const;
///< Insert into a containe
virtual std::string getScript (const MWWorld::Ptr& ptr) const;
///< Return name of the script attached to ptr

7
apps/openmw/mwworld/class.cpp
Unescape Escape View File

@ -44,7 +44,12 @@ namespace MWWorld
ContainerStore<RefData>& Class::getContainerStore (const Ptr& ptr) const
{
throw std::runtime_error ("class does not have a container store");
}
}
void Class::insertIntoContainer (const Ptr& ptr, ContainerStore<RefData>& containerStore) const
{
throw std::runtime_error ("class does not support inserting into a container");
}
std::string Class::getScript (const Ptr& ptr) const
{

5
apps/openmw/mwworld/class.hpp
Unescape Escape View File

@ -64,6 +64,11 @@ namespace MWWorld
///< Return container store or throw an exception, if class does not have a
/// container store (default implementation: throw an exceoption)
virtual void insertIntoContainer (const Ptr& ptr, ContainerStore<RefData>& containerStore)
const;
///< Insert into a container or throw an exception, if class does not support inserting into
/// a container.
virtual std::string getScript (const Ptr& ptr) const;
///< Return name of the script attached to ptr (default implementation: return an empty
/// string).

Write Preview
Loading…
Cancel
Save