diff --git a/decompiler/config/jak1/ntsc_v1/hacks.jsonc b/decompiler/config/jak1/ntsc_v1/hacks.jsonc index 771715535..c9b83b339 100644 --- a/decompiler/config/jak1/ntsc_v1/hacks.jsonc +++ b/decompiler/config/jak1/ntsc_v1/hacks.jsonc @@ -634,7 +634,7 @@ // there are some missing textures. I don't know what the game actually does here. // the format for entries is [level, tpage, index] - "missing_textures": [["finalboss", 1419, 3]], + "missing_textures": [["finalboss-vis", 1419, 3]], // some object files have garbage pad data at the end which makes the decompiler // assume they must be different files, such as the art group for orb-cache-top. diff --git a/decompiler/config/jak2/ntsc_v1/hacks.jsonc b/decompiler/config/jak2/ntsc_v1/hacks.jsonc index cd609bbfc..b28403c10 100644 --- a/decompiler/config/jak2/ntsc_v1/hacks.jsonc +++ b/decompiler/config/jak2/ntsc_v1/hacks.jsonc @@ -769,7 +769,7 @@ // there are some missing textures. I don't know what the game actually does here. // the format for entries is [level, tpage, index] "missing_textures": [ - ["vinroom", 0, 0], + ["vinroom-vis", 0, 0], ["ctyfence", 0, 0] ], diff --git a/decompiler/level_extractor/extract_level.cpp b/decompiler/level_extractor/extract_level.cpp index 9fdfe5faa..191f1a2d3 100644 --- a/decompiler/level_extractor/extract_level.cpp +++ b/decompiler/level_extractor/extract_level.cpp @@ -142,7 +142,7 @@ std::vector extract_tex_remap(const ObjectFileDB& db, lg::warn("Skipping extract for {} because the BSP file was not found", dgo_name); return {}; } - std::string level_name = bsp_rec->name.substr(0, bsp_rec->name.length() - 4); + std::string level_name = bsp_rec->name; lg::info("Processing level {} ({})", dgo_name, level_name); const auto& bsp_file = db.lookup_record(*bsp_rec); @@ -167,7 +167,7 @@ level_tools::BspHeader extract_bsp_from_level(const ObjectFileDB& db, lg::warn("Skipping extract for {} because the BSP file was not found", dgo_name); return {}; } - std::string level_name = bsp_rec->name.substr(0, bsp_rec->name.length() - 4); + std::string level_name = bsp_rec->name; lg::info("Processing level {} ({})", dgo_name, level_name); const auto& bsp_file = db.lookup_record(*bsp_rec); diff --git a/game/settings/settings.cpp b/game/settings/settings.cpp index adcb819d8..f17edbcca 100644 --- a/game/settings/settings.cpp +++ b/game/settings/settings.cpp @@ -40,7 +40,7 @@ DebugSettings::DebugSettings() { if (!file_util::file_exists(file_path)) { return; } - lg::info("Loading display settings at {}", file_path); + lg::info("Loading debug settings at {}", file_path); auto raw = file_util::read_text_file(file_path); from_json(parse_commented_json(raw, "debug-settings.json"), *this); } catch (std::exception& e) { @@ -123,7 +123,7 @@ InputSettings::InputSettings() { if (!file_util::file_exists(file_path)) { return; } - lg::info("Loading display settings at {}", file_path); + lg::info("Loading input settings at {}", file_path); auto raw = file_util::read_text_file(file_path); from_json(parse_commented_json(raw, "input-settings.json"), *this); } catch (std::exception& e) {