mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Fix path to Chronicles campaigns background, remove old code
This commit is contained in:
		| @@ -247,7 +247,7 @@ AssetGenerator::CanvasPtr AssetGenerator::createCampaignBackground() | ||||
|  | ||||
| AssetGenerator::CanvasPtr AssetGenerator::createChroniclesCampaignImages(int chronicle) | ||||
| { | ||||
| 	auto imgPathBg = ImagePath::builtin("data/chronicles_" + std::to_string(chronicle) + "/GamSelBk"); | ||||
| 	auto imgPathBg = ImagePath::builtin("chronicles_" + std::to_string(chronicle) + "/GamSelBk"); | ||||
| 	auto locator = ImageLocator(imgPathBg, EImageBlitMode::OPAQUE); | ||||
|  | ||||
| 	std::shared_ptr<IImage> img = GH.renderHandler().loadImage(locator); | ||||
|   | ||||
| @@ -50,7 +50,7 @@ | ||||
| 	}, | ||||
| 	"chr": | ||||
| 	{ | ||||
| 		"images" : [ {"x": 0, "y": 0, "name":"data/CampaignBackground8"} ], | ||||
| 		"images" : [ {"x": 0, "y": 0, "name":"CampaignBackground8"} ], | ||||
| 		"exitbutton" : {"x": 658, "y": 482, "name":"CMPSCAN" }, | ||||
| 		"items": | ||||
| 		[ | ||||
|   | ||||
| @@ -183,14 +183,9 @@ void CResourceHandler::initialize() | ||||
| 	knownLoaders["saves"] = new CFilesystemLoader("SAVES/", VCMIDirs::get().userSavePath()); | ||||
| 	knownLoaders["config"] = new CFilesystemLoader("CONFIG/", VCMIDirs::get().userConfigPath()); | ||||
|  | ||||
| 	knownLoaders["gen_data"] = new CFilesystemLoader("DATA/", VCMIDirs::get().userDataPath() / "Generated" / "Data"); | ||||
| 	knownLoaders["gen_sprites"] = new CFilesystemLoader("SPRITES/", VCMIDirs::get().userDataPath() / "Generated" / "Sprites"); | ||||
|  | ||||
| 	auto * localFS = new CFilesystemList(); | ||||
| 	localFS->addLoader(knownLoaders["saves"], true); | ||||
| 	localFS->addLoader(knownLoaders["config"], true); | ||||
| 	localFS->addLoader(knownLoaders["gen_data"], true); | ||||
| 	localFS->addLoader(knownLoaders["gen_sprites"], true); | ||||
|  | ||||
| 	addFilesystem("root", "initial", createInitial()); | ||||
| 	addFilesystem("root", "data", new CFilesystemList()); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user