From 803596214d61862f5fccdedbcce7ecb73a736bb8 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 27 Dec 2016 04:22:20 +0100 Subject: [PATCH] [IMaterial] Correctly load images --- src/Components/Modules/AssetInterfaces/IMaterial.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Modules/AssetInterfaces/IMaterial.cpp b/src/Components/Modules/AssetInterfaces/IMaterial.cpp index 8d863cb1..61d32a38 100644 --- a/src/Components/Modules/AssetInterfaces/IMaterial.cpp +++ b/src/Components/Modules/AssetInterfaces/IMaterial.cpp @@ -45,7 +45,7 @@ namespace Assets material->cameraRegion = reader.readByte(); std::string techset = reader.readString(); - material->techniqueSet = Components::AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_TECHSET, techset.data()).techniqueSet; + material->techniqueSet = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_TECHSET, techset.data(), builder).techniqueSet; if (!material->techniqueSet) { @@ -91,11 +91,11 @@ namespace Assets material->textureTable[i].info.water->codeConstant[1] = reader.read(); material->textureTable[i].info.water->codeConstant[2] = reader.read(); material->textureTable[i].info.water->codeConstant[3] = reader.read(); - material->textureTable[i].info.water->image = Components::AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_IMAGE, reader.readCString()).image; + material->textureTable[i].info.water->image = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_IMAGE, reader.readString().data(), builder).image; } else { - material->textureTable[i].info.image = Components::AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_IMAGE, reader.readCString()).image; + material->textureTable[i].info.image = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_IMAGE, reader.readString().data(), builder).image; } }