fix mistakes in projectiles.gc (#3187)

Fixes #3184
This commit is contained in:
ManDude
2023-11-11 11:40:29 +00:00
committed by GitHub
parent 55611169ee
commit 288624b90f
4 changed files with 19 additions and 10 deletions
@@ -1190,7 +1190,7 @@
"(code projectile-die projectile)": [[16, "event-message-block"]],
"projectile-init-by-other": [[16, "collide-edge-hold-list"]],
"projectile-init-by-other": [[16, "overlaps-others-params"]],
"(method 27 projectile-yellow)": [[16, "vector"]],
+6 -5
View File
@@ -678,7 +678,8 @@
(+! f0-16 (-> self old-dist v1-35))
)
;; og:preserve-this changed for high fps. This fixes projectile collision issues
(if (or (and (logtest? (-> self root status) (cshape-moving-flags twall)) (< f0-16 (* (-> *display* time-adjust-ratio) 2048.0))) (< f0-16 (* (-> *display* time-adjust-ratio) 2048.0)))
(if (or (and (logtest? (-> self root status) (cshape-moving-flags twall)) (< f0-16 (* (-> *display* time-adjust-ratio) (meters 0.5))))
(< f0-16 (* (-> *display* time-adjust-ratio) (meters 0.05))))
(set! gp-0 #t)
)
)
@@ -863,10 +864,10 @@
(projectile-method-27 self)
(projectile-method-24 self)
(when (not (type-type? (-> self type) projectile-blue))
(let ((a1-8 (new 'stack-no-clear 'collide-edge-hold-list)))
(set! (-> a1-8 num-allocs) (the-as uint 1))
(set! (-> a1-8 num-attempts) (the-as uint *touching-list*))
(find-overlapping-shapes (-> self root) (the-as overlaps-others-params a1-8))
(let ((a1-8 (new 'stack-no-clear 'overlaps-others-params)))
(set! (-> a1-8 options) (the-as uint 1))
(set! (-> a1-8 tlist) *touching-list*)
(find-overlapping-shapes (-> self root) a1-8)
)
)
(set! (-> self event-hook) (-> (method-of-object self projectile-moving) event))
+8 -4
View File
@@ -920,10 +920,10 @@
(projectile-method-27 self)
(projectile-method-24 self)
(when (not (type-type? (-> self type) projectile-blue))
(let ((a1-8 (new 'stack-no-clear 'collide-edge-hold-list)))
(set! (-> a1-8 num-allocs) (the-as uint 1))
(set! (-> a1-8 num-attempts) (the-as uint *touching-list*))
(find-overlapping-shapes (-> self root) (the-as overlaps-others-params a1-8))
(let ((a1-8 (new 'stack-no-clear 'overlaps-others-params)))
(set! (-> a1-8 options) (the-as uint 1))
(set! (-> a1-8 tlist) *touching-list*)
(find-overlapping-shapes (-> self root) a1-8)
)
)
(set! (-> self event-hook) (-> (method-of-object self projectile-moving) event))
@@ -1302,3 +1302,7 @@
(go-virtual projectile-die)
)
)
@@ -430,3 +430,7 @@
(go-virtual projectile-die)
)
)