mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-23 00:28:08 +02:00
large filesystem update. Filesysytem is now fully functional, everything should work.
- 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:
@ -2,6 +2,7 @@
|
||||
#include "SDL.h"
|
||||
#include "CDefHandler.h"
|
||||
|
||||
#include "../lib/Filesystem/CResourceLoader.h"
|
||||
#include "../lib/CLodHandler.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/vcmi_endian.h"
|
||||
@ -363,7 +364,8 @@ CDefEssential * CDefHandler::essentialize()
|
||||
|
||||
CDefHandler * CDefHandler::giveDef(const std::string & defName)
|
||||
{
|
||||
ui8 * data = spriteh->giveFile(defName, FILE_ANIMATION);
|
||||
ui8 * data = CResourceHandler::get()->loadData(
|
||||
ResourceID(std::string("SPRITES/") + defName, EResType::ANIMATION)).first.release();
|
||||
if(!data)
|
||||
throw std::runtime_error("bad def name!");
|
||||
CDefHandler * nh = new CDefHandler();
|
||||
|
Reference in New Issue
Block a user