mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-17 00:07:41 +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:
@ -1,7 +1,7 @@
|
||||
#include "StdInc.h"
|
||||
#include "CSpellHandler.h"
|
||||
|
||||
|
||||
#include "Filesystem/CResourceLoader.h"
|
||||
#include "CLodHandler.h"
|
||||
#include "../lib/VCMI_Lib.h"
|
||||
#include "../lib/JsonNode.h"
|
||||
@ -9,8 +9,6 @@
|
||||
#include "GameConstants.h"
|
||||
#include "BattleHex.h"
|
||||
|
||||
extern CLodHandler *bitmaph;
|
||||
|
||||
/*
|
||||
* CSpellHandler.cpp, part of VCMI engine
|
||||
*
|
||||
@ -274,7 +272,10 @@ bool DLL_LINKAGE isInScreenRange(const int3 ¢er, const int3 &pos)
|
||||
|
||||
void CSpellHandler::loadSpells()
|
||||
{
|
||||
std::string buf = bitmaph->getTextFile("SPTRAITS.TXT"), pom;
|
||||
auto textFile = CResourceHandler::get()->loadData(ResourceID("DATA/SPTRAITS.TXT"));
|
||||
std::string buf((char*)textFile.first.get(), textFile.second);
|
||||
|
||||
std::string pom;
|
||||
int andame = buf.size(), i=0; //buf iterator
|
||||
for(int z=0; z<5; ++z)
|
||||
loadToIt(pom,buf,i,3);
|
||||
|
Reference in New Issue
Block a user