mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 06:39:49 +00:00
Code Issues Projects Releases Wiki Activity

load skill and magic effect records

Browse Source
This commit is contained in:
Marc Zinnschlag 2010-09-12 09:34:45 +02:00
parent 814d721e33
commit 0414d7f862
4 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/esm/loadskil.hpp
View File

@ -32,6 +32,7 @@ struct Skill
void load(ESMReader &esm)
{
esm.getHNT(index, "INDX");
esm.getHNT(data, "SKDT", 24);
description = esm.getHNOString("DESC");
}

49
components/esm_store/reclists.hpp
View File

@ -308,12 +308,53 @@ namespace ESMS
int getSize() { return list.size(); }
};
template <typename X>
struct IndexListT
{
typedef std::map<int, X> MapType;
MapType list;
void load(ESMReader &esm)
{
X ref;
ref.load (esm);
int index = ref.index;
list[index] = ref;
}
int getSize()
{
return list.size();
}
// Find the given object ID, or return NULL if not found.
const X* search (int id) const
{
if (list.find (id) == list.end())
return NULL;
return &list.find(id)->second;
}
// Find the given object ID (throws an exception if not found)
const X* find (int id) const
{
const X *object = search (id);
if (!object)
{
std::ostringstream error;
error << "object " << id << " not found";
throw std::runtime_error (error.str());
}
return object;
}
};
/* We need special lists for:
Magic effects
Skills
Dialog / Info combo
Scripts
Land
Path grids
Land textures

10
components/esm_store/store.cpp
View File

@ -46,15 +46,21 @@ void ESMStore::load(ESMReader &esm)
{
std::cerr << "error: info record without dialog" << std::endl;
esm.skipRecord();
continue;
}
}
else if (n.val==ESM::REC_MGEF)
{
magicEffects.load (esm);
}
else if (n.val==ESM::REC_SKIL)
{
skills.load (esm);
}
else
{
// Not found (this would be an error later)
esm.skipRecord();
missing.insert(n.toString());
continue;
}
}
else

6
components/esm_store/store.hpp
View File

@ -71,9 +71,9 @@ namespace ESMS
RecIDListT<GameSetting> gameSettings;
//RecListT<Land> lands;
//RecListT<LandTexture> landTexts;
//RecListT<MagicEffect> magicEffects;
IndexListT<MagicEffect> magicEffects;
ScriptListT<Script> scripts;
//RecListT<Skill> skills;
IndexListT<Skill> skills;
//RecListT<PathGrid> pathgrids;
// Lookup of all IDs. Makes looking up references faster. Just
@ -118,7 +118,6 @@ namespace ESMS
recLists[REC_LIGH] = &lights;
recLists[REC_LOCK] = &lockpicks;
//recLists[REC_LTEX] = &landTexts;
//recLists[REC_MGEF] = &magicEffects;
recLists[REC_MISC] = &miscItems;
recLists[REC_NPC_] = &npcs;
recLists[REC_NPCC] = &npcChange;
@ -128,7 +127,6 @@ namespace ESMS
recLists[REC_REGN] = &regions;
recLists[REC_REPA] = &repairs;
recLists[REC_SCPT] = &scripts;
//recLists[REC_SKIL] = &skills;
recLists[REC_SNDG] = &soundGens;
recLists[REC_SOUN] = &sounds;
recLists[REC_SPEL] = &spells;