mirror of
https://github.com/open-goal/jak-project
synced 2026-09-02 10:11:44 -04:00
[decomp] fisher and FIN.DGO (finalboss) level (#899)
* decomp `fisher`, `robotboss`, `light-eco`, `green-eco-lurker`, `sage-finalboss`, `robotboss-weapon`, `robotboss-misc` * fixes * add files * add `:states` list to `deftype` and fix files * test state forward decl's on a few more types * also the refs * add light-eco * whatever
This commit is contained in:
+39
-26
@@ -116,37 +116,50 @@
|
||||
)
|
||||
|
||||
;; definition for method 9 of type task-control
|
||||
;; INFO: Return type mismatch int vs game-task.
|
||||
(defmethod current-task task-control ((obj task-control))
|
||||
(cond
|
||||
((= obj *null-task-control*)
|
||||
(format 0 "ERROR<GMJ>: current-task received *null-task-control*~%")
|
||||
0
|
||||
)
|
||||
((= (-> obj current-stage) -1)
|
||||
0
|
||||
)
|
||||
(else
|
||||
(the-as int (-> obj stage (-> obj current-stage) game-task))
|
||||
)
|
||||
(the-as game-task (cond
|
||||
((= obj *null-task-control*)
|
||||
(format
|
||||
0
|
||||
"ERROR<GMJ>: current-task received *null-task-control*~%"
|
||||
)
|
||||
0
|
||||
)
|
||||
((= (-> obj current-stage) -1)
|
||||
0
|
||||
)
|
||||
(else
|
||||
(the-as
|
||||
int
|
||||
(-> obj stage (-> obj current-stage) game-task)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 10 of type task-control
|
||||
;; INFO: Return type mismatch int vs task-status.
|
||||
(defmethod current-status task-control ((obj task-control))
|
||||
(cond
|
||||
((= obj *null-task-control*)
|
||||
(format
|
||||
0
|
||||
"ERROR<GMJ>: current-status received self of *null-task-control*~%~%"
|
||||
)
|
||||
0
|
||||
)
|
||||
((= (-> obj current-stage) -1)
|
||||
0
|
||||
)
|
||||
(else
|
||||
(the-as int (-> obj stage (-> obj current-stage) status))
|
||||
)
|
||||
(the-as task-status (cond
|
||||
((= obj *null-task-control*)
|
||||
(format
|
||||
0
|
||||
"ERROR<GMJ>: current-status received self of *null-task-control*~%~%"
|
||||
)
|
||||
0
|
||||
)
|
||||
((= (-> obj current-stage) -1)
|
||||
0
|
||||
)
|
||||
(else
|
||||
(the-as
|
||||
int
|
||||
(-> obj stage (-> obj current-stage) status)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -186,7 +199,7 @@
|
||||
(format
|
||||
0
|
||||
"ERROR<GMJ>: close-status! received non-existent task-cstage(~S ~S)--returning #t.~%"
|
||||
(game-task->string (the-as game-task a0-2))
|
||||
(game-task->string a0-2)
|
||||
(task-status->string arg0)
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user