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

[jak2] fix hitting enemies after they die (#2475)

Browse Source 
Closes #2473 

The return type of a method was wrong.
This commit is contained in:
water111
2023-04-12 20:43:04 -04:00
committed by GitHub
parent 6b6a565d1a
commit 1f4872b25d
7 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+1 -1
View File
@@ -32921,7 +32921,7 @@
"Handles various events for the enemy
@TODO - unsure if there is a pattern for the events and this should have a more specific name"
(_type_ process int symbol event-message-block) object 74)
(enemy-method-75 (_type_ process touching-shapes-entry) none 75)
(enemy-method-75 (_type_ process touching-shapes-entry) object 75)
(enemy-method-76 (_type_ process event-message-block) symbol 76)
(enemy-method-77 (_type_ (pointer float)) symbol 77)
(enemy-method-78 (_type_ (pointer float)) symbol 78)
goal_src/jak2/engine/ai/enemy-h.gc
+1 -1
View File
@@ -355,7 +355,7 @@
(react-to-focus (_type_) none 72)
(kill-prefer-falling (_type_) object 73)
(general-event-handler (_type_ process int symbol event-message-block) object 74)
(enemy-method-75 (_type_ process touching-shapes-entry) none 75)
(enemy-method-75 (_type_ process touching-shapes-entry) object 75)
(enemy-method-76 (_type_ process event-message-block) symbol 76)
(enemy-method-77 (_type_ (pointer float)) symbol 77)
(enemy-method-78 (_type_ (pointer float)) symbol 78)
goal_src/jak2/engine/ai/enemy.gc
-1
View File
@@ -2099,7 +2099,6 @@ This commonly includes things such as:
)
)
)
(none)
)
(defmethod enemy-method-76 enemy ((obj enemy) (arg0 process) (arg1 event-message-block))
goal_src/jak2/levels/temple/rhino.gc
-1
View File
@@ -823,7 +823,6 @@
)
)
)
(none)
)
(defmethod enemy-method-104 rhino ((obj rhino) (arg0 process) (arg1 uint) (arg2 uint))
test/decompiler/reference/jak2/engine/ai/enemy-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -455,7 +455,7 @@
(react-to-focus (_type_) none 72)
(kill-prefer-falling (_type_) object 73)
(general-event-handler (_type_ process int symbol event-message-block) object 74)
(enemy-method-75 (_type_ process touching-shapes-entry) none 75)
(enemy-method-75 (_type_ process touching-shapes-entry) object 75)
(enemy-method-76 (_type_ process event-message-block) symbol 76)
(enemy-method-77 (_type_ (pointer float)) symbol 77)
(enemy-method-78 (_type_ (pointer float)) symbol 78)
test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
Generated Vendored
+2 -2
View File
@@ -1707,9 +1707,11 @@ This commonly includes things such as:
;; WARN: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 17]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 28]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 37]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 89]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 105]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 202]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 211]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 274]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 346]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 407]
@@ -2141,7 +2143,6 @@ This commonly includes things such as:
)
;; definition for method 75 of type enemy
;; WARN: Return type mismatch object vs none.
(defmethod enemy-method-75 enemy ((obj enemy) (arg0 process) (arg1 touching-shapes-entry))
(let* ((s4-0 (-> arg1 handle1))
(s2-0 arg0)
@@ -2190,7 +2191,6 @@ This commonly includes things such as:
)
)
)
(none)
)
;; definition for method 76 of type enemy
test/decompiler/reference/jak2/levels/temple/rhino_REF.gc
Generated Vendored
+33 -31
View File
@@ -1046,7 +1046,7 @@
)
;; definition for method 75 of type rhino
;; WARN: Return type mismatch symbol vs none.
;; WARN: Return type mismatch symbol vs object.
(defmethod enemy-method-75 rhino ((obj rhino) (arg0 process) (arg1 touching-shapes-entry))
(let* ((s5-0 (-> arg1 handle1))
(s3-0 arg0)
@@ -1055,41 +1055,43 @@
)
)
)
(when (and s5-0 v1-0)
(cond
((and (focus-test? obj dangerous) ((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action deadly)
(collide-action)
)
)
(let ((a3-2 (if ((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action persistent-attack)
(collide-action)
)
(-> obj persistent-attack-id)
(-> obj attack-id)
)
)
)
(enemy-method-104 obj arg0 (the-as uint s5-0) a3-2)
(the-as
object
(when (and s5-0 v1-0)
(cond
((and (focus-test? obj dangerous) ((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action deadly)
(collide-action)
)
)
(let ((a3-2 (if ((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action persistent-attack)
(collide-action)
)
(-> obj persistent-attack-id)
(-> obj attack-id)
)
)
)
(enemy-method-104 obj arg0 (the-as uint s5-0) a3-2)
)
)
(((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action no-standon)
(collide-action)
)
(send-shoves (-> obj root-override2) arg0 (the-as touching-shapes-entry s5-0) 0.7 6144.0 16384.0)
)
)
(((method-of-type touching-shapes-entry prims-touching-action?)
(the-as touching-shapes-entry s5-0)
(-> obj root-override2)
(collide-action no-standon)
(collide-action)
)
(send-shoves (-> obj root-override2) arg0 (the-as touching-shapes-entry s5-0) 0.7 6144.0 16384.0)
)
)
)
)
(none)
)
;; definition for method 104 of type rhino