mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +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:
		| @@ -20,7 +20,8 @@ | ||||
| #include "RegisterTypes.h" | ||||
| #include "CMapInfo.h" | ||||
| #include "BattleState.h" | ||||
| #include "../lib/JsonNode.h" | ||||
| #include "JsonNode.h" | ||||
| #include "Filesystem/CResourceLoader.h" | ||||
| #include "GameConstants.h" | ||||
|  | ||||
| DLL_LINKAGE boost::rand48 ran; | ||||
| @@ -2814,8 +2815,10 @@ DuelParameters DuelParameters::fromJSON(const std::string &fname) | ||||
| 		assert(ss.heroPrimSkills.empty() || ss.heroPrimSkills.size() == GameConstants::PRIMARY_SKILLS); | ||||
|  | ||||
| 		if(ss.heroId != -1) | ||||
| 		{ | ||||
| 			BOOST_FOREACH(const JsonNode &spell, n["spells"].Vector()) | ||||
| 				ss.spells.insert(spell.Float()); | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	BOOST_FOREACH(const JsonNode &n, duelData["obstacles"].Vector()) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user