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

New Pretty Printer (#994)

Browse Source 
* begin work on improved pretty printer

* update ref

* finish pretty printer

* force line break for defstate
This commit is contained in:
water111
2021-12-04 16:06:01 -05:00
committed by GitHub
parent e69266bc95
commit dbc266c00b
362 changed files with 203258 additions and 275281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/level_extractor/extract_level.cpp
+8 -5
View File
@@ -10,8 +10,8 @@ namespace decompiler {
/*!
* Look through files in a DGO and find the bsp-header file (the level)
*/
ObjectFileRecord get_bsp_file(const std::vector<ObjectFileRecord>& records) {
ObjectFileRecord result;
std::optional<ObjectFileRecord> get_bsp_file(const std::vector<ObjectFileRecord>& records) {
std::optional<ObjectFileRecord> result;
bool found = false;
for (auto& file : records) {
if (file.name.length() > 4 && file.name.substr(file.name.length() - 4) == "-vis") {
@@ -20,7 +20,6 @@ ObjectFileRecord get_bsp_file(const std::vector<ObjectFileRecord>& records) {
result = file;
}
}
assert(found);
return result;
}
@@ -57,10 +56,14 @@ void extract_from_level(ObjectFileDB& db,
}
auto bsp_rec = get_bsp_file(db.obj_files_by_dgo.at(dgo_name));
std::string level_name = bsp_rec.name.substr(0, bsp_rec.name.length() - 4);
if (!bsp_rec) {
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);
fmt::print("Processing level {} ({})\n", dgo_name, level_name);
auto& bsp_file = db.lookup_record(bsp_rec);
auto& bsp_file = db.lookup_record(*bsp_rec);
bool ok = is_valid_bsp(bsp_file.linked_data);
assert(ok);