diff --git a/game.asm b/game.asm index 23142c6..dcf6610 100644 --- a/game.asm +++ b/game.asm @@ -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 diff --git a/scorch.asm b/scorch.asm index 80930c9..4cc7af1 100644 --- a/scorch.asm +++ b/scorch.asm @@ -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 diff --git a/scorch.bin b/scorch.bin index 8671acf..4f175ed 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.car b/scorch.car index afb0f3c..47bb0e0 100644 Binary files a/scorch.car and b/scorch.car differ diff --git a/scorch.xex b/scorch.xex index 3269d95..46c0dc2 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/scorchC64.asm b/scorchC64.asm index 525e402..7fcc5c8 100644 --- a/scorchC64.asm +++ b/scorchC64.asm @@ -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 diff --git a/scorchC64.prg b/scorchC64.prg index 98f83cb..c261dfc 100644 Binary files a/scorchC64.prg and b/scorchC64.prg differ diff --git a/scorch_cart.xex b/scorch_cart.xex index ed7c6e0..a30ad22 100644 Binary files a/scorch_cart.xex and b/scorch_cart.xex differ diff --git a/weapons.asm b/weapons.asm index c85dd4c..09cc121 100644 --- a/weapons.asm +++ b/weapons.asm @@ -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