Rim/gsc-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix(fs_read): check for instance (#178)

Browse Source 
Co-authored-by: xensik <xensik@pm.me>
This commit is contained in:
INeedGames 2024-01-12 13:37:49 -06:00 committed by GitHub
parent ecffa889ad
commit 638ff54d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tool/main.cpp
View File

@ -439,35 +439,35 @@ auto fs_read(context const* ctx, std::string const& name) -> std::pair<buffer, s
{ {
auto path = fs::path{ name }; auto path = fs::path{ name };
auto bin_ext = ".gscbin";
auto gsc_ext = ".gsc";
auto gsh_ext = ".gsh";
if (ctx->instance() == gsc::instance::client)
{
bin_ext = ".cscbin";
gsc_ext = ".csc";
}
if (!utils::file::exists(path)) if (!utils::file::exists(path))
{ {
path.replace_extension(""); auto const name_noext = path.replace_extension("").string();
auto id = ctx->token_id(path.string()); auto id = ctx->token_id(name_noext);
if (id > 0) if (id > 0)
{ {
path = fs::path{ std::to_string(id) + ".gscbin" }; path = fs::path{ std::to_string(id) + bin_ext };
} }
if (!utils::file::exists(path)) if (!utils::file::exists(path))
{ {
path = fs::path{ path.string() + ".gscbin" }; path = fs::path{ name_noext + bin_ext };
}
if (!utils::file::exists(path))
{
path = fs::path{ path.string() + ".gsh" };
}
if (!utils::file::exists(path))
{
path = fs::path{ path.string() + ".gsc" };
} }
} }
auto data = utils::file::read(path); auto data = utils::file::read(path);
if (path.extension().string() == ".gscbin" || (path.extension().string() != ".gsh" && path.extension().string() != ".gsc")) if (path.extension().string() == bin_ext || (path.extension().string() != gsh_ext && path.extension().string() != gsc_ext))
{ {
asset s; asset s;
s.deserialize(data); s.deserialize(data);