From aed0549760322d20afb27d99b50659e972498d2c Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Mon, 12 Oct 2015 18:09:50 +0200
Subject: [PATCH] remove some commented out code

---
 libsrc/c64/soft80_cgetc.s |  4 +---
 libsrc/c64/soft80_color.s |  3 ++-
 libsrc/c64/soft80_cputc.s | 23 +++--------------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/libsrc/c64/soft80_cgetc.s b/libsrc/c64/soft80_cgetc.s
index e578111ea..849af753a 100644
--- a/libsrc/c64/soft80_cgetc.s
+++ b/libsrc/c64/soft80_cgetc.s
@@ -46,9 +46,6 @@ invertcursor:
         ldy     #$00
         jsr     setcolor
 
-        ;lda     CURS_X
-        ;and     #$01
-        ;tax
         ldx     soft80_internal_cursorxlsb
 @lp1:
         lda     (SCREEN_PTR),y
@@ -74,6 +71,7 @@ setcolor:
         sta     (CRAM_PTR),y    ; vram
         rts
 @set:
+        ; save old value
         lda     (CRAM_PTR),y    ; vram
         sta     tmp1
         lda     CHARCOLOR
diff --git a/libsrc/c64/soft80_color.s b/libsrc/c64/soft80_color.s
index fe2be71d5..ab4b4a01f 100644
--- a/libsrc/c64/soft80_color.s
+++ b/libsrc/c64/soft80_color.s
@@ -24,11 +24,12 @@ soft80_textcolor:
 
 soft80_bgcolor:
         ldx     soft80_internal_bgcolor         ; get old value
-        stx     tmp2                            ; save old value
         sta     soft80_internal_bgcolor         ; set new value
 
         jsr     mkcharcolor
 
+        stx     tmp2                            ; save old value
+
 .if SOFT80COLORVOODOO = 1
         ; if the old bg color is equal to color ram of that cell, then also
         ; update the color ram to the new value.
diff --git a/libsrc/c64/soft80_cputc.s b/libsrc/c64/soft80_cputc.s
index fa6a2574f..0d450d27b 100644
--- a/libsrc/c64/soft80_cputc.s
+++ b/libsrc/c64/soft80_cputc.s
@@ -161,8 +161,6 @@ draw_spaceinvers:
         sta     (CRAM_PTR),y    ; vram
 .endif
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         bne     draw_spaceinvers_odd
 
@@ -201,8 +199,6 @@ draw_space:
 .endif
         ;ldy     #$00            ; is still $00
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         bne     draw_space_odd
 
@@ -381,8 +377,6 @@ remcolor:
         ;and     #$0f
         sta     tmp3            ; A contains colram
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         bne     @sk3
 
@@ -452,8 +446,6 @@ soft80_putcolor:
 
         ; botch characters in the cell are used
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         bne     @sk2            ; jump if odd xpos
 
@@ -467,8 +459,6 @@ soft80_putcolor:
         jsr     soft80_checkchar
         bcs     @sk1            ; char at current position => overwrite 1st
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         beq     @sk3            ; jump if even xpos
 @sk2:
@@ -503,8 +493,6 @@ soft80_checkchar:
 
         ;ldy     #$00                            ; is still $00
 
-        ;lda     CURS_X
-        ;and     #$01
         lda     soft80_internal_cursorxlsb
         bne     @l1a
 
@@ -517,7 +505,7 @@ soft80_checkchar:
         lda     (SCREEN_PTR),y
         and     #$f0
         cmp     #$f0
-        bne     @l2b
+        bne     @ischar
         .if (line < 7)
         dey
         .endif
@@ -525,7 +513,7 @@ soft80_checkchar:
         ;ldy     #$00                            ; is 0
         clc
         rts
-@l2b:
+@ischar:
         ldy     #$00
         sec
         rts
@@ -535,7 +523,7 @@ soft80_checkchar:
         lda     (SCREEN_PTR),y
         and     #$0f
         cmp     #$0f
-        bne     @l2b
+        bne     @ischar
         .if line < 7
         dey
         .endif
@@ -543,9 +531,4 @@ soft80_checkchar:
         ;ldy     #$00                            ; is 0
         clc
         rts
-;@l2bb:
-;        ldy     #$00
-;        sec
-;        rts
-
 .endif
-- 
2.39.5