From: Stephan Mühlstrasser Date: Sun, 22 Feb 2015 18:55:19 +0000 (+0100) Subject: Consistent naming for screen dimension constants. X-Git-Tag: V2.15~20^2~7^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c3b014560eb291a18b28a70e9516abb49dae34eb;p=cc65 Consistent naming for screen dimension constants. --- diff --git a/libsrc/osic1p/_scrsize.s b/libsrc/osic1p/_scrsize.s index b0241c547..be07234b4 100644 --- a/libsrc/osic1p/_scrsize.s +++ b/libsrc/osic1p/_scrsize.s @@ -13,7 +13,7 @@ .include "osic1p.inc" .proc screensize - ldx #SCR_LINELEN + ldx #SCR_WIDTH ldy #SCR_HEIGHT rts .endproc diff --git a/libsrc/osic1p/cputc.s b/libsrc/osic1p/cputc.s index 9e6ae3253..e986daad1 100644 --- a/libsrc/osic1p/cputc.s +++ b/libsrc/osic1p/cputc.s @@ -35,7 +35,7 @@ cputdirect: ; Advance cursor position advance: - cpy #(SCR_LINELEN - 1) + cpy #(SCR_WIDTH - 1) bne L3 jsr newline ; new line ldy #$FF ; + cr diff --git a/libsrc/osic1p/osic1p.inc b/libsrc/osic1p/osic1p.inc index f49bc122b..b5d48f32e 100644 --- a/libsrc/osic1p/osic1p.inc +++ b/libsrc/osic1p/osic1p.inc @@ -6,5 +6,5 @@ KBD := $DF00 ; Polled keyboard register ; Other definitions VIDEORAMSIZE = $0400 ; Size of C1P video RAM (1 kB) -SCR_LINELEN = $19 ; screen width -SCR_HEIGHT = $19 ; screen height +SCR_WIDTH = $19 ; Screen width +SCR_HEIGHT = $19 ; Screen height