games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-22 00:27:58 +02:00
Code Issues Releases Activity

large filesystem update. Filesysytem is now fully functional, everything should work.

Browse Source 
- completely replaced CLodHandler, removed bitmaph and spriteh
- replaced CLodStream in favour of CCompressedStream (2 new files)
- renamed CResourceLoaderFactory and ResourceIndetifier to shorter names
NOTES:
- campaign loading is currently broken. Will fix.
- I am going to remove several unused files in several days (e.g. LodHandler)
This commit is contained in:
Ivan Savenko
2012-08-01 12:02:54 +00:00
parent 17a513c01b
commit b3c17d2788
55 changed files with 1319 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Filesystem/CFilesystemLoader.cpp
View File

@@ -16,7 +16,7 @@ CFilesystemLoader::CFilesystemLoader(const std::string & baseDirectory, size_t d
CFilesystemLoader::CFilesystemLoader(const CFileInfo & baseDirectory, size_t depth)
{
open(baseDirectory, depth);
open(baseDirectory.getName(), depth);
}
void CFilesystemLoader::open(const std::string & baseDirectory, size_t depth)
@@ -27,20 +27,13 @@ void CFilesystemLoader::open(const std::string & baseDirectory, size_t depth)
std::unique_ptr<std::list<CFileInfo> > fileList = directory.listFiles(depth);
if(fileList)
{
throw std::runtime_error("Directory " + baseDirectory + " not available.");
this->fileList = std::move(*fileList);
}
this->fileList = std::move(*fileList);
}
void CFilesystemLoader::open(const CFileInfo & baseDirectory, size_t depth)
{
open(baseDirectory.getName(), depth);
}
std::unique_ptr<CInputStream> CFilesystemLoader::load(const std::string & resourceName) const
{
std::unique_ptr<CInputStream> stream(new CFileInputStream(resourceName));
std::unique_ptr<CInputStream> stream(new CFileInputStream(getOrigin() + '/' + resourceName));
return stream;
}
@@ -48,7 +41,7 @@ bool CFilesystemLoader::existsEntry(const std::string & resourceName) const
{
for(auto it = fileList.begin(); it != fileList.end(); ++it)
{
if((*it).getName() == resourceName)
if(it->getName() == resourceName)
{
return true;
}
@@ -68,3 +61,8 @@ std::list<std::string> CFilesystemLoader::getEntries() const
return std::move(retList);
}
std::string CFilesystemLoader::getOrigin() const
{
return baseDirectory;
}