VUmeter bug fix and Oooopty!

This commit is contained in:
Pecusx
2024-03-12 20:49:40 +01:00
parent 72c9d7952b
commit 9e8187fc0d
9 changed files with 16 additions and 36 deletions
+2
View File
@@ -1441,6 +1441,7 @@ FinishResultDisplay
bcc EndMeter bcc EndMeter
; store all angles ; store all angles
ldx NumberOfPlayers ldx NumberOfPlayers
dex
@ lda AngleTable,x @ lda AngleTable,x
sta previousAngle,x sta previousAngle,x
dex dex
@@ -1465,6 +1466,7 @@ Meter
; restore all angles ; restore all angles
jsr ClearTanks jsr ClearTanks
ldx NumberOfPlayers ldx NumberOfPlayers
dex
@ lda previousAngle,x @ lda previousAngle,x
sta AngleTable,x sta AngleTable,x
dex dex
+2 -2
View File
@@ -25,7 +25,7 @@
.ENDIF .ENDIF
;--------------------------------------------------- ;---------------------------------------------------
.ifndef SPLASH .ifndef SPLASH
.def SPLASH = 0 ; if 0 - no splash screens .def SPLASH = 0 ; if 0 - no splash screens
.endif .endif
.ifndef CART_VERSION .ifndef CART_VERSION
.def CART_VERSION = 0 ; if 1 - dual splash screen .def CART_VERSION = 0 ; if 1 - dual splash screen
@@ -41,7 +41,7 @@
;--------------------------------------------------- ;---------------------------------------------------
.macro build .macro build
dta d"1.48" ; number of this build (4 bytes) dta d"1.49" ; number of this build (4 bytes)
.endm .endm
.macro RMTSong .macro RMTSong
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -25,7 +25,7 @@
;--------------------------------------------------- ;---------------------------------------------------
.macro build .macro build
dta d"1.48" ; number of this build (4 bytes) dta d"1.49" ; number of this build (4 bytes)
.endm .endm
.macro RMTSong .macro RMTSong
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+11 -33
View File
@@ -1248,19 +1248,9 @@ DeadTank
ldx TankNr ldx TankNr
;Checking the maximal force ;Check and set the maximal force
lda MaxForceTableH,x jsr RandomizeForce.LimitForce ; only limit (no randomize)
cmp ForceTableH,x
bne ContinueToCheckMaxForce2
lda MaxForceTableL,x
cmp ForceTableL,x
ContinueToCheckMaxForce2
bcs @+
lda MaxForceTableH,x
sta ForceTableH,x
lda MaxForceTableL,x
sta ForceTableL,x
@
jsr PutTankNameOnScreen jsr PutTankNameOnScreen
; jsr DisplayStatus ; There is no need anymore, it is always after PutTankNameOnScreen ; jsr DisplayStatus ; There is no need anymore, it is always after PutTankNameOnScreen
@@ -1272,13 +1262,8 @@ ContinueToCheckMaxForce2
bpl @+ bpl @+
jsr Shoot.AfterOffensiveText ; Lazy Darwin - aiming visualisation jsr Shoot.AfterOffensiveText ; Lazy Darwin - aiming visualisation
@ @
;keyboard reading
; KBCODE keeps code of last keybi
; SKSTAT $ff - nothing pressed
; $FB - any key
; $f7 - shift
; $f3 - shift+key
.IF VU_METER = 1 .IF VU_METER = 1
; VU meter timer reset
jsr VUMeter.EndMeterAndReset jsr VUMeter.EndMeterAndReset
.ENDIF .ENDIF
notpressed notpressed
@@ -1287,6 +1272,12 @@ notpressed
.IF VU_METER = 1 .IF VU_METER = 1
jsr VUMeter jsr VUMeter
.ENDIF .ENDIF
;keyboard reading
; KBCODE keeps code of last keybi
; SKSTAT $ff - nothing pressed
; $FB - any key
; $f7 - shift
; $f3 - shift+key
ldx TankNr ; for optimize ldx TankNr ; for optimize
jsr GetKeyFast jsr GetKeyFast
mvy #00 EscFlag ; prevent for set EscFalg in GetKey! we checking this in CheckExitKeys! mvy #00 EscFlag ; prevent for set EscFalg in GetKey! we checking this in CheckExitKeys!
@@ -1400,20 +1391,7 @@ pressedUp
CheckingMaxForce CheckingMaxForce
mva #sfx_set_power_1 sfx_effect mva #sfx_set_power_1 sfx_effect
; checking is at the beginning of the procedure !!
lda MaxForceTableH,x
cmp ForceTableH,x
bne FurtherCheckMaxForce
lda MaxForceTableL,x
cmp ForceTableL,x
FurtherCheckMaxForce
jcs BeforeFire
lda MaxForceTableH,x
sta ForceTableH,x
lda MaxForceTableL,x
sta ForceTableL,x
jmp BeforeFire jmp BeforeFire
CTRLPressedUp CTRLPressedUp