Apple-2gs-SW/iigs-game-engine
1
0
Fork 0
mirror of https://github.com/lscharen/iigs-game-engine.git synced 2025-02-17 16:30:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix some linked-list manipulations

Browse Source
This commit is contained in:
Lucas Scharenbroich 2023-03-08 16:29:12 -06:00
parent 029ab62f0c
commit 6c5e133b17
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Sprite.s
View File

@ -438,7 +438,7 @@ _SortSprite
ldy _Sprites+SORTED_PREV,x ldy _Sprites+SORTED_PREV,x
bmi :chk_fwd bmi :chk_fwd
cmp _Sprites+SPRITE_CLIP_TOP,y cmp _Sprites+SPRITE_CLIP_TOP,y
bcc :chk_bkwd ; The current node needs to move to an lower position bcc :scan_bkwd ; The current node needs to move to an lower position
:chk_fwd :chk_fwd
ldy _Sprites+SORTED_NEXT,x ; If there is nothing ahead of the current node, we're done ldy _Sprites+SORTED_NEXT,x ; If there is nothing ahead of the current node, we're done
@ -502,12 +502,6 @@ _SortSprite
sta _Sprites+SORTED_NEXT,y sta _Sprites+SORTED_NEXT,y
rts rts
:chk_bkwd
ldy _Sprites+SORTED_PREV,x ; If there is nothing behind the current node, we're done
bmi :done
cmp _Sprites+SPRITE_CLIP_TOP,y ; If the current node is >= the previous node, we're done
bcs :done
; Look to move the sprite into an earlier position ; Look to move the sprite into an earlier position
:scan_bkwd :scan_bkwd
lda _Sprites+SORTED_PREV,y ; Need to step backward; if we're at the beginning, then insert here lda _Sprites+SORTED_PREV,y ; Need to step backward; if we're at the beginning, then insert here
@ -529,16 +523,16 @@ _SortSprite
jsr _OrphanNode jsr _OrphanNode
tya tya
sta _Sprites+SORTED_NEXT,x ; Link X to Y sta _Sprites+SORTED_PREV,x ; c <=> y <-- x --- d
lda _Sprites+SORTED_PREV,y lda _Sprites+SORTED_NEXT,y ; c <=> y <-- x --> d
sta _Sprites+SORTED_PREV,x ; Link X to C sta _Sprites+SORTED_NEXT,x
txa ; Link Y to X txa
sta _Sprites+SORTED_PREV,y ldx _Sprites+SORTED_NEXT,y
sta _Sprites+SORTED_NEXT,y ; c <=> y <=> x --> d
ldy _Sprites+SORTED_PREV,x ; Link C to X sta _Sprites+SORTED_PREV,x ; c <=> y <=> x <=> d
sta _Sprites+SORTED_NEXT,y
rts rts
; Move X to the front of the list. Y points to the first element ; Move X to the front of the list. Y points to the first element
@ -559,7 +553,6 @@ _SortSprite
sta _Sprites+SORTED_PREV,x sta _Sprites+SORTED_PREV,x
tya tya
sta _Sprites+SORTED_NEXT,x sta _Sprites+SORTED_NEXT,x
rts
:done :done
rts rts
@ -596,7 +589,6 @@ _InsertSprite
cmp _Sprites+SPRITE_CLIP_TOP,y cmp _Sprites+SPRITE_CLIP_TOP,y
bcs :next bcs :next
:insert
lda _Sprites+SORTED_PREV,y lda _Sprites+SORTED_PREV,y
sta _Sprites+SORTED_PREV,x ; [p] <-- [c] [n] sta _Sprites+SORTED_PREV,x ; [p] <-- [c] [n]
@ -604,10 +596,10 @@ _InsertSprite
sta _Sprites+SORTED_NEXT,x ; [p] <-- [c] --> [n] sta _Sprites+SORTED_NEXT,x ; [p] <-- [c] --> [n]
txa txa
ldx _Sprites+SORTED_PREV,y ; get ref to the [p]revious node
sta _Sprites+SORTED_PREV,y ; [p] <-- [c] <=> [n] sta _Sprites+SORTED_PREV,y ; [p] <-- [c] <=> [n]
ldy _Sprites+SORTED_PREV,x sta _Sprites+SORTED_NEXT,x ; [p] <=> [c] <=> [n]
sta _Sprites+SORTED_NEXT,y ; [p] <=> [c] <=> [n]
rts rts