mirror of
https://github.com/pkali/scorch_src.git
synced 2026-05-20 22:34:21 +02:00
VUmeter bug fix and Oooopty!
This commit is contained in:
@@ -1441,6 +1441,7 @@ FinishResultDisplay
|
||||
bcc EndMeter
|
||||
; store all angles
|
||||
ldx NumberOfPlayers
|
||||
dex
|
||||
@ lda AngleTable,x
|
||||
sta previousAngle,x
|
||||
dex
|
||||
@@ -1465,6 +1466,7 @@ Meter
|
||||
; restore all angles
|
||||
jsr ClearTanks
|
||||
ldx NumberOfPlayers
|
||||
dex
|
||||
@ lda previousAngle,x
|
||||
sta AngleTable,x
|
||||
dex
|
||||
|
||||
+2
-2
@@ -25,7 +25,7 @@
|
||||
.ENDIF
|
||||
;---------------------------------------------------
|
||||
.ifndef SPLASH
|
||||
.def SPLASH = 0 ; if 0 - no splash screens
|
||||
.def SPLASH = 0 ; if 0 - no splash screens
|
||||
.endif
|
||||
.ifndef CART_VERSION
|
||||
.def CART_VERSION = 0 ; if 1 - dual splash screen
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
;---------------------------------------------------
|
||||
.macro build
|
||||
dta d"1.48" ; number of this build (4 bytes)
|
||||
dta d"1.49" ; number of this build (4 bytes)
|
||||
.endm
|
||||
|
||||
.macro RMTSong
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -25,7 +25,7 @@
|
||||
|
||||
;---------------------------------------------------
|
||||
.macro build
|
||||
dta d"1.48" ; number of this build (4 bytes)
|
||||
dta d"1.49" ; number of this build (4 bytes)
|
||||
.endm
|
||||
|
||||
.macro RMTSong
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+11
-33
@@ -1248,19 +1248,9 @@ DeadTank
|
||||
|
||||
ldx TankNr
|
||||
|
||||
;Checking the maximal force
|
||||
lda MaxForceTableH,x
|
||||
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
|
||||
@
|
||||
;Check and set the maximal force
|
||||
jsr RandomizeForce.LimitForce ; only limit (no randomize)
|
||||
|
||||
jsr PutTankNameOnScreen
|
||||
; jsr DisplayStatus ; There is no need anymore, it is always after PutTankNameOnScreen
|
||||
|
||||
@@ -1272,13 +1262,8 @@ ContinueToCheckMaxForce2
|
||||
bpl @+
|
||||
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
|
||||
; VU meter timer reset
|
||||
jsr VUMeter.EndMeterAndReset
|
||||
.ENDIF
|
||||
notpressed
|
||||
@@ -1287,6 +1272,12 @@ notpressed
|
||||
.IF VU_METER = 1
|
||||
jsr VUMeter
|
||||
.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
|
||||
jsr GetKeyFast
|
||||
mvy #00 EscFlag ; prevent for set EscFalg in GetKey! we checking this in CheckExitKeys!
|
||||
@@ -1400,20 +1391,7 @@ pressedUp
|
||||
CheckingMaxForce
|
||||
|
||||
mva #sfx_set_power_1 sfx_effect
|
||||
|
||||
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
|
||||
|
||||
; checking is at the beginning of the procedure !!
|
||||
jmp BeforeFire
|
||||
|
||||
CTRLPressedUp
|
||||
|
||||
Reference in New Issue
Block a user