mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 13:23:52 +00:00
Code Issues Releases Wiki Activity

let's rescue linker

Browse source
This commit is contained in:
greye 2012-11-06 15:10:57 +04:00
parent 620184a009
commit 18bb5960e4
3 changed files with 50 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
apps/openmw/mwworld/esmstore.hpp
View file

@ -145,227 +145,227 @@ namespace MWWorld
}; };
template <> template <>
const Store<ESM::Activator> &ESMStore::get<ESM::Activator>() const { inline const Store<ESM::Activator> &ESMStore::get<ESM::Activator>() const {
return mActivators; return mActivators;
} }
template <> template <>
const Store<ESM::Potion> &ESMStore::get<ESM::Potion>() const { inline const Store<ESM::Potion> &ESMStore::get<ESM::Potion>() const {
return mPotions; return mPotions;
} }
template <> template <>
const Store<ESM::Apparatus> &ESMStore::get<ESM::Apparatus>() const { inline const Store<ESM::Apparatus> &ESMStore::get<ESM::Apparatus>() const {
return mAppas; return mAppas;
} }
template <> template <>
const Store<ESM::Armor> &ESMStore::get<ESM::Armor>() const { inline const Store<ESM::Armor> &ESMStore::get<ESM::Armor>() const {
return mArmors; return mArmors;
} }
template <> template <>
const Store<ESM::BodyPart> &ESMStore::get<ESM::BodyPart>() const { inline const Store<ESM::BodyPart> &ESMStore::get<ESM::BodyPart>() const {
return mBodyParts; return mBodyParts;
} }
template <> template <>
const Store<ESM::Book> &ESMStore::get<ESM::Book>() const { inline const Store<ESM::Book> &ESMStore::get<ESM::Book>() const {
return mBooks; return mBooks;
} }
template <> template <>
const Store<ESM::BirthSign> &ESMStore::get<ESM::BirthSign>() const { inline const Store<ESM::BirthSign> &ESMStore::get<ESM::BirthSign>() const {
return mBirthSigns; return mBirthSigns;
} }
template <> template <>
const Store<ESM::Class> &ESMStore::get<ESM::Class>() const { inline const Store<ESM::Class> &ESMStore::get<ESM::Class>() const {
return mClasses; return mClasses;
} }
template <> template <>
const Store<ESM::Clothing> &ESMStore::get<ESM::Clothing>() const { inline const Store<ESM::Clothing> &ESMStore::get<ESM::Clothing>() const {
return mClothes; return mClothes;
} }
template <> template <>
const Store<ESM::LoadCNTC> &ESMStore::get<ESM::LoadCNTC>() const { inline const Store<ESM::LoadCNTC> &ESMStore::get<ESM::LoadCNTC>() const {
return mContChange; return mContChange;
} }
template <> template <>
const Store<ESM::Container> &ESMStore::get<ESM::Container>() const { inline const Store<ESM::Container> &ESMStore::get<ESM::Container>() const {
return mContainers; return mContainers;
} }
template <> template <>
const Store<ESM::Creature> &ESMStore::get<ESM::Creature>() const { inline const Store<ESM::Creature> &ESMStore::get<ESM::Creature>() const {
return mCreatures; return mCreatures;
} }
template <> template <>
const Store<ESM::LoadCREC> &ESMStore::get<ESM::LoadCREC>() const { inline const Store<ESM::LoadCREC> &ESMStore::get<ESM::LoadCREC>() const {
return mCreaChange; return mCreaChange;
} }
template <> template <>
const Store<ESM::Dialogue> &ESMStore::get<ESM::Dialogue>() const { inline const Store<ESM::Dialogue> &ESMStore::get<ESM::Dialogue>() const {
return mDialogs; return mDialogs;
} }
template <> template <>
const Store<ESM::Door> &ESMStore::get<ESM::Door>() const { inline const Store<ESM::Door> &ESMStore::get<ESM::Door>() const {
return mDoors; return mDoors;
} }
template <> template <>
const Store<ESM::Enchantment> &ESMStore::get<ESM::Enchantment>() const { inline const Store<ESM::Enchantment> &ESMStore::get<ESM::Enchantment>() const {
return mEnchants; return mEnchants;
} }
template <> template <>
const Store<ESM::Faction> &ESMStore::get<ESM::Faction>() const { inline const Store<ESM::Faction> &ESMStore::get<ESM::Faction>() const {
return mFactions; return mFactions;
} }
template <> template <>
const Store<ESM::Global> &ESMStore::get<ESM::Global>() const { inline const Store<ESM::Global> &ESMStore::get<ESM::Global>() const {
return mGlobals; return mGlobals;
} }
template <> template <>
const Store<ESM::Ingredient> &ESMStore::get<ESM::Ingredient>() const { inline const Store<ESM::Ingredient> &ESMStore::get<ESM::Ingredient>() const {
return mIngreds; return mIngreds;
} }
template <> template <>
const Store<ESM::CreatureLevList> &ESMStore::get<ESM::CreatureLevList>() const { inline const Store<ESM::CreatureLevList> &ESMStore::get<ESM::CreatureLevList>() const {
return mCreatureLists; return mCreatureLists;
} }
template <> template <>
const Store<ESM::ItemLevList> &ESMStore::get<ESM::ItemLevList>() const { inline const Store<ESM::ItemLevList> &ESMStore::get<ESM::ItemLevList>() const {
return mItemLists; return mItemLists;
} }
template <> template <>
const Store<ESM::Light> &ESMStore::get<ESM::Light>() const { inline const Store<ESM::Light> &ESMStore::get<ESM::Light>() const {
return mLights; return mLights;
} }
template <> template <>
const Store<ESM::Tool> &ESMStore::get<ESM::Tool>() const { inline const Store<ESM::Tool> &ESMStore::get<ESM::Tool>() const {
return mLockpicks; return mLockpicks;
} }
template <> template <>
const Store<ESM::Miscellaneous> &ESMStore::get<ESM::Miscellaneous>() const { inline const Store<ESM::Miscellaneous> &ESMStore::get<ESM::Miscellaneous>() const {
return mMiscItems; return mMiscItems;
} }
template <> template <>
const Store<ESM::NPC> &ESMStore::get<ESM::NPC>() const { inline const Store<ESM::NPC> &ESMStore::get<ESM::NPC>() const {
return mNpcs; return mNpcs;
} }
template <> template <>
const Store<ESM::LoadNPCC> &ESMStore::get<ESM::LoadNPCC>() const { inline const Store<ESM::LoadNPCC> &ESMStore::get<ESM::LoadNPCC>() const {
return mNpcChange; return mNpcChange;
} }
template <> template <>
const Store<ESM::Probe> &ESMStore::get<ESM::Probe>() const { inline const Store<ESM::Probe> &ESMStore::get<ESM::Probe>() const {
return mProbes; return mProbes;
} }
template <> template <>
const Store<ESM::Race> &ESMStore::get<ESM::Race>() const { inline const Store<ESM::Race> &ESMStore::get<ESM::Race>() const {
return mRaces; return mRaces;
} }
template <> template <>
const Store<ESM::Region> &ESMStore::get<ESM::Region>() const { inline const Store<ESM::Region> &ESMStore::get<ESM::Region>() const {
return mRegions; return mRegions;
} }
template <> template <>
const Store<ESM::Repair> &ESMStore::get<ESM::Repair>() const { inline const Store<ESM::Repair> &ESMStore::get<ESM::Repair>() const {
return mRepairs; return mRepairs;
} }
template <> template <>
const Store<ESM::SoundGenerator> &ESMStore::get<ESM::SoundGenerator>() const { inline const Store<ESM::SoundGenerator> &ESMStore::get<ESM::SoundGenerator>() const {
return mSoundGens; return mSoundGens;
} }
template <> template <>
const Store<ESM::Sound> &ESMStore::get<ESM::Sound>() const { inline const Store<ESM::Sound> &ESMStore::get<ESM::Sound>() const {
return mSounds; return mSounds;
} }
template <> template <>
const Store<ESM::Spell> &ESMStore::get<ESM::Spell>() const { inline const Store<ESM::Spell> &ESMStore::get<ESM::Spell>() const {
return mSpells; return mSpells;
} }
template <> template <>
const Store<ESM::StartScript> &ESMStore::get<ESM::StartScript>() const { inline const Store<ESM::StartScript> &ESMStore::get<ESM::StartScript>() const {
return mStartScripts; return mStartScripts;
} }
template <> template <>
const Store<ESM::Static> &ESMStore::get<ESM::Static>() const { inline const Store<ESM::Static> &ESMStore::get<ESM::Static>() const {
return mStatics; return mStatics;
} }
template <> template <>
const Store<ESM::Weapon> &ESMStore::get<ESM::Weapon>() const { inline const Store<ESM::Weapon> &ESMStore::get<ESM::Weapon>() const {
return mWeapons; return mWeapons;
} }
template <> template <>
const Store<ESM::GameSetting> &ESMStore::get<ESM::GameSetting>() const { inline const Store<ESM::GameSetting> &ESMStore::get<ESM::GameSetting>() const {
return mGameSettings; return mGameSettings;
} }
template <> template <>
const Store<ESM::Script> &ESMStore::get<ESM::Script>() const { inline const Store<ESM::Script> &ESMStore::get<ESM::Script>() const {
return mScripts; return mScripts;
} }
template <> template <>
const Store<ESM::Cell> &ESMStore::get<ESM::Cell>() const { inline const Store<ESM::Cell> &ESMStore::get<ESM::Cell>() const {
return mCells; return mCells;
} }
template <> template <>
const Store<ESM::Land> &ESMStore::get<ESM::Land>() const { inline const Store<ESM::Land> &ESMStore::get<ESM::Land>() const {
return mLands; return mLands;
} }
template <> template <>
const Store<ESM::LandTexture> &ESMStore::get<ESM::LandTexture>() const { inline const Store<ESM::LandTexture> &ESMStore::get<ESM::LandTexture>() const {
return mLandTextures; return mLandTextures;
} }
template <> template <>
const Store<ESM::Pathgrid> &ESMStore::get<ESM::Pathgrid>() const { inline const Store<ESM::Pathgrid> &ESMStore::get<ESM::Pathgrid>() const {
return mPathgrids; return mPathgrids;
} }
template <> template <>
const Store<ESM::MagicEffect> &ESMStore::get<ESM::MagicEffect>() const { inline const Store<ESM::MagicEffect> &ESMStore::get<ESM::MagicEffect>() const {
return mMagicEffects; return mMagicEffects;
} }
template <> template <>
const Store<ESM::Skill> &ESMStore::get<ESM::Skill>() const { inline const Store<ESM::Skill> &ESMStore::get<ESM::Skill>() const {
return mSkills; return mSkills;
} }
template <> template <>
const Store<ESM::Attribute> &ESMStore::get<ESM::Attribute>() const { inline const Store<ESM::Attribute> &ESMStore::get<ESM::Attribute>() const {
return mAttributes; return mAttributes;
} }
} }

6
apps/openmw/mwworld/recordcmp.hpp
View file

@ -66,17 +66,17 @@ namespace MWWorld
}; };
template <> template <>
bool RecordCmp::operator()<ESM::Dialogue>(const ESM::Dialogue &x, const ESM::Dialogue &y) const { inline bool RecordCmp::operator()<ESM::Dialogue>(const ESM::Dialogue &x, const ESM::Dialogue &y) const {
return StringUtils::ciLess(x.mId, y.mId); return StringUtils::ciLess(x.mId, y.mId);
} }
template <> template <>
bool RecordCmp::operator()<ESM::Cell>(const ESM::Cell &x, const ESM::Cell &y) const { inline bool RecordCmp::operator()<ESM::Cell>(const ESM::Cell &x, const ESM::Cell &y) const {
return StringUtils::ciLess(x.mName, y.mName); return StringUtils::ciLess(x.mName, y.mName);
} }
template <> template <>
bool RecordCmp::operator()<ESM::Pathgrid>(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const { inline bool RecordCmp::operator()<ESM::Pathgrid>(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const {
return StringUtils::ciLess(x.mCell, y.mCell); return StringUtils::ciLess(x.mCell, y.mCell);
} }

12
apps/openmw/mwworld/store.hpp
View file

@ -218,18 +218,10 @@ namespace MWWorld
}; };
template <> template <>
void Store<ESM::Dialogue>::load(ESM::ESMReader &esm, const std::string &id) { void Store<ESM::Dialogue>::load(ESM::ESMReader &esm, const std::string &id);
mStatic.push_back(ESM::Dialogue());
mStatic.back().mId = id;
mStatic.back().load(esm);
}
template <> template <>
void Store<ESM::Script>::load(ESM::ESMReader &esm, const std::string &id) { void Store<ESM::Script>::load(ESM::ESMReader &esm, const std::string &id);
mStatic.push_back(ESM::Script());
mStatic.back().load(esm);
StringUtils::toLower(mStatic.back().mId);
}
template <> template <>
class Store<ESM::LandTexture> : public StoreBase class Store<ESM::LandTexture> : public StoreBase