mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity

Add missing files for autocalc. Remove c++11 dependency.

Browse Source
This commit is contained in:
cc9cii 2015-06-24 21:58:28 +10:00
parent 91b9ad399f
commit 0cf9832017
5 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/model/world/npcstats.hpp
View File

@ -69,6 +69,6 @@ namespace CSMWorld
}; };
} }
Q_DECLARE_METATYPE(CSMWorld::NpcStats*); Q_DECLARE_METATYPE(CSMWorld::NpcStats*)
#endif // CSM_WORLD_NPCSTATS_H #endif // CSM_WORLD_NPCSTATS_H

6
apps/opencs/model/world/refidadapterimp.cpp
View File

@ -1122,6 +1122,7 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
} }
} }
template <>
void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::addNestedRow (const RefIdColumn *column, void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::addNestedRow (const RefIdColumn *column,
RefIdData& data, int index, int position) const RefIdData& data, int index, int position) const
{ {
@ -1145,6 +1146,7 @@ void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::addNestedRow (const RefIdColum
record.setModified (caster); record.setModified (caster);
} }
template <>
void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::removeNestedRow (const RefIdColumn *column, void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::removeNestedRow (const RefIdColumn *column,
RefIdData& data, int index, int rowToRemove) const RefIdData& data, int index, int rowToRemove) const
{ {
@ -1175,6 +1177,7 @@ void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::removeNestedRow (const RefIdCo
record.setModified (caster); record.setModified (caster);
} }
template <>
void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::setNestedData (const RefIdColumn *column, void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::setNestedData (const RefIdColumn *column,
RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const RefIdData& data, int row, const QVariant& value, int subRowIndex, int subColIndex) const
{ {
@ -1207,6 +1210,7 @@ void CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::setNestedData (const RefIdColu
record.setModified (caster); record.setModified (caster);
} }
template <>
QVariant CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedData (const RefIdColumn *column, QVariant CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedData (const RefIdColumn *column,
const RefIdData& data, int index, int subRowIndex, int subColIndex) const const RefIdData& data, int index, int subRowIndex, int subColIndex) const
{ {
@ -1230,12 +1234,14 @@ QVariant CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedData (const RefId
} }
} }
template <>
int CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedColumnsCount(const RefIdColumn *column, int CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedColumnsCount(const RefIdColumn *column,
const RefIdData& data) const const RefIdData& data) const
{ {
return 5; return 5;
} }
template <>
int CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const int CSMWorld::NestedSpellRefIdAdapter<ESM::NPC>::getNestedRowsCount(const RefIdColumn *column, const RefIdData& data, int index) const
{ {
const Record<ESM::NPC>& record = const Record<ESM::NPC>& record =

4
apps/opencs/model/world/usertype.hpp
View File

@ -38,7 +38,7 @@ namespace CSMWorld
}; };
} }
Q_DECLARE_METATYPE(CSMWorld::UserInt); Q_DECLARE_METATYPE(CSMWorld::UserInt)
Q_DECLARE_METATYPE(CSMWorld::UserFloat); Q_DECLARE_METATYPE(CSMWorld::UserFloat)
#endif // CSM_WORLD_USERTYPE_H #endif // CSM_WORLD_USERTYPE_H

36
apps/openmw/mwworld/mwstore.cpp Normal file
View File

@ -0,0 +1,36 @@
#include "mwstore.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include "esmstore.hpp"
namespace MWWorld
{
MWStore::MWStore()
: mGmst(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()),
mSpells(MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>())
{ }
MWStore::~MWStore()
{ }
int MWStore::findGmstInt(const std::string& name) const { return mGmst.find(name)->getInt(); }
float MWStore::findGmstFloat(const std::string& name) const { return mGmst.find(name)->getFloat(); }
const ESM::Skill *MWStore::findSkill(int index) const
{
return MWBase::Environment::get().getWorld()->getStore().get<ESM::Skill>().find(index);
}
const ESM::MagicEffect* MWStore::findMagicEffect(int id) const
{
return MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(id);
}
const GamePlay::CommonStore<ESM::Spell>& MWStore::getSpells() const
{
return MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>();
}
}

34
apps/openmw/mwworld/mwstore.hpp Normal file
View File

@ -0,0 +1,34 @@
#ifndef GAME_MWWORLD_MWSTORE_H
#define GAME_MWWORLD_MWSTORE_H
#include <string>
#include <components/gameplay/store.hpp>
#include "store.hpp"
namespace MWWorld
{
class MWStore : public GamePlay::StoreWrap
{
const MWWorld::Store<ESM::GameSetting>& mGmst;
const MWWorld::Store<ESM::Spell> &mSpells;
public:
MWStore();
~MWStore();
virtual int findGmstInt(const std::string& name) const;
virtual float findGmstFloat(const std::string& name) const;
virtual const ESM::Skill *findSkill(int index) const;
virtual const ESM::MagicEffect* findMagicEffect(int id) const;
virtual const GamePlay::CommonStore<ESM::Spell>& getSpells() const;
};
}
#endif // GAME_MWWORLD_MWSTORE_H