Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

better patch for dev rawfiles compiling

Browse Source
This commit is contained in:
m 2022-10-24 03:29:08 -05:00
parent f316ba12c2
commit 907ccdfac1
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,28 +88,29 @@ namespace gsc
return itr->second; return itr->second;
} }
/* std::string source_buffer;
without this check, gsc rawfiles that a map contains will be compiled. however, these aren't the correct files. const auto rawfile_gsc_exists = read_script_file(real_name + ".gsc", &source_buffer);
each rawfile has a scriptfile counterpart in asset pool that is meant to be used instead. if (!rawfile_gsc_exists || source_buffer.empty())
the gsc rawfiles are just leftover from creating the maps.
(if you are creating a custom map, you can safely have gsc rawfiles without having scriptfile counterparts)
*/
if (real_name.starts_with("maps/createfx") || real_name.starts_with("maps/createart")
|| (real_name.starts_with("maps/mp") && real_name.ends_with("_fx.gsc")))
{
if (game::DB_XAssetExists(game::ASSET_TYPE_SCRIPTFILE, real_name.data()))
{
return game::DB_FindXAssetHeader(game::ASSET_TYPE_SCRIPTFILE, real_name.data(), false).scriptfile;
}
}
std::string source_buffer{};
if (!read_script_file(real_name + ".gsc", &source_buffer))
{ {
return nullptr; return nullptr;
} }
if (game::DB_XAssetExists(game::ASSET_TYPE_SCRIPTFILE, file_name) &&
!game::DB_IsXAssetDefault(game::ASSET_TYPE_SCRIPTFILE, file_name))
{
// filter out developer rawfiles that won't compile
if ((real_name.starts_with("maps/createfx") || real_name.starts_with("maps/createart") || real_name.starts_with("maps/mp"))
&& (real_name.ends_with("_fx") || real_name.ends_with("_fog") || real_name.ends_with("_hdr")))
{
return game::DB_FindXAssetHeader(game::ASSET_TYPE_SCRIPTFILE, file_name, false).scriptfile;
}
if (!rawfile_gsc_exists)
{
return game::DB_FindXAssetHeader(game::ASSET_TYPE_SCRIPTFILE, file_name, false).scriptfile;
}
}
std::vector<std::uint8_t> data; std::vector<std::uint8_t> data;
data.assign(source_buffer.begin(), source_buffer.end()); data.assign(source_buffer.begin(), source_buffer.end());