From 25dfe09a9d1f4d3333a9be54387a94b1325611d1 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Sat, 16 Jul 2022 14:44:12 +0200
Subject: [PATCH] Real fix for rollers bug.

---
 grafproc.asm |   6 +++---
 scorch.xex   | Bin 41132 -> 41132 bytes
 weapons.asm  |   4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/grafproc.asm b/grafproc.asm
index f8fae82..74d9600 100644
--- a/grafproc.asm
+++ b/grafproc.asm
@@ -28,15 +28,15 @@
     ; begin: xdraw,ydraw - end: xbyte,ybyte
     ; let's store starting coordinates
     ; will be needed, because everything is calculated relatively
-    mwa #0 LineLength
+    mwa #$ffff LineLength
     mwa xdraw xtempDRAW
     mwa ydraw ytempDRAW
 
     ; if line goes our of the screen we are not drawing it, but...
 
-    cpw xdraw #screenwidth
+    cpw xdraw #screenwidth+1
     bcs DrawOutOfTheScreen
-    cpw xbyte #screenwidth
+    cpw xbyte #screenwidth+1
     bcs DrawOutOfTheScreen
     ;cpw ydraw #screenheight
     ;bcs DrawOutOfTheScreen
diff --git a/scorch.xex b/scorch.xex
index d21bd0be4655334881293a7e1f1b20d44e14a6f4..3f24fa69dfd7caefa68887a48a15b8b5b9e5e47a 100644
GIT binary patch
delta 84
zcmV-a0IUD3!2+zo0<hXf0YJ0cMk56!5xuXRjfkDSwVaKKov9g(TAZl>jf$PU$DECa
qov8qgd!3DbowFlMc^U!#lbvQC4MDIJrG?1>&;+G~$w9NpX5%@yCMbIV

delta 63
zcmV-F0KosO!2+zo0<hXf0Y9_bMk56Q43qm&8VY-zjeeb}8I4+;vm;D-8UX;4on{{m
VK(G|0g~<WX1f_(@K(ona<2gM+8gu{v

diff --git a/weapons.asm b/weapons.asm
index 8ff0ffb..7e4b9a5 100644
--- a/weapons.asm
+++ b/weapons.asm
@@ -906,7 +906,7 @@ UpNotYet
     beq ExplodeNow
 HowMuchToFallRight2
     inw xdraw
-    cpw xdraw #screenwidth-1	; if without -1 it miscalculates range of explosion (why? !!!)
+    cpw xdraw #screenwidth
     jne RollinContinues
 ExplodeNow
     mwa xdraw xcircle  ; we must store somewhere (BAD)
@@ -1469,6 +1469,7 @@ NotStrongShoot
     sta Force
     lda ForceTableH,x
     sta Force+1
+    mva #sfx_shoot sfx_effect
 AfterStrongShoot
     lda #$0
     sta Force+2
@@ -1479,7 +1480,6 @@ AfterStrongShoot
     sta xtraj
     sta ytraj
 
-    mva #sfx_shoot sfx_effect
     ; Shoots tank nr X !!! :)
     ; set the starting coordinates of bullet with correction
     ; to start where the tank's barrel ends