Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-23 06:09:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

decomp: don't mutate allowed/banned object lists (#2073)

Browse Source 
oops, leads to some very confusing behaviour
This commit is contained in:
Tyler Wilding 2022-12-30 23:57:01 -05:00 committed by GitHub
parent 749611d47c
commit 6aa15c897f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/util/set_util.h
View File

@ -4,7 +4,7 @@
namespace set_util {
template <typename T>
std::unordered_set<T> intersection(std::unordered_set<T>& set1, std::unordered_set<T>& set2) {
std::unordered_set<T> intersection(std::unordered_set<T> set1, std::unordered_set<T> set2) {
if (set2.size() < set1.size()) {
auto temp = set1;
set1 = set2;

14
goal_src/jak2/game.gp
View File

@ -3920,13 +3920,9 @@
(goal-src-sequence
""
:deps ("$OUT/obj/los-control.o")
;; "levels/common/ai/ai-task-h.gc"
;; "levels/common/ai/bot-h.gc"
;; "levels/common/ai/bot.gc"
;; "levels/common/ai/bot-states.gc"
;; "levels/undefined/hal-h.gc"
;; "levels/undefined/hal-task.gc"
;; "levels/undefined/hal.gc"
"levels/undefined/hal-h.gc"
"levels/undefined/hal-task.gc"
"levels/undefined/hal.gc"
"levels/undefined/ruf-h.gc"
"levels/undefined/ruf-task.gc"
"levels/undefined/ruf.gc"
@ -3946,21 +3942,17 @@
"levels/sewer/sewer-obs2.gc"
"levels/sewer/hosehead.gc"
"levels/sewer/hosehead-fake.gc"
;; "levels/common/enemy/amphibian/amphibian.gc"
"levels/sewer/gator.gc"
;; "levels/common/enemy/fodder/fodder.gc"
"levels/sewer/hal2-course.gc"
"levels/sewer/mog2-course.gc"
"levels/sewer/jinx2-course.gc"
"levels/sewer/grim2-course.gc"
"levels/sewer/sewer-scenes.gc"
;; "levels/common/entities/sew-gunturret.gc"
)
(copy-textures 1133 1135 1134 3383)
(copy-gos
;; "com-airlock-inner-ag"
"sew-elevator-ag"
"sewerb-vis"
)