mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 00:57:44 -04:00
[jak3] implement autocollect and city turbo board cheats, fix actor heap and level flags (#3541)
This commit is contained in:
ManDude
GitHub
parent
cefb371681
commit
ea1271cfd0
|
|
@ -7555,37 +7555,27 @@
|
|||
:type uint32
|
||||
:bitfield #t
|
||||
(lf0 0)
|
||||
(lf1 1)
|
||||
(lf2 2)
|
||||
(lf3 3)
|
||||
(lf4 4)
|
||||
(lf5 5)
|
||||
(lf6 6)
|
||||
(lf7 7)
|
||||
(lf8 8)
|
||||
(lf9 9)
|
||||
(not-physical 1)
|
||||
(ctycar 2)
|
||||
(ctypes 3)
|
||||
(external 4)
|
||||
(title 5)
|
||||
(borrow-load 6)
|
||||
(end-mode 7)
|
||||
(flut 8)
|
||||
(sky 9)
|
||||
(use-camera-other 10)
|
||||
(lf11 11)
|
||||
(lf12 12)
|
||||
(lf13 13)
|
||||
(display-wait 11)
|
||||
(ocean-near-translucent 12)
|
||||
(ocean-far 13)
|
||||
(low-res-hfrag 14)
|
||||
(lf15 15)
|
||||
(lf16 16)
|
||||
(lf17 17)
|
||||
(lf18 18)
|
||||
(lf19 19)
|
||||
(lf20 20)
|
||||
(city-borrow-available 15)
|
||||
(mech 16)
|
||||
(allow-unloaded 17)
|
||||
(check-taskname-for-continue 18)
|
||||
(city-borrow-high-priority 19)
|
||||
(ocean-all 20)
|
||||
(desert 21)
|
||||
(lf22 22)
|
||||
(lf23 23)
|
||||
(lf24 24)
|
||||
(lf25 25)
|
||||
(lf26 26)
|
||||
(lf27 27)
|
||||
(lf28 28)
|
||||
(lf29 29)
|
||||
(lf30 30)
|
||||
(lf31 31)
|
||||
)
|
||||
;; ---level-h:level-flags
|
||||
|
||||
|
|
|
|||
|
|
@ -472,11 +472,6 @@ void* RPC_Loader(unsigned int /*fno*/, void* data, int size) {
|
|||
}
|
||||
|
||||
int VBlank_Handler(void*) {
|
||||
bool bVar1;
|
||||
int iVar2;
|
||||
int iVar3;
|
||||
uint8_t uVar4;
|
||||
|
||||
IopTicks = IopTicks + 1;
|
||||
if (gSoundEnable == 0) {
|
||||
return 1;
|
||||
|
|
@ -543,18 +538,14 @@ LAB_00008d9c:
|
|||
info.diskspeed[1] = 0 /*DAT_00013488*/;
|
||||
info.lastspeed = 0 /*gLastSpeed*/;
|
||||
info.dupseg = 0 /*gDupSeg*/;
|
||||
iVar2 = 1;
|
||||
do {
|
||||
iVar3 = snd_GetVoiceStatus(iVar2);
|
||||
uVar4 = '\0';
|
||||
if (iVar3 == 1) {
|
||||
uVar4 = 0xff;
|
||||
for (int i = 0; i < 48; i++) {
|
||||
if (snd_GetVoiceStatus(i) == 1) {
|
||||
info.chinfo[i] = -1;
|
||||
} else {
|
||||
info.chinfo[i] = 0;
|
||||
}
|
||||
info.chinfo[iVar2] = uVar4;
|
||||
bVar1 = iVar2 < 0x30;
|
||||
iVar2 = iVar2 + 1;
|
||||
} while (bVar1);
|
||||
LookupSound(0x29a); // lol idk
|
||||
}
|
||||
LookupSound(666); // music
|
||||
|
||||
/*
|
||||
local_38 = &info;
|
||||
|
|
|
|||
|
|
@ -2410,6 +2410,13 @@
|
|||
(if arg5
|
||||
(mem-copy! (&-> sv-56 type) (&-> arg5 type) 40)
|
||||
)
|
||||
;; og:preserve-this pc port cheat
|
||||
(#when PC_PORT
|
||||
(when (and (pc-cheats? (-> *pc-settings* cheats) suck-in-all)
|
||||
(!= arg1 (pickup-type skill)))
|
||||
(logior! (-> sv-56 options) (actor-option suck-in))
|
||||
)
|
||||
)
|
||||
(set! (-> sv-56 pickup-type) s2-0)
|
||||
(if (not (logtest? (actor-option dont-override-fact) (-> sv-56 options)))
|
||||
(set! (-> sv-56 pickup-spawn-amount) 1.0)
|
||||
|
|
|
|||
|
|
@ -2367,6 +2367,6 @@
|
|||
|
||||
(define *foreground* (new 'global 'foreground-globals))
|
||||
|
||||
(define *foreground-draw-engine* (new 'global 'engine 'draw 768 connection))
|
||||
(define *foreground-draw-engine* (new 'global 'engine 'draw PROCESS_HEAP_MAX connection))
|
||||
|
||||
(kmemclose)
|
||||
|
|
|
|||
|
|
@ -530,7 +530,7 @@
|
|||
(dotimes (v1-19 (-> *level* length))
|
||||
(let ((a0-52 (-> *level* level v1-19)))
|
||||
(when (= (-> a0-52 status) 'active)
|
||||
(if (logtest? (-> a0-52 info level-flags) (level-flags lf9))
|
||||
(if (logtest? (-> a0-52 info level-flags) (level-flags sky))
|
||||
(set! (-> arg0 sky) #t)
|
||||
)
|
||||
(if (and (= (-> a0-52 display?) 'display) (-> a0-52 info special-mood))
|
||||
|
|
|
|||
|
|
@ -1275,7 +1275,7 @@
|
|||
(let ((s5-0 (-> *level* draw-level v1-2)))
|
||||
(when (and s5-0 (= (-> s5-0 status) 'active))
|
||||
(when (= (-> s5-0 display?) 'display)
|
||||
(if (logtest? (-> s5-0 info level-flags) (level-flags lf13))
|
||||
(if (logtest? (-> s5-0 info level-flags) (level-flags ocean-far))
|
||||
(set! (-> this far-on) #t)
|
||||
)
|
||||
(let ((a0-13 (-> s5-0 info ocean)))
|
||||
|
|
@ -1289,10 +1289,12 @@
|
|||
((and a0-13 (nonzero? (-> a0-13 value)))
|
||||
(set! *ocean-map* (the-as ocean-map (-> a0-13 value)))
|
||||
(set-height! *ocean-map* (-> s5-0 info ocean-height))
|
||||
(if (logtest? (level-flags lf20) (-> s5-0 info level-flags))
|
||||
(if (logtest? (level-flags ocean-all) (-> s5-0 info level-flags))
|
||||
(set! (-> this all-on) #t)
|
||||
)
|
||||
(set! (-> this ocean-near-translucent?) (logtest? (-> s5-0 info level-flags) (level-flags lf12)))
|
||||
(set! (-> this ocean-near-translucent?)
|
||||
(logtest? (-> s5-0 info level-flags) (level-flags ocean-near-translucent))
|
||||
)
|
||||
(goto cfg-24)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -265,11 +265,6 @@
|
|||
|
||||
(defmethod draw-clouds ((this sky-work) (arg0 dma-buffer))
|
||||
(local-vars (v1-19 float) (sv-16 cloud-vert-array) (sv-20 (inline-array sky-vertex)) (sv-32 int))
|
||||
|
||||
(when (zero? *sky-texture-anim-array*) ;; added
|
||||
(return #f)
|
||||
)
|
||||
|
||||
(rlet ((vf23 :class vf)
|
||||
(vf27 :class vf)
|
||||
)
|
||||
|
|
@ -549,40 +544,36 @@
|
|||
)
|
||||
|
||||
(defmethod draw-fog ((this sky-work) (arg0 dma-buffer))
|
||||
(when (zero? *sky-texture-anim-array*) ;; added
|
||||
(return #f)
|
||||
)
|
||||
(let ((s4-0 (-> *sky-texture-anim-array* array-data 8 tex)))
|
||||
(if s4-0
|
||||
(dma-buffer-add-gs-set arg0
|
||||
(tex0-1 (new 'static 'gs-tex0
|
||||
:tcc #x1
|
||||
:cld #x1
|
||||
:psm (the-as int (-> s4-0 psm))
|
||||
:cpsm (-> s4-0 clutpsm)
|
||||
:cbp (-> s4-0 clutdest)
|
||||
:th (log2 (-> s4-0 h))
|
||||
:tw (log2 (-> s4-0 w))
|
||||
:tbw (-> s4-0 width 0)
|
||||
:tbp0 (-> s4-0 dest 0)
|
||||
)
|
||||
:tcc #x1
|
||||
:cld #x1
|
||||
:psm (the-as int (-> s4-0 psm))
|
||||
:cpsm (-> s4-0 clutpsm)
|
||||
:cbp (-> s4-0 clutdest)
|
||||
:th (log2 (-> s4-0 h))
|
||||
:tw (log2 (-> s4-0 w))
|
||||
:tbw (-> s4-0 width 0)
|
||||
:tbp0 (-> s4-0 dest 0)
|
||||
)
|
||||
)
|
||||
(tex1-1 (new 'static 'gs-tex1 :mmag #x1 :mmin #x1))
|
||||
(test-1 (new 'static 'gs-test
|
||||
:ate #x1
|
||||
:atst (gs-atest greater-equal)
|
||||
:aref #x70
|
||||
:afail #x3
|
||||
:zte #x1
|
||||
:ztst (gs-ztest greater-equal)
|
||||
)
|
||||
:ate #x1
|
||||
:atst (gs-atest greater-equal)
|
||||
:aref #x70
|
||||
:afail #x3
|
||||
:zte #x1
|
||||
:ztst (gs-ztest greater-equal)
|
||||
)
|
||||
)
|
||||
(clamp-1 (new 'static 'gs-clamp :wms (gs-tex-wrap-mode clamp) :wmt (gs-tex-wrap-mode clamp)))
|
||||
(alpha-1 (new 'static 'gs-alpha :b #x1 :d #x1))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
(let* ((v1-26 (the-as (inline-array qword) (-> arg0 base)))
|
||||
(a0-22 *fog-texture-work*)
|
||||
(f0-0 (-> a0-22 min-corner y))
|
||||
|
|
@ -651,7 +642,7 @@
|
|||
(dotimes (a0-1 (-> *level* length))
|
||||
(let ((a1-3 (-> *level* level a0-1)))
|
||||
(when (= (-> a1-3 status) 'active)
|
||||
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags lf9)))
|
||||
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags sky)))
|
||||
(set! v1-0 #t)
|
||||
)
|
||||
)
|
||||
|
|
@ -677,7 +668,7 @@
|
|||
(let ((s4-1 (the-as sky-work *fake-scratchpad-data*)))
|
||||
(mem-copy! (the-as pointer s4-1) (the-as pointer this) #x2814)
|
||||
(setup-stars s4-1 (-> s4-1 star-mat) (-> this upload-data))
|
||||
(when (nonzero? (-> s4-1 star-colors 0 x))
|
||||
(if (nonzero? (-> s4-1 star-colors 0 x))
|
||||
(stars-transform-asm s4-1)
|
||||
)
|
||||
(cond
|
||||
|
|
|
|||
|
|
@ -5,14 +5,6 @@
|
|||
;; name in dgo: texture-anim-tables
|
||||
;; dgos: GAME
|
||||
|
||||
(define-extern *sky-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern *darkjak-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern *darkjak-highres-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern *skull-gem-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern *default-water-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern *default-warp-texture-anim-array* (texture-anim-array texture-anim))
|
||||
(define-extern set-darkjak-texture-morph! (function float none))
|
||||
|
||||
;; DECOMP BEGINS
|
||||
|
||||
(define *sky-texture-anim-array*
|
||||
|
|
|
|||
|
|
@ -172,37 +172,27 @@
|
|||
:type uint32
|
||||
:bitfield #t
|
||||
(lf0 0)
|
||||
(lf1 1)
|
||||
(lf2 2)
|
||||
(lf3 3)
|
||||
(lf4 4)
|
||||
(lf5 5)
|
||||
(lf6 6)
|
||||
(lf7 7)
|
||||
(lf8 8)
|
||||
(lf9 9)
|
||||
(not-physical 1)
|
||||
(ctycar 2)
|
||||
(ctypes 3)
|
||||
(external 4)
|
||||
(title 5)
|
||||
(borrow-load 6)
|
||||
(end-mode 7)
|
||||
(flut 8)
|
||||
(sky 9)
|
||||
(use-camera-other 10)
|
||||
(lf11 11)
|
||||
(lf12 12)
|
||||
(lf13 13)
|
||||
(display-wait 11)
|
||||
(ocean-near-translucent 12)
|
||||
(ocean-far 13)
|
||||
(low-res-hfrag 14)
|
||||
(lf15 15)
|
||||
(lf16 16)
|
||||
(lf17 17)
|
||||
(lf18 18)
|
||||
(lf19 19)
|
||||
(lf20 20)
|
||||
(city-borrow-available 15)
|
||||
(mech 16)
|
||||
(allow-unloaded 17)
|
||||
(check-taskname-for-continue 18)
|
||||
(city-borrow-high-priority 19)
|
||||
(ocean-all 20)
|
||||
(desert 21)
|
||||
(lf22 22)
|
||||
(lf23 23)
|
||||
(lf24 24)
|
||||
(lf25 25)
|
||||
(lf26 26)
|
||||
(lf27 27)
|
||||
(lf28 28)
|
||||
(lf29 29)
|
||||
(lf30 30)
|
||||
(lf31 31)
|
||||
)
|
||||
;; ---level-flags
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -478,15 +478,11 @@
|
|||
it will kick out levels as needed to make a free slot, and set up a new level, and start
|
||||
the load. This should only be used when you might want to start a load."
|
||||
(local-vars (s5-1 level))
|
||||
|
||||
(start-debug "level-get-for-use: ~A ~A~%" arg0 arg1)
|
||||
(init-level-system this #f)
|
||||
(let* ((s2-0 (lookup-level-info arg0))
|
||||
(s1-0 (remap-level-name s2-0))
|
||||
)
|
||||
(start-debug " remapped name: ~A~%" s1-0)
|
||||
(let ((s5-0 (level-get this s1-0)))
|
||||
(start-debug " existing? ~A~%" s5-0)
|
||||
(when s5-0
|
||||
(level-status-update! s5-0 arg1)
|
||||
(set! s5-1 s5-0)
|
||||
|
|
@ -494,7 +490,6 @@
|
|||
)
|
||||
)
|
||||
(let ((a0-7 (level-get-most-disposable this)))
|
||||
(start-debug " most disposable: ~A~%" a0-7)
|
||||
(set! s5-1 (if a0-7
|
||||
(level-status-update! a0-7 'inactive)
|
||||
a0-7
|
||||
|
|
@ -509,7 +504,7 @@
|
|||
(let ((s0-0 (-> s2-0 master-level)))
|
||||
(when s0-0
|
||||
(let ((a0-10 (lookup-level-info s0-0)))
|
||||
(when (not (logtest? (level-flags lf17) (-> a0-10 level-flags)))
|
||||
(when (not (logtest? (level-flags allow-unloaded) (-> a0-10 level-flags)))
|
||||
(dotimes (v1-16 (-> this length))
|
||||
(let ((a0-15 (-> this level v1-16)))
|
||||
(when (or (= (-> a0-15 status) 'active) (= (-> a0-15 status) 'alive) (= (-> a0-15 status) 'loaded))
|
||||
|
|
@ -606,7 +601,7 @@
|
|||
(while (and (> s4-1 0) (car s5-1))
|
||||
(when (and (!= (car s5-1) 'dummy)
|
||||
(or (= arg1 'all) (let ((a0-31 (lookup-level-info (the-as symbol (car s5-1)))))
|
||||
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags lf15))))
|
||||
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags city-borrow-available))))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
@ -632,7 +627,6 @@
|
|||
This can do both loading, linking, login, and activation.
|
||||
This is somewhat similar to level-get-for-use, but requires that you already have the level object.
|
||||
This function is the way to transition from loaded to alive/active."
|
||||
(start-debug "level-status-update: ~A ~A (current ~A)~%" this arg0 (-> this status))
|
||||
(case arg0
|
||||
(('inactive)
|
||||
(-> this status)
|
||||
|
|
@ -1696,7 +1690,7 @@
|
|||
)
|
||||
)
|
||||
(-> this borrow-from-level)
|
||||
(logtest? (-> this info level-flags) (level-flags lf6))
|
||||
(logtest? (-> this info level-flags) (level-flags borrow-load))
|
||||
)
|
||||
(set! (-> this load-buffer-mode) (level-memory-mode borrow))
|
||||
(let ((t0-2 (logand -64 (&+ (-> this heap current) 63))))
|
||||
|
|
@ -1750,10 +1744,8 @@
|
|||
(defmethod login-begin ((this level))
|
||||
"Start logging in loaded level data."
|
||||
(set! (-> *texture-pool* allocate-func) texture-page-default-allocate)
|
||||
(format 0 "LOGIN-BEGIN: ~A~%" this)
|
||||
(cond
|
||||
((-> this bsp)
|
||||
(format 0 " and with a bsp too~%")
|
||||
(let ((s5-0 (-> this bsp)))
|
||||
(set! (-> s5-0 level tfrag-gs-test)
|
||||
(if (logtest? (-> s5-0 texture-flags 0) (texture-page-flag alpha-enable))
|
||||
|
|
@ -2250,7 +2242,7 @@
|
|||
"Remove level from memory."
|
||||
(deactivate this)
|
||||
(when (!= (-> this status) 'inactive)
|
||||
(when (not (logtest? (level-flags lf17) (-> this info level-flags)))
|
||||
(when (not (logtest? (level-flags allow-unloaded) (-> this info level-flags)))
|
||||
(dotimes (s5-0 (-> *level* length))
|
||||
(let ((v1-10 (-> *level* level s5-0)))
|
||||
(when (or (= (-> v1-10 status) 'active) (= (-> v1-10 status) 'alive) (= (-> v1-10 status) 'loaded))
|
||||
|
|
@ -2530,7 +2522,6 @@
|
|||
(defmethod init-level-system ((this level-group) (arg0 symbol))
|
||||
"If needed, initialize the level system by loading common/art packages and allocating level heaps."
|
||||
(when (zero? (-> *level* heap base))
|
||||
(start-debug "allocating levels~%")
|
||||
(kmemopen global "level-heaps")
|
||||
(when (nmember "game" *kernel-packages*)
|
||||
(set! *kernel-packages* (cons "art" *kernel-packages*))
|
||||
|
|
@ -2657,7 +2648,7 @@
|
|||
(dotimes (a0-3 (-> this length))
|
||||
(let ((a1-3 (-> this level a0-3)))
|
||||
(when (= (-> a1-3 status) 'active)
|
||||
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags lf1))))
|
||||
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags not-physical))))
|
||||
(return a1-3)
|
||||
)
|
||||
)
|
||||
|
|
@ -2669,7 +2660,7 @@
|
|||
(dotimes (a0-5 (-> this length))
|
||||
(let ((a1-8 (-> this level a0-5)))
|
||||
(when (= (-> a1-8 status) 'active)
|
||||
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags lf1))))
|
||||
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags not-physical))))
|
||||
(return a1-8)
|
||||
)
|
||||
)
|
||||
|
|
@ -2683,7 +2674,7 @@
|
|||
(when (= (-> s2-0 status) 'active)
|
||||
(let ((f0-0 (vector-vector-distance (-> s2-0 bsp bsphere) s5-0)))
|
||||
(if (and (-> s2-0 inside-boxes?)
|
||||
(not (logtest? (-> s2-0 info level-flags) (level-flags lf1)))
|
||||
(not (logtest? (-> s2-0 info level-flags) (level-flags not-physical)))
|
||||
(or (not s4-0) (< f0-0 f30-0))
|
||||
)
|
||||
(set! s4-0 s2-0)
|
||||
|
|
@ -2701,7 +2692,7 @@
|
|||
(dotimes (v1-26 (-> this length))
|
||||
(let ((a0-11 (-> this level v1-26)))
|
||||
(when (= (-> a0-11 status) 'active)
|
||||
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags lf1))))
|
||||
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags not-physical))))
|
||||
(return a0-11)
|
||||
)
|
||||
)
|
||||
|
|
@ -2712,7 +2703,7 @@
|
|||
(dotimes (v1-29 (-> this length))
|
||||
(let ((a0-16 (-> this level v1-29)))
|
||||
(when (= (-> a0-16 status) 'active)
|
||||
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags lf1))))
|
||||
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags not-physical))))
|
||||
(set! v0-1 a0-16)
|
||||
)
|
||||
)
|
||||
|
|
@ -2825,7 +2816,6 @@
|
|||
(defun play ((arg0 symbol) (arg1 symbol))
|
||||
"Start (or restart) the game!
|
||||
This will start up the display process, and load the initial level."
|
||||
(start-debug "call to play!~%")
|
||||
(kmemopen global "level-boot")
|
||||
(when *kernel-boot-level*
|
||||
(bg (string->symbol (the-as string *kernel-boot-level*)))
|
||||
|
|
@ -3429,7 +3419,7 @@
|
|||
(set! (-> s3-2 display?) (-> this target s5-2 display?))
|
||||
)
|
||||
(else
|
||||
(if (and (logtest? (-> s3-2 info level-flags) (level-flags lf11))
|
||||
(if (and (logtest? (-> s3-2 info level-flags) (level-flags display-wait))
|
||||
(!= (-> this target s5-2 display?) 'display-no-wait)
|
||||
)
|
||||
(send-event *target* 'loading)
|
||||
|
|
@ -3492,7 +3482,7 @@
|
|||
(if (= (-> a2-32 name) (-> this vis-nick))
|
||||
(goto cfg-137)
|
||||
)
|
||||
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags lf1))))
|
||||
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags not-physical))))
|
||||
(set! v1-131 a2-32)
|
||||
)
|
||||
(+! a0-55 1)
|
||||
|
|
@ -3615,7 +3605,7 @@
|
|||
)
|
||||
(or (-> *level* border?) (logtest? (-> *game-info* current-continue flags) (continue-flags change-continue)))
|
||||
(and (or (and (!= (-> s3-0 name) (-> *game-info* current-continue level))
|
||||
(or (not (logtest? (level-flags lf18) (-> s3-0 info level-flags)))
|
||||
(or (not (logtest? (level-flags check-taskname-for-continue) (-> s3-0 info level-flags)))
|
||||
(!= (-> s3-0 info taskname) (-> (lookup-level-info (-> *game-info* current-continue level)) taskname))
|
||||
)
|
||||
)
|
||||
|
|
@ -3895,8 +3885,6 @@
|
|||
(none)
|
||||
)
|
||||
|
||||
(format 0 "about to start level stuff...~%")
|
||||
|
||||
(when (zero? (-> *level* level0 art-group))
|
||||
(kmemopen global "level-struct")
|
||||
(let ((gp-0 *level*))
|
||||
|
|
@ -3942,5 +3930,3 @@
|
|||
)
|
||||
(kmemclose)
|
||||
)
|
||||
|
||||
(format 0 "done level stuff...~%")
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@
|
|||
)
|
||||
((and (!= (-> *level* loading-level) (-> *level* level-default))
|
||||
(or (< 81920.0 (-> this load-file-priority))
|
||||
(logtest? (-> *level* loading-level info level-flags) (level-flags lf4))
|
||||
(logtest? (-> *level* loading-level info level-flags) (level-flags external))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1138,12 +1138,12 @@
|
|||
(set! (-> self flut entity) (-> v1-41 entity))
|
||||
)
|
||||
)
|
||||
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags lf8)))
|
||||
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags flut)))
|
||||
)
|
||||
(dotimes (v1-49 (-> *level* length))
|
||||
(let ((a0-40 (-> *level* level v1-49)))
|
||||
(when (= (-> a0-40 status) 'active)
|
||||
(when (logtest? (-> a0-40 info level-flags) (level-flags lf8))
|
||||
(when (logtest? (-> a0-40 info level-flags) (level-flags flut))
|
||||
(let ((a0-42 (-> a0-40 entity data 0 entity)))
|
||||
(when a0-42
|
||||
(set! (-> self flut entity) (the-as entity-actor a0-42))
|
||||
|
|
|
|||
|
|
@ -36,6 +36,13 @@
|
|||
(set! (-> self control current-surface target-speed) (* (-> self control current-surface target-speed) f0-11))
|
||||
(set! (-> self control current-surface transv-max) (* (-> self control current-surface transv-max) f0-11))
|
||||
)
|
||||
;; og:preserve-this turbo jet board cheat
|
||||
(#when PC_PORT
|
||||
(when (cheat-state-flag? turbo-board)
|
||||
(*! (-> self control current-surface target-speed) (-> *pc-cheat-state* turbo-board-speed))
|
||||
(*! (-> self control current-surface transv-max) (-> *pc-cheat-state* turbo-board-speed))
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (new-stack-vector0)))
|
||||
(vector-z-quaternion! s5-0 (-> self control quat-for-control))
|
||||
(when (logtest? (-> self control mod-surface flags) (surface-flag xz-local))
|
||||
|
|
|
|||
|
|
@ -456,11 +456,11 @@
|
|||
|
||||
(defbehavior mech-target-init mech ((arg0 vector) (arg1 quaternion) (arg2 entity-actor))
|
||||
(process-entity-set! self arg2)
|
||||
(when (not (and (-> self level) (logtest? (level-flags lf16) (-> self level info level-flags))))
|
||||
(when (not (and (-> self level) (logtest? (level-flags mech) (-> self level info level-flags))))
|
||||
(dotimes (v1-4 (-> *level* length))
|
||||
(let ((a0-7 (-> *level* level v1-4)))
|
||||
(when (= (-> a0-7 status) 'active)
|
||||
(when (logtest? (level-flags lf16) (-> a0-7 info level-flags))
|
||||
(when (logtest? (level-flags mech) (-> a0-7 info level-flags))
|
||||
(set! (-> self level) a0-7)
|
||||
(goto cfg-12)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1201,12 +1201,12 @@
|
|||
(set! (-> self mech entity) (-> v1-31 entity))
|
||||
)
|
||||
)
|
||||
(when (not (and (-> self mech entity) (logtest? (level-flags lf16) (-> self mech entity extra level info level-flags)))
|
||||
(when (not (and (-> self mech entity) (logtest? (level-flags mech) (-> self mech entity extra level info level-flags)))
|
||||
)
|
||||
(dotimes (v1-39 (-> *level* length))
|
||||
(let ((a0-18 (-> *level* level v1-39)))
|
||||
(when (= (-> a0-18 status) 'active)
|
||||
(when (logtest? (level-flags lf16) (-> a0-18 info level-flags))
|
||||
(when (logtest? (level-flags mech) (-> a0-18 info level-flags))
|
||||
(let ((a0-20 (-> a0-18 entity data 0 entity)))
|
||||
(when a0-20
|
||||
(set! (-> self mech entity) (the-as entity-actor a0-20))
|
||||
|
|
|
|||
|
|
@ -728,7 +728,7 @@
|
|||
(('level-deactivate)
|
||||
(cond
|
||||
((and (focus-test? self pilot) (let ((a0-19 (lookup-level-info (the-as symbol (-> arg3 param 0)))))
|
||||
(or (and a0-19 (logtest? (-> a0-19 level-flags) (level-flags lf7)))
|
||||
(or (and a0-19 (logtest? (-> a0-19 level-flags) (level-flags end-mode)))
|
||||
(and (= (-> arg3 param 0) 'lctypatk) (-> self pilot as-daxter?))
|
||||
(= (-> arg3 param 0) 'desliz)
|
||||
)
|
||||
|
|
@ -759,7 +759,7 @@
|
|||
)
|
||||
((and (focus-test? self flut)
|
||||
(begin (set! a0-35 (lookup-level-info (the-as symbol (-> arg3 param 0)))) a0-35)
|
||||
(logtest? (-> a0-35 level-flags) (level-flags lf8))
|
||||
(logtest? (-> a0-35 level-flags) (level-flags flut))
|
||||
)
|
||||
(ja-channel-set! 0)
|
||||
(target-gun-end-mode #t)
|
||||
|
|
@ -770,7 +770,7 @@
|
|||
)
|
||||
((and (focus-test? self mech)
|
||||
(begin (set! a1-13 (lookup-level-info (the-as symbol (-> arg3 param 0)))) a1-13)
|
||||
(logtest? (level-flags lf16) (-> a1-13 level-flags))
|
||||
(logtest? (level-flags mech) (-> a1-13 level-flags))
|
||||
)
|
||||
(ja-channel-set! 0)
|
||||
(when (not (focus-test? self grabbed teleporting))
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
(defconstant PROCESS_HEAP_MULT 4) ;; 4x actors
|
||||
(defconstant PROCESS_HEAP_MULT 1)
|
||||
)
|
||||
(defconstant PROCESS_HEAP_SIZE (* PROCESS_HEAP_MULT 1540 1024))
|
||||
(defconstant PROCESS_HEAP_SIZE (* PROCESS_HEAP_MULT 1240 1024))
|
||||
(defconstant PROCESS_HEAP_MAX (* PROCESS_HEAP_MULT 768))
|
||||
|
||||
(defconstant *tab-size* (the binteger 8))
|
||||
|
|
|
|||
|
|
@ -2352,7 +2352,7 @@
|
|||
(define *debug-dead-pool* (new 'debug 'dead-pool-heap "*debug-dead-pool*" 768 #x100000))
|
||||
|
||||
)
|
||||
(define *nk-dead-pool* (new 'global 'dead-pool-heap "*nk-dead-pool*" 768 #x136000))
|
||||
(define *nk-dead-pool* (new 'global 'dead-pool-heap "*nk-dead-pool*" PROCESS_HEAP_MAX PROCESS_HEAP_SIZE))
|
||||
(define *default-dead-pool* (the-as dead-pool *nk-dead-pool*))
|
||||
(define *pickup-dead-pool* (the-as dead-pool *nk-dead-pool*))
|
||||
(define *dead-pool-list* '(*4k-dead-pool*
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
|
||||
(defmethod cty-borrow-manager-method-18 ((this cty-borrow-manager) (arg0 level-load-info))
|
||||
(cond
|
||||
((logtest? (-> arg0 level-flags) (level-flags lf2))
|
||||
((logtest? (-> arg0 level-flags) (level-flags ctycar))
|
||||
1.0
|
||||
)
|
||||
((logtest? (-> arg0 level-flags) (level-flags lf3))
|
||||
((logtest? (-> arg0 level-flags) (level-flags ctypes))
|
||||
3.0
|
||||
)
|
||||
((logtest? (level-flags lf19) (-> arg0 level-flags))
|
||||
((logtest? (level-flags city-borrow-high-priority) (-> arg0 level-flags))
|
||||
1000.0
|
||||
)
|
||||
(else
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryd)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -892,7 +892,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryd)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -596,7 +596,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -698,7 +698,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -717,7 +717,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -805,7 +805,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -824,7 +824,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -912,7 +912,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -931,7 +931,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1019,7 +1019,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1038,7 +1038,7 @@
|
|||
((the-as (function level none) #f) (the-as level (-> gp-0 mood-context)))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(set! (-> *sky-work* disable-day-star) (the-as basic #t))
|
||||
|
|
@ -747,7 +747,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(set! (-> *sky-work* disable-day-star) #f)
|
||||
|
|
@ -936,7 +936,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1035,7 +1035,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-waspala)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -376,7 +376,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-copy-wasstada)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(cond
|
||||
|
|
@ -500,7 +500,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-copy-wasstada)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -519,7 +519,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-waspala)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
|
|||
|
|
@ -960,7 +960,6 @@
|
|||
)
|
||||
(flag "V-sync" #f ,(dm-lambda-boolean-flag (-> *pc-settings* vsync?)))
|
||||
(flag "PS2 actor vis" #f ,(dm-lambda-boolean-flag (-> *pc-settings* ps2-actor-vis?)))
|
||||
(flag "Display actor counts" *display-actor-counts* dm-boolean-toggle-pick-func)
|
||||
(flag "Display git commit" *display-sha* dm-boolean-toggle-pick-func)
|
||||
(flag "Music fadein" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadein?)))
|
||||
(flag "Music fadeout" #f ,(dm-lambda-boolean-flag (-> *pc-settings* music-fadeout?)))
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
(draw-memory-bar-kheap buf global :idx idx :color (static-rgba 32 32 255 64))
|
||||
(draw-memory-bar-kheap buf debug :idx (1+! idx) :color (static-rgba 255 32 32 64))
|
||||
(dotimes (i (-> *level* length))
|
||||
(draw-memory-bar-kheap buf (-> *level* level i heap)
|
||||
(draw-memory-bar-kheap buf (if (= (-> *level* level i status) 'inactive) (-> *level* level-default heap) (-> *level* level i heap))
|
||||
:name (aif (-> *level* level i borrow-from-level)
|
||||
(string-format "(~A)l~D<-l~D" (-> *level* level i name) i (-> it index))
|
||||
(string-format "(~A)l~D" (-> *level* level i name) i))
|
||||
|
|
|
|||
|
|
@ -445,17 +445,6 @@
|
|||
`(-> *pc-settings* flava-unlocked ,flava))
|
||||
|
||||
|
||||
(defun inside-city? ()
|
||||
"are we inside haven city?"
|
||||
(symbol-member? (-> *game-info* current-continue vis-nick) ;; TODO get actual level we're in?
|
||||
'(ctysluma ctyslumb ctyslumc
|
||||
ctygena ctygenb ctygenc
|
||||
ctymarka ctymarkb
|
||||
ctyfarma ctyfarmb
|
||||
ctyinda ctyindb
|
||||
ctypal ctyport stadium)))
|
||||
|
||||
|
||||
(defmethod update-cheats ((obj pc-settings-jak3))
|
||||
"run cheats."
|
||||
|
||||
|
|
@ -482,7 +471,7 @@
|
|||
((and (pc-cheats? (-> obj cheats) turbo-board)
|
||||
*target*
|
||||
(focus-test? *target* board)
|
||||
(inside-city?))
|
||||
(= 'ctywide (-> *target* current-level info master-level)))
|
||||
(set-setting! 'string-spline-max-move 'abs (* (-> *pc-cheat-state* turbo-board-speed) (meters 2)) 0)
|
||||
(set-setting! 'string-spline-accel 'abs (* (-> *pc-cheat-state* turbo-board-speed) (meters 0.045)) 0)
|
||||
(set-setting! 'string-spline-max-move-player 'abs (* (-> *pc-cheat-state* turbo-board-speed) (meters 1.5)) 0)
|
||||
|
|
|
|||
8
test/decompiler/reference/jak3/engine/gfx/ocean/ocean_REF.gc
generated
vendored
8
test/decompiler/reference/jak3/engine/gfx/ocean/ocean_REF.gc
generated
vendored
|
|
@ -1300,7 +1300,7 @@
|
|||
(let ((s5-0 (-> *level* draw-level v1-2)))
|
||||
(when (and s5-0 (= (-> s5-0 status) 'active))
|
||||
(when (= (-> s5-0 display?) 'display)
|
||||
(if (logtest? (-> s5-0 info level-flags) (level-flags lf13))
|
||||
(if (logtest? (-> s5-0 info level-flags) (level-flags ocean-far))
|
||||
(set! (-> this far-on) #t)
|
||||
)
|
||||
(let ((a0-13 (-> s5-0 info ocean)))
|
||||
|
|
@ -1314,10 +1314,12 @@
|
|||
((and a0-13 (nonzero? (-> a0-13 value)))
|
||||
(set! *ocean-map* (the-as ocean-map (-> a0-13 value)))
|
||||
(set-height! *ocean-map* (-> s5-0 info ocean-height))
|
||||
(if (logtest? (level-flags lf20) (-> s5-0 info level-flags))
|
||||
(if (logtest? (level-flags ocean-all) (-> s5-0 info level-flags))
|
||||
(set! (-> this all-on) #t)
|
||||
)
|
||||
(set! (-> this ocean-near-translucent?) (logtest? (-> s5-0 info level-flags) (level-flags lf12)))
|
||||
(set! (-> this ocean-near-translucent?)
|
||||
(logtest? (-> s5-0 info level-flags) (level-flags ocean-near-translucent))
|
||||
)
|
||||
(goto cfg-24)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
2
test/decompiler/reference/jak3/engine/gfx/sky/sky-tng_REF.gc
generated
vendored
2
test/decompiler/reference/jak3/engine/gfx/sky/sky-tng_REF.gc
generated
vendored
|
|
@ -714,7 +714,7 @@
|
|||
(dotimes (a0-1 (-> *level* length))
|
||||
(let ((a1-3 (-> *level* level a0-1)))
|
||||
(when (= (-> a1-3 status) 'active)
|
||||
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags lf9)))
|
||||
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags sky)))
|
||||
(set! v1-0 #t)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
716
test/decompiler/reference/jak3/engine/level/level-info_REF.gc
generated
vendored
716
test/decompiler/reference/jak3/engine/level/level-info_REF.gc
generated
vendored
File diff suppressed because it is too large
Load diff
24
test/decompiler/reference/jak3/engine/level/level_REF.gc
generated
vendored
24
test/decompiler/reference/jak3/engine/level/level_REF.gc
generated
vendored
|
|
@ -432,7 +432,7 @@
|
|||
(let ((s0-0 (-> s2-0 master-level)))
|
||||
(when s0-0
|
||||
(let ((a0-10 (lookup-level-info s0-0)))
|
||||
(when (not (logtest? (level-flags lf17) (-> a0-10 level-flags)))
|
||||
(when (not (logtest? (level-flags allow-unloaded) (-> a0-10 level-flags)))
|
||||
(dotimes (v1-16 (-> this length))
|
||||
(let ((a0-15 (-> this level v1-16)))
|
||||
(when (or (= (-> a0-15 status) 'active) (= (-> a0-15 status) 'alive) (= (-> a0-15 status) 'loaded))
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
(while (and (> s4-1 0) (car s5-1))
|
||||
(when (and (!= (car s5-1) 'dummy)
|
||||
(or (= arg1 'all) (let ((a0-31 (lookup-level-info (the-as symbol (car s5-1)))))
|
||||
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags lf15))))
|
||||
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags city-borrow-available))))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
@ -1612,7 +1612,7 @@
|
|||
)
|
||||
)
|
||||
(-> this borrow-from-level)
|
||||
(logtest? (-> this info level-flags) (level-flags lf6))
|
||||
(logtest? (-> this info level-flags) (level-flags borrow-load))
|
||||
)
|
||||
(set! (-> this load-buffer-mode) (level-memory-mode borrow))
|
||||
(let ((t0-2 (logand -64 (&+ (-> this heap current) 63))))
|
||||
|
|
@ -2170,7 +2170,7 @@
|
|||
"Remove level from memory."
|
||||
(deactivate this)
|
||||
(when (!= (-> this status) 'inactive)
|
||||
(when (not (logtest? (level-flags lf17) (-> this info level-flags)))
|
||||
(when (not (logtest? (level-flags allow-unloaded) (-> this info level-flags)))
|
||||
(dotimes (s5-0 (-> *level* length))
|
||||
(let ((v1-10 (-> *level* level s5-0)))
|
||||
(when (or (= (-> v1-10 status) 'active) (= (-> v1-10 status) 'alive) (= (-> v1-10 status) 'loaded))
|
||||
|
|
@ -2579,7 +2579,7 @@
|
|||
(dotimes (a0-3 (-> this length))
|
||||
(let ((a1-3 (-> this level a0-3)))
|
||||
(when (= (-> a1-3 status) 'active)
|
||||
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags lf1))))
|
||||
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags not-physical))))
|
||||
(return a1-3)
|
||||
)
|
||||
)
|
||||
|
|
@ -2591,7 +2591,7 @@
|
|||
(dotimes (a0-5 (-> this length))
|
||||
(let ((a1-8 (-> this level a0-5)))
|
||||
(when (= (-> a1-8 status) 'active)
|
||||
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags lf1))))
|
||||
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags not-physical))))
|
||||
(return a1-8)
|
||||
)
|
||||
)
|
||||
|
|
@ -2605,7 +2605,7 @@
|
|||
(when (= (-> s2-0 status) 'active)
|
||||
(let ((f0-0 (vector-vector-distance (-> s2-0 bsp bsphere) s5-0)))
|
||||
(if (and (-> s2-0 inside-boxes?)
|
||||
(not (logtest? (-> s2-0 info level-flags) (level-flags lf1)))
|
||||
(not (logtest? (-> s2-0 info level-flags) (level-flags not-physical)))
|
||||
(or (not s4-0) (< f0-0 f30-0))
|
||||
)
|
||||
(set! s4-0 s2-0)
|
||||
|
|
@ -2623,7 +2623,7 @@
|
|||
(dotimes (v1-26 (-> this length))
|
||||
(let ((a0-11 (-> this level v1-26)))
|
||||
(when (= (-> a0-11 status) 'active)
|
||||
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags lf1))))
|
||||
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags not-physical))))
|
||||
(return a0-11)
|
||||
)
|
||||
)
|
||||
|
|
@ -2634,7 +2634,7 @@
|
|||
(dotimes (v1-29 (-> this length))
|
||||
(let ((a0-16 (-> this level v1-29)))
|
||||
(when (= (-> a0-16 status) 'active)
|
||||
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags lf1))))
|
||||
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags not-physical))))
|
||||
(set! v0-1 a0-16)
|
||||
)
|
||||
)
|
||||
|
|
@ -3335,7 +3335,7 @@
|
|||
(set! (-> s3-2 display?) (-> this target s5-2 display?))
|
||||
)
|
||||
(else
|
||||
(if (and (logtest? (-> s3-2 info level-flags) (level-flags lf11))
|
||||
(if (and (logtest? (-> s3-2 info level-flags) (level-flags display-wait))
|
||||
(!= (-> this target s5-2 display?) 'display-no-wait)
|
||||
)
|
||||
(send-event *target* 'loading)
|
||||
|
|
@ -3398,7 +3398,7 @@
|
|||
(if (= (-> a2-32 name) (-> this vis-nick))
|
||||
(goto cfg-137)
|
||||
)
|
||||
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags lf1))))
|
||||
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags not-physical))))
|
||||
(set! v1-131 a2-32)
|
||||
)
|
||||
(+! a0-55 1)
|
||||
|
|
@ -3525,7 +3525,7 @@
|
|||
)
|
||||
(or (-> *level* border?) (logtest? (-> *game-info* current-continue flags) (continue-flags change-continue)))
|
||||
(and (or (and (!= (-> s3-0 name) (-> *game-info* current-continue level))
|
||||
(or (not (logtest? (level-flags lf18) (-> s3-0 info level-flags)))
|
||||
(or (not (logtest? (level-flags check-taskname-for-continue) (-> s3-0 info level-flags)))
|
||||
(!= (-> s3-0 info taskname) (-> (lookup-level-info (-> *game-info* current-continue level)) taskname))
|
||||
)
|
||||
)
|
||||
|
|
|
|||
2
test/decompiler/reference/jak3/engine/load/loader_REF.gc
generated
vendored
2
test/decompiler/reference/jak3/engine/load/loader_REF.gc
generated
vendored
|
|
@ -414,7 +414,7 @@
|
|||
)
|
||||
((and (!= (-> *level* loading-level) (-> *level* level-default))
|
||||
(or (< 81920.0 (-> this load-file-priority))
|
||||
(logtest? (-> *level* loading-level info level-flags) (level-flags lf4))
|
||||
(logtest? (-> *level* loading-level info level-flags) (level-flags external))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
|||
4
test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc
generated
vendored
4
test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc
generated
vendored
|
|
@ -1180,12 +1180,12 @@
|
|||
(set! (-> self flut entity) (-> v1-41 entity))
|
||||
)
|
||||
)
|
||||
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags lf8)))
|
||||
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags flut)))
|
||||
)
|
||||
(dotimes (v1-49 (-> *level* length))
|
||||
(let ((a0-40 (-> *level* level v1-49)))
|
||||
(when (= (-> a0-40 status) 'active)
|
||||
(when (logtest? (-> a0-40 info level-flags) (level-flags lf8))
|
||||
(when (logtest? (-> a0-40 info level-flags) (level-flags flut))
|
||||
(let ((a0-42 (-> a0-40 entity data 0 entity)))
|
||||
(when a0-42
|
||||
(set! (-> self flut entity) (the-as entity-actor a0-42))
|
||||
|
|
|
|||
4
test/decompiler/reference/jak3/engine/target/mech/mech_REF.gc
generated
vendored
4
test/decompiler/reference/jak3/engine/target/mech/mech_REF.gc
generated
vendored
|
|
@ -497,11 +497,11 @@
|
|||
;; INFO: Used lq/sq
|
||||
(defbehavior mech-target-init mech ((arg0 vector) (arg1 quaternion) (arg2 entity-actor))
|
||||
(process-entity-set! self arg2)
|
||||
(when (not (and (-> self level) (logtest? (level-flags lf16) (-> self level info level-flags))))
|
||||
(when (not (and (-> self level) (logtest? (level-flags mech) (-> self level info level-flags))))
|
||||
(dotimes (v1-4 (-> *level* length))
|
||||
(let ((a0-7 (-> *level* level v1-4)))
|
||||
(when (= (-> a0-7 status) 'active)
|
||||
(when (logtest? (level-flags lf16) (-> a0-7 info level-flags))
|
||||
(when (logtest? (level-flags mech) (-> a0-7 info level-flags))
|
||||
(set! (-> self level) a0-7)
|
||||
(goto cfg-12)
|
||||
)
|
||||
|
|
|
|||
4
test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc
generated
vendored
4
test/decompiler/reference/jak3/engine/target/mech/target-mech_REF.gc
generated
vendored
|
|
@ -1246,12 +1246,12 @@
|
|||
(set! (-> self mech entity) (-> v1-31 entity))
|
||||
)
|
||||
)
|
||||
(when (not (and (-> self mech entity) (logtest? (level-flags lf16) (-> self mech entity extra level info level-flags)))
|
||||
(when (not (and (-> self mech entity) (logtest? (level-flags mech) (-> self mech entity extra level info level-flags)))
|
||||
)
|
||||
(dotimes (v1-39 (-> *level* length))
|
||||
(let ((a0-18 (-> *level* level v1-39)))
|
||||
(when (= (-> a0-18 status) 'active)
|
||||
(when (logtest? (level-flags lf16) (-> a0-18 info level-flags))
|
||||
(when (logtest? (level-flags mech) (-> a0-18 info level-flags))
|
||||
(let ((a0-20 (-> a0-18 entity data 0 entity)))
|
||||
(when a0-20
|
||||
(set! (-> self mech entity) (the-as entity-actor a0-20))
|
||||
|
|
|
|||
6
test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
generated
vendored
6
test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
generated
vendored
|
|
@ -743,7 +743,7 @@
|
|||
(('level-deactivate)
|
||||
(cond
|
||||
((and (focus-test? self pilot) (let ((a0-19 (lookup-level-info (the-as symbol (-> arg3 param 0)))))
|
||||
(or (and a0-19 (logtest? (-> a0-19 level-flags) (level-flags lf7)))
|
||||
(or (and a0-19 (logtest? (-> a0-19 level-flags) (level-flags end-mode)))
|
||||
(and (= (-> arg3 param 0) 'lctypatk) (-> self pilot as-daxter?))
|
||||
(= (-> arg3 param 0) 'desliz)
|
||||
)
|
||||
|
|
@ -774,7 +774,7 @@
|
|||
)
|
||||
((and (focus-test? self flut)
|
||||
(begin (set! a0-35 (lookup-level-info (the-as symbol (-> arg3 param 0)))) a0-35)
|
||||
(logtest? (-> a0-35 level-flags) (level-flags lf8))
|
||||
(logtest? (-> a0-35 level-flags) (level-flags flut))
|
||||
)
|
||||
(ja-channel-set! 0)
|
||||
(target-gun-end-mode #t)
|
||||
|
|
@ -785,7 +785,7 @@
|
|||
)
|
||||
((and (focus-test? self mech)
|
||||
(begin (set! a1-13 (lookup-level-info (the-as symbol (-> arg3 param 0)))) a1-13)
|
||||
(logtest? (level-flags lf16) (-> a1-13 level-flags))
|
||||
(logtest? (level-flags mech) (-> a1-13 level-flags))
|
||||
)
|
||||
(ja-channel-set! 0)
|
||||
(when (not (focus-test? self grabbed teleporting))
|
||||
|
|
|
|||
10
test/decompiler/reference/jak3/levels/city/common/cty-borrow-manager_REF.gc
generated
vendored
10
test/decompiler/reference/jak3/levels/city/common/cty-borrow-manager_REF.gc
generated
vendored
|
|
@ -32,13 +32,13 @@
|
|||
;; definition for method 18 of type cty-borrow-manager
|
||||
(defmethod cty-borrow-manager-method-18 ((this cty-borrow-manager) (arg0 level-load-info))
|
||||
(cond
|
||||
((logtest? (-> arg0 level-flags) (level-flags lf2))
|
||||
((logtest? (-> arg0 level-flags) (level-flags ctycar))
|
||||
1.0
|
||||
)
|
||||
((logtest? (-> arg0 level-flags) (level-flags lf3))
|
||||
((logtest? (-> arg0 level-flags) (level-flags ctypes))
|
||||
3.0
|
||||
)
|
||||
((logtest? (level-flags lf19) (-> arg0 level-flags))
|
||||
((logtest? (level-flags city-borrow-high-priority) (-> arg0 level-flags))
|
||||
1000.0
|
||||
)
|
||||
(else
|
||||
|
|
@ -782,7 +782,3 @@
|
|||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
8
test/decompiler/reference/jak3/levels/factory/factory-boss-scenes_REF.gc
generated
vendored
8
test/decompiler/reference/jak3/levels/factory/factory-boss-scenes_REF.gc
generated
vendored
|
|
@ -64,7 +64,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryd)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -876,7 +876,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -2198,7 +2198,3 @@
|
|||
(:next-launcher 4594)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
24
test/decompiler/reference/jak3/levels/factory/factory-scenes_REF.gc
generated
vendored
24
test/decompiler/reference/jak3/levels/factory/factory-scenes_REF.gc
generated
vendored
|
|
@ -570,7 +570,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryd)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -588,7 +588,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -691,7 +691,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -710,7 +710,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -799,7 +799,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -818,7 +818,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -907,7 +907,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -926,7 +926,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1015,7 +1015,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factoryc)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1034,7 +1034,7 @@
|
|||
((the-as (function level none) #f) (the-as level (-> gp-0 mood-context)))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-factory)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1581,7 +1581,3 @@
|
|||
|
||||
;; failed to figure out what this is:
|
||||
(set! (-> *part-hellcat-dust-landing-fac-curve-settings* scale-y-scalar) *curve-fac-dust-scale-y*)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
8
test/decompiler/reference/jak3/levels/forest/forest-tasks_REF.gc
generated
vendored
8
test/decompiler/reference/jak3/levels/forest/forest-tasks_REF.gc
generated
vendored
|
|
@ -676,7 +676,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(set! (-> *sky-work* disable-day-star) (the-as basic #t))
|
||||
|
|
@ -825,7 +825,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(set! (-> *sky-work* disable-day-star) #f)
|
||||
|
|
@ -1015,7 +1015,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1114,7 +1114,7 @@
|
|||
((the-as (function mood-context symbol) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'default)
|
||||
(logior! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logior! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
|
|||
12
test/decompiler/reference/jak3/levels/wascity/wasstadium/arena-scenes_REF.gc
generated
vendored
12
test/decompiler/reference/jak3/levels/wascity/wasstadium/arena-scenes_REF.gc
generated
vendored
|
|
@ -98,7 +98,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-waspala)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -381,7 +381,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-copy-wasstada)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(cond
|
||||
|
|
@ -506,7 +506,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-copy-wasstada)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -525,7 +525,7 @@
|
|||
((the-as (function mood-context none) #f) (-> gp-0 mood-context))
|
||||
)
|
||||
(set! (-> gp-0 info mood-func) 'update-mood-waspala)
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags lf9))
|
||||
(logclear! (-> gp-0 info level-flags) (level-flags sky))
|
||||
)
|
||||
)
|
||||
(none)
|
||||
|
|
@ -1448,7 +1448,3 @@
|
|||
:on-complete #f
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue