mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-06 19:21:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow per-file override of type-to-artgroup map + use correct divide by zero handler in civilian.gc (#3148)

Browse Source
This commit is contained in:
ManDude
2023-11-04 18:25:13 +00:00
committed by GitHub
parent de4b3d272d
commit 8d1fec34b4
8 changed files with 155 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config.cpp
+5
View File
@@ -297,6 +297,11 @@ Config make_config_via_json(nlohmann::json& json) {
auto art_info_json = read_json_file_from_config(json, "art_info_file");
config.art_group_type_remap =
art_info_json.at("type_remap").get<std::unordered_map<std::string, std::string>>();
if (art_info_json.contains("file_override")) {
config.art_group_file_override =
art_info_json.at("file_override")
.get<std::unordered_map<std::string, std::unordered_map<std::string, std::string>>>();
}
config.joint_node_hacks =
art_info_json.at("joint_node_hacks").get<std::unordered_map<std::string, std::string>>();