Firing of selected weapon type

This commit is contained in:
blondie7575 2018-06-11 16:00:02 -06:00
parent 3144b7c9fb
commit c29ddd74c1
3 changed files with 17 additions and 5 deletions

Binary file not shown.

View File

@ -173,6 +173,8 @@ playerFire:
sta projectileParams+4 sta projectileParams+4
lda playerData+PD_POWER,y lda playerData+PD_POWER,y
sta projectileParams+6 sta projectileParams+6
lda playerData+PD_CURRWEAPON,y
sta projectileParams+8
jsr fireProjectile jsr fireProjectile
pla pla

View File

@ -92,6 +92,7 @@ projectileParams:
.word 0 ; Starting pos Y .word 0 ; Starting pos Y
.word 0 ; Initial angle .word 0 ; Initial angle
.word 0 ; Initial power .word 0 ; Initial power
.word 0 ; Type
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -157,6 +158,9 @@ fireProjectile:
jsr mult88 jsr mult88
sta projectileData+JD_VY,y sta projectileData+JD_VY,y
lda projectileParams+8 ; Type
sta projectileData+JD_TYPE,y
lda #1 lda #1
sta projectileData+JD_NEW,y sta projectileData+JD_NEW,y
stz projectileActive stz projectileActive
@ -373,12 +377,18 @@ DNANGLE = $ffaf
; ;
; ;
renderProjectiles: renderProjectiles:
pha SAVE_AY
lda projectileData lda projectileData
bpl renderProjectilesDoIt bpl renderProjectilesDoIt
jmp renderProjectilesDone jmp renderProjectilesDone
renderProjectilesDoIt: renderProjectilesDoIt:
lda projectileData+JD_TYPE
tay
PROJECTILETYPEPTR_Y
lda #projectileData lda #projectileData
sta PARAML0 sta PARAML0
@ -393,7 +403,7 @@ renderProjectilesDoIt:
bmi renderProjectilesFlat bmi renderProjectilesFlat
renderProjectilesUpAngle: renderProjectilesUpAngle:
lda #4 ; Up angle lda projectileTypes+PT_FRAME0,y ; Up angle
bra renderProjectilesGoSprite bra renderProjectilesGoSprite
renderProjectilesNegYPosX: renderProjectilesNegYPosX:
@ -401,7 +411,7 @@ renderProjectilesNegYPosX:
bpl renderProjectilesFlat bpl renderProjectilesFlat
renderProjectilesDownAngle: renderProjectilesDownAngle:
lda #6 ; Down angle lda projectileTypes+PT_FRAME2,y ; Down angle
bra renderProjectilesGoSprite bra renderProjectilesGoSprite
renderProjectilesNegX: renderProjectilesNegX:
@ -419,13 +429,13 @@ renderProjectilesNegYNegX:
bra renderProjectilesUpAngle bra renderProjectilesUpAngle
renderProjectilesFlat: renderProjectilesFlat:
lda #5 ; Flat lda projectileTypes+PT_FRAME1,y ; Flat
renderProjectilesGoSprite: renderProjectilesGoSprite:
jsr renderGameObject jsr renderGameObject
renderProjectilesDone: renderProjectilesDone:
pla RESTORE_AY
rts rts