mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-10 23:22:17 -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
decompiler/data/TextureDB.cpp
+7 -7
View File
@@ -1,7 +1,7 @@
#include "TextureDB.h"
#include "third-party/fmt/core.h"
#include "common/util/assert.h"
#include "common/util/Assert.h"
namespace decompiler {
@@ -16,17 +16,17 @@ void TextureDB::add_texture(u32 tpage,
if (existing_tpage_name == tpage_names.end()) {
tpage_names[tpage] = tpage_name;
} else {
assert(existing_tpage_name->second == tpage_name);
ASSERT(existing_tpage_name->second == tpage_name);
}
u32 combo_id = (tpage << 16) | texid;
auto existing_tex = textures.find(combo_id);
if (existing_tex != textures.end()) {
assert(existing_tex->second.name == tex_name);
assert(existing_tex->second.w == w);
assert(existing_tex->second.h == h);
assert(existing_tex->second.rgba_bytes == data);
assert(existing_tex->second.page == tpage);
ASSERT(existing_tex->second.name == tex_name);
ASSERT(existing_tex->second.w == w);
ASSERT(existing_tex->second.h == h);
ASSERT(existing_tex->second.rgba_bytes == data);
ASSERT(existing_tex->second.page == tpage);
} else {
auto& new_tex = textures[combo_id];
new_tex.rgba_bytes = data;