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

fix merge

Browse Source
This commit is contained in:
water
2021-08-12 19:33:47 -04:00
parent ee71b52b27
commit 43a39b197e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
+2 -1
View File
@@ -1862,7 +1862,8 @@
[[40, 43], "a0", "dma-packet"],
[[63, 69], "a0", "dma-packet"],
[[78, 79], "a0", "dma-packet"],
[7
[79, "a0", "(pointer uint64)"]
],
"(anon-function 6 water-anim)": [
[6, "a0", "vector"]
],
game/graphics/opengl_renderer/DirectRenderer.h
-1
View File
@@ -3,7 +3,6 @@
#include <vector>
#include "game/graphics/opengl_renderer/BucketRenderer.h"
#include "game/graphics/dma/gs.h"
#include "game/graphics/types.h"
#include "common/math/Vector.h"
#include "common/util/SmallVector.h"
#include "game/graphics/pipelines/opengl.h"