Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-09-28 05:56:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed advance code to be consistently reversible (for being forced back out of a square)

Browse Source
This commit is contained in:
Martin Haye 2021-09-27 09:00:41 -07:00
parent 10ba5d8a8d
commit 90b0c11f1a
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Platform/Apple/virtual/src/raycast/render.s
View File

@ -1846,24 +1846,15 @@ pl_advance: !zone
asl
asl ; shift twice: each dir is 4 bytes in table
tax
.step lda playerX
clc
adc walkDirs,x
sta playerX
lda playerX+1
adc walkDirs+1,x
sta playerX+1
jsr .chk
.step cpx #32 ; dir 0-7 step Y then X; dir 8-15 step X then Y. (Allows consistent backing up)
bcc .stepyx
.stepxy jsr .chkx
sta .ora+1
lda playerY
clc
adc walkDirs+2,x
sta playerY
lda playerY+1
adc walkDirs+3,x
sta playerY+1
jsr .chk
jsr .chky
jmp .ora
.stepyx jsr .chky
sta .ora+1
jsr .chkx
.ora ora #11 ; self-modified above
beq .ok
; Blocked! Restore old position.
@ -1894,6 +1885,22 @@ pl_advance: !zone
.done tya ; retrieve ret value
ldy #0 ; hi byte of ret is always 0
rts ; all done
.chkx lda playerX
clc
adc walkDirs,x
sta playerX
lda playerX+1
adc walkDirs+1,x
sta playerX+1
jmp.chk
.chky lda playerY
clc
adc walkDirs+2,x
sta playerY
lda playerY+1
adc walkDirs+3,x
sta playerY+1
; fall through to:
; Check if the new position is blocked
.chk stx .rstx+1
jsr calcMapOrigin
@ -1906,7 +1913,6 @@ pl_advance: !zone
sta tmp+1
and #2 ; tile flag 2 is for obstructions
.rstx ldx #11 ; self-modified above
cmp #0
rts
.stepCt !byte 0