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

Fix seg fault, undo changes BsaArchive

Browse source
This commit is contained in:
Kyle Cooley 2017-08-22 15:06:56 -04:00
parent 8c4b12a603
commit d3d04171f9
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/view/render/cell.cpp
View file

@ -297,7 +297,8 @@ void CSVRender::Cell::reloadAssets()
mTerrain->loadCell(mCoordinates.getX(), mCoordinates.getY()); mTerrain->loadCell(mCoordinates.getX(), mCoordinates.getY());
} }
mCellWater->reloadAssets(); if (mCellWater)
mCellWater->reloadAssets();
} }
void CSVRender::Cell::setSelection (int elementMask, Selection mode) void CSVRender::Cell::setSelection (int elementMask, Selection mode)

20
components/vfs/bsaarchive.cpp
View file

@ -5,9 +5,14 @@ namespace VFS
BsaArchive::BsaArchive(const std::string &filename) BsaArchive::BsaArchive(const std::string &filename)
: mFileName(filename)
{ {
load(); mFile.open(filename);
const Bsa::BSAFile::FileList &filelist = mFile.getList();
for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
{
mResources.push_back(BsaArchiveFile(&*it, &mFile));
}
} }
void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char)) void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
@ -21,17 +26,6 @@ void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normal
} }
} }
void BsaArchive::load()
{
mFile.open(mFileName);
const Bsa::BSAFile::FileList &filelist = mFile.getList();
for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
{
mResources.push_back(BsaArchiveFile(&*it, &mFile));
}
}
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa) BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)

3
components/vfs/bsaarchive.hpp
View file

@ -27,9 +27,6 @@ namespace VFS
virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)); virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char));
private: private:
void load();
std::string mFileName;
Bsa::BSAFile mFile; Bsa::BSAFile mFile;
std::vector<BsaArchiveFile> mResources; std::vector<BsaArchiveFile> mResources;