teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

reduced the amount of new in reclists

Browse source
This commit is contained in:
Marc Zinnschlag 2010-06-07 16:30:21 +02:00
parent 8565f5ea8f
commit d0b67cb567
1 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
game/esm_store/reclists.hpp
View file

@ -21,24 +21,14 @@ namespace ESMS
template <typename X> template <typename X>
struct RecListT : RecList struct RecListT : RecList
{ {
typedef std::map<std::string,X*> MapType; typedef std::map<std::string,X> MapType;
MapType list; MapType list;
// Load one object of this type // Load one object of this type
void load(ESMReader &esm, const std::string &id) void load(ESMReader &esm, const std::string &id)
{ {
X *ref; list[id].load(esm);
if(list.find(id) == list.end())
{
ref = new X;
list[id] = ref;
}
else
ref = list[id];
ref->load(esm);
} }
// Find the given object ID, or return NULL if not found. // Find the given object ID, or return NULL if not found.
@ -46,7 +36,7 @@ namespace ESMS
{ {
if(list.find(id) == list.end()) if(list.find(id) == list.end())
return NULL; return NULL;
return list.find(id)->second; return &list.find(id)->second;
} }
int getSize() { return list.size(); } int getSize() { return list.size(); }
@ -58,24 +48,16 @@ namespace ESMS
template <typename X> template <typename X>
struct RecIDListT : RecList struct RecIDListT : RecList
{ {
typedef std::map<std::string,X*> MapType; typedef std::map<std::string,X> MapType;
MapType list; MapType list;
void load(ESMReader &esm, const std::string &id) void load(ESMReader &esm, const std::string &id)
{ {
X *ref; X& ref = list[id];
if(list.find(id) == list.end()) ref.id = id;
{ ref.load(esm);
ref = new X;
list[id] = ref;
}
else
ref = list[id];
ref->id = id;
ref->load(esm);
} }
int getSize() { return list.size(); } int getSize() { return list.size(); }