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

update readme and fix always playing str (#1139)

Browse Source 
* update readme deps

* replace assert

* bump timeout

* fix memory corruption in kernel

* use unknown if level name is invalid
This commit is contained in:
water111
2022-02-08 19:02:47 -05:00
committed by GitHub
parent 3f394ef4d6
commit 78cde74d5a
243 changed files with 3525 additions and 3503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/util/DgoReader.cpp
+4 -4
View File
@@ -28,7 +28,7 @@ DgoReader::DgoReader(std::string file_name, const std::vector<u8>& data)
(int)reader.bytes_left());
obj_header.size = reader.bytes_left();
}
assert(reader.bytes_left() >= obj_header.size);
ASSERT(reader.bytes_left() >= obj_header.size);
assert_string_empty_after(obj_header.name, 60);
DgoDataEntry entry;
@@ -44,7 +44,7 @@ DgoReader::DgoReader(std::string file_name, const std::vector<u8>& data)
all_unique_names.insert(entry.unique_name);
entry.data.resize(obj_header.size);
assert((reader.get_seek() % 16) == 0);
ASSERT((reader.get_seek() % 16) == 0);
memcpy(entry.data.data(), reader.here(), obj_header.size);
m_entries.push_back(entry);
@@ -52,8 +52,8 @@ DgoReader::DgoReader(std::string file_name, const std::vector<u8>& data)
}
// check we're at the end
assert(0 == reader.bytes_left());
assert(all_unique_names.size() == m_entries.size());
ASSERT(0 == reader.bytes_left());
ASSERT(all_unique_names.size() == m_entries.size());
}
std::string DgoReader::description_as_json() const {