diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index 871d2909cb..eebcd72416 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -1004,7 +1004,7 @@ (new (symbol type basic) _type_ 0) (activate (_type_ process-tree basic pointer) process-tree 9) (deactivate (_type_) none 10) - (copy-defaults (_type_ res-lump) none 11) + (copy-defaults! (_type_ res-lump) none 11) (run-logic? (_type_) symbol 12) (dummy-method () none 13) ) diff --git a/goal_src/kernel-defs.gc b/goal_src/kernel-defs.gc index 93799c8f18..6a85a584be 100644 --- a/goal_src/kernel-defs.gc +++ b/goal_src/kernel-defs.gc @@ -243,7 +243,7 @@ (new (symbol type basic) _type_ 0) (activate (_type_ process-tree basic pointer) process-tree 9) (deactivate (_type_) none 10) - (copy-defaults (_type_ res-lump) none 11) + (copy-defaults! (_type_ res-lump) none 11) (run-logic? (_type_) symbol 12) (dummy-method () none 13) ) diff --git a/goal_src/kernel/gkernel-h.gc b/goal_src/kernel/gkernel-h.gc index bd7131301c..b9e9ec2559 100644 --- a/goal_src/kernel/gkernel-h.gc +++ b/goal_src/kernel/gkernel-h.gc @@ -212,7 +212,7 @@ (new (symbol type basic) _type_ 0) (activate (_type_ process-tree basic pointer) process-tree 9) (deactivate (_type_) none 10) - (copy-defaults (_type_ res-lump) none 11) + (copy-defaults! (_type_ res-lump) none 11) (run-logic? (_type_) symbol 12) (dummy-method () none 13) ) diff --git a/goal_src/levels/common/rigid-body.gc b/goal_src/levels/common/rigid-body.gc index 27b61ff1e7..9532020c6b 100644 --- a/goal_src/levels/common/rigid-body.gc +++ b/goal_src/levels/common/rigid-body.gc @@ -1169,7 +1169,7 @@ ;; definition for method 11 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. (defmethod - copy-defaults + copy-defaults! rigid-body-platform ((obj rigid-body-platform) (arg0 res-lump)) (set! (-> obj mask) (the-as process-mask (logior #x80000 (-> obj mask)))) diff --git a/test/decompiler/reference/levels/common/rigid-body_REF.gc b/test/decompiler/reference/levels/common/rigid-body_REF.gc index 4c79a75d59..3ce3482bfe 100644 --- a/test/decompiler/reference/levels/common/rigid-body_REF.gc +++ b/test/decompiler/reference/levels/common/rigid-body_REF.gc @@ -1248,7 +1248,7 @@ ;; definition for method 11 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. (defmethod - copy-defaults + copy-defaults! rigid-body-platform ((obj rigid-body-platform) (arg0 res-lump)) (set! (-> obj mask) (the-as process-mask (logior #x80000 (-> obj mask)))) diff --git a/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc b/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc index 5dde03778a..c7d81e6dcd 100644 --- a/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-teetertotter_REF.gc @@ -362,7 +362,7 @@ ) ;; definition for method 11 of type teetertotter -(defmethod dummy-method-11 teetertotter ((obj teetertotter) (arg0 object)) +(defmethod copy-defaults! teetertotter ((obj teetertotter) (arg0 res-lump)) (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)) @@ -479,7 +479,3 @@ (go teetertotter-idle) (none) ) - - - - diff --git a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc index 61d385ba0d..903036afb5 100644 --- a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc @@ -285,7 +285,7 @@ ) ;; definition for method 11 of type silostep -(defmethod dummy-method-11 silostep ((obj silostep) (arg0 object)) +(defmethod copy-defaults! silostep ((obj silostep) (arg0 res-lump)) (logior! (-> obj mask) (process-mask movie-subject)) (let ((s4-0 @@ -327,8 +327,8 @@ (set! (-> obj anim-limit) (* - ((method-of-type res-lump get-property-value-float) - (the-as res-lump arg0) + (get-property-value-float + arg0 'distance 'interp -1000000000.0 @@ -466,7 +466,3 @@ 0 (none) ) - - - -