XLabsProject-Mirror/iw6x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/iw6x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Prevent game's fake rawfiles from being compiled

Browse Source
This commit is contained in:
FutureRave 2022-10-18 21:36:55 +01:00
parent e564b82d52
commit 163350589d
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/component/gsc/script_loading.cpp
View File

@ -49,6 +49,14 @@ namespace gsc
return true;
}
// This will prevent 'fake' GSC raw files from being compiled.
// They are parsed by the game's own parser later as they are special files.
if (name.starts_with("maps/createfx") || name.starts_with("maps/createart") ||
(name.starts_with("maps/mp") && name.ends_with("_fx.gsc")))
{
return false;
}
const auto* name_str = name.data();
if (game::DB_XAssetExists(game::ASSET_TYPE_RAWFILE, name_str) &&
!game::DB_IsXAssetDefault(game::ASSET_TYPE_RAWFILE, name_str))
@ -70,9 +78,9 @@ namespace gsc
game::ScriptFile* load_custom_script(const char* file_name, const std::string& real_name)
{
if (const auto got = loaded_scripts.find(real_name); got != loaded_scripts.end())
if (const auto itr = loaded_scripts.find(real_name); itr != loaded_scripts.end())
{
return got->second;
return itr->second;
}
std::string source_buffer{};
@ -288,7 +296,7 @@ namespace gsc
}
}
game::ScriptFile* find_script([[maybe_unused]] game::XAssetType type, const char* name, [[maybe_unused]] int allow_create_default)
game::ScriptFile* find_script(game::XAssetType type, const char* name, int allow_create_default)
{
std::string real_name = name;
const auto id = static_cast<std::uint16_t>(std::atoi(name));
@ -303,7 +311,7 @@ namespace gsc
return script;
}
return game::DB_FindXAssetHeader(game::ASSET_TYPE_SCRIPTFILE, name, 1).scriptfile;
return game::DB_FindXAssetHeader(type, name, allow_create_default).scriptfile;
}
class loading final : public component_interface