From 43da4088e63c96d876edecd2f5de7122feb56b3b Mon Sep 17 00:00:00 2001 From: ZedB0T <89345505+Zedb0T@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:39:57 -0500 Subject: [PATCH] Fix Bombbot crash (#2296) --- decompiler/config/jak2/all-types.gc | 1 - goal_src/jak2/levels/common/enemy/bombots/bombbot.gc | 3 +-- .../reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 50a0f4c1dd..5a6c71e684 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -43259,7 +43259,6 @@ :size-assert #x59c :flag-assert #xb90520059c (:methods - (kill-prefer-falling () symbol :replace 73) (explode () _type_ :state 178) (bombbot-method-179 (_type_) none 179) (bombbot-method-180 (_type_) none 180) diff --git a/goal_src/jak2/levels/common/enemy/bombots/bombbot.gc b/goal_src/jak2/levels/common/enemy/bombots/bombbot.gc index a39c2745f4..22c3dfb3e4 100644 --- a/goal_src/jak2/levels/common/enemy/bombots/bombbot.gc +++ b/goal_src/jak2/levels/common/enemy/bombots/bombbot.gc @@ -577,7 +577,6 @@ :size-assert #x59c :flag-assert #xb90520059c (:methods - (kill-prefer-falling () symbol :replace 73) (explode () _type_ :state 178) (bombbot-method-179 (_type_) none 179) (bombbot-method-180 (_type_) none 180) @@ -1308,7 +1307,7 @@ (cond ((zero? (-> obj hit-points)) (if (not (and (-> obj next-state) (= (-> obj next-state name) 'die))) - ((method-of-object obj kill-prefer-falling)) + (kill-prefer-falling obj) ) ) (else diff --git a/test/decompiler/reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc index ece322a51a..190855320c 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/bombots/bombbot_REF.gc @@ -623,7 +623,6 @@ :size-assert #x59c :flag-assert #xb90520059c (:methods - (kill-prefer-falling () symbol :replace 73) (explode () _type_ :state 178) (bombbot-method-179 (_type_) none 179) (bombbot-method-180 (_type_) none 180) @@ -1437,7 +1436,7 @@ (cond ((zero? (-> obj hit-points)) (if (not (and (-> obj next-state) (= (-> obj next-state name) 'die))) - ((method-of-object obj kill-prefer-falling)) + (kill-prefer-falling obj) ) ) (else