Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ZoneBuilder] Remove marking function, loading does that

Browse Source
This commit is contained in:
momo5502 2016-12-23 22:58:41 +01:00
parent 39f9c73a38
commit a1e2a1e790
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp
View File

@ -61,7 +61,7 @@ namespace Assets
case 0xA: case 0xA:
{ {
//builder->markAsset(Game::XAssetType::ASSET_TYPE_SOUND, visuals->soundName); builder->loadAsset(Game::XAssetType::ASSET_TYPE_SOUND, visuals->soundName);
break; break;
} }

12
src/Components/Modules/ZoneBuilder.cpp
View File

@ -293,18 +293,6 @@ namespace Components
return header; return header;
} }
void ZoneBuilder::Zone::markAsset(Game::XAssetType type, void* ptr)
{
Game::XAsset asset { type, { ptr } };
if(std::find_if(this->markedAssets.begin(), this->markedAssets.end(), [&] (const Game::XAsset& s) { return (asset.header.data == s.header.data && asset.type == s.type); } ) != this->markedAssets.end())
{
return; // don't re-mark assets
}
AssetHandler::ZoneMark(asset, this);
this->markedAssets.push_back(asset);
}
void ZoneBuilder::Zone::writeZone() void ZoneBuilder::Zone::writeZone()
{ {
FILETIME fileTime; FILETIME fileTime;

1
src/Components/Modules/ZoneBuilder.hpp
View File

@ -33,7 +33,6 @@ namespace Components
Game::XAssetHeader saveSubAsset(Game::XAssetType type, void* ptr); Game::XAssetHeader saveSubAsset(Game::XAssetType type, void* ptr);
bool loadAsset(Game::XAssetType type, std::string name, bool isSubAsset = true); bool loadAsset(Game::XAssetType type, std::string name, bool isSubAsset = true);
bool loadAsset(Game::XAssetType type, void* data, bool isSubAsset = true); bool loadAsset(Game::XAssetType type, void* data, bool isSubAsset = true);
void markAsset(Game::XAssetType type, void* ptr);
int addScriptString(unsigned short gameIndex); int addScriptString(unsigned short gameIndex);
int addScriptString(std::string str); int addScriptString(std::string str);