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

Forgot about the cell refs, oops

Browse source
This commit is contained in:
Alexander "Ace" Olofsson 2012-04-08 17:52:55 +02:00
parent 23f81e63dd
commit 1d48781567
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/esmtool/esmtool.cpp
View file

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include <list> #include <list>
#include <map>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
@ -15,9 +16,6 @@ using namespace ESM;
// Create a local alias for brevity // Create a local alias for brevity
namespace bpo = boost::program_options; namespace bpo = boost::program_options;
void printRaw(ESMReader &esm);
void loadCell(Cell &cell, ESMReader &esm, bool quiet);
struct ESMData struct ESMData
{ {
std::string author; std::string author;
@ -27,6 +25,7 @@ struct ESMData
ESMReader::MasterList masters; ESMReader::MasterList masters;
std::list<Record*> records; std::list<Record*> records;
std::map<Record*, std::list<CellRef> > cellRefs;
}; };
// Based on the legacy struct // Based on the legacy struct
@ -157,6 +156,9 @@ bool parseOptions (int argc, char** argv, Arguments &info)
return true; return true;
} }
void printRaw(ESMReader &esm);
void loadCell(Cell &cell, ESMReader &esm, Arguments& info);
int load(Arguments& info); int load(Arguments& info);
int clone(Arguments& info); int clone(Arguments& info);
@ -179,8 +181,11 @@ int main(int argc, char**argv)
return 0; return 0;
} }
void loadCell(Cell &cell, ESMReader &esm, bool quiet) void loadCell(Cell &cell, ESMReader &esm, Arguments& info)
{ {
bool quiet = (info.quiet_given || info.mode == "clone");
bool save = (info.mode == "clone");
// Skip back to the beginning of the reference list // Skip back to the beginning of the reference list
cell.restore(esm); cell.restore(esm);
@ -189,6 +194,9 @@ void loadCell(Cell &cell, ESMReader &esm, bool quiet)
if(!quiet) cout << " References:\n"; if(!quiet) cout << " References:\n";
while(cell.getNextRef(esm, ref)) while(cell.getNextRef(esm, ref))
{ {
if (save)
info.data.cellRefs[&cell].push_back(ref);
if(quiet) continue; if(quiet) continue;
cout << " Refnum: " << ref.refnum << endl; cout << " Refnum: " << ref.refnum << endl;
@ -241,7 +249,7 @@ int load(Arguments& info)
} }
bool quiet = (info.quiet_given || info.mode == "clone"); bool quiet = (info.quiet_given || info.mode == "clone");
bool loadCells = (info.loadcells_given);// || info.mode == "clone"); bool loadCells = (info.loadcells_given || info.mode == "clone");
bool save = (info.mode == "clone"); bool save = (info.mode == "clone");
esm.open(filename); esm.open(filename);
@ -367,7 +375,7 @@ int load(Arguments& info)
cout << " Region: " << b.region << endl; cout << " Region: " << b.region << endl;
} }
if(loadCells) if(loadCells)
loadCell(b, esm, quiet); loadCell(b, esm, info);
break; break;
} }
case REC_CLAS: case REC_CLAS:
@ -738,7 +746,6 @@ int load(Arguments& info)
return 0; return 0;
} }
#include <map>
#include <iomanip> #include <iomanip>
int clone(Arguments& info) int clone(Arguments& info)
@ -817,6 +824,16 @@ int clone(Arguments& info)
std::string id = rec->getId(); std::string id = rec->getId();
esm.writeHNOString("NAME", id); esm.writeHNOString("NAME", id);
rec->save(esm); rec->save(esm);
if (n.val == REC_CELL && !info.data.cellRefs[rec].empty())
{
std::list<CellRef>& refs = info.data.cellRefs[rec];
for (std::list<CellRef>::iterator it = refs.begin(); it != refs.end(); ++it)
{
it->save(esm);
}
}
esm.endRecord(n.toString()); esm.endRecord(n.toString());
saved++; saved++;