From 6831f39d556a866277fa5475b34f1c81744f7909 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 2 Feb 2017 13:47:20 +0100
Subject: [PATCH] Mes coses

---
 parser.cpp    | 2 +-
 test.bas      | 5 +++--
 tokenizer.cpp | 2 +-
 tokenizer.h   | 2 +-
 vdp.cpp       | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/parser.cpp b/parser.cpp
index 9953993..1606259 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -813,7 +813,7 @@ static void parse_statements() {
 			tkn_next(); parse_color(); break;
 		case TOKEN_BORDER:
 			tkn_next(); parse_border(); break;
-		case TOKEN_CLRSCR:
+		case TOKEN_CLS:
 			tkn_next(); parse_clrscr(); break;
 		case TOKEN_WAIT:
 			tkn_next(); parse_wait(); break;
diff --git a/test.bas b/test.bas
index ecf36b4..3e2edd1 100644
--- a/test.bas
+++ b/test.bas
@@ -1,6 +1,6 @@
 	BORDER INK_BLACK
 	COLOR INK_WHITE + PAPER_BLACK
-	CLRSCR
+	CLS
 	LOCATE 4 2 PRINT CHR &h87, CHR &h85, CHR &h87, CHR &h85, CHR &h87, CHR &h85, CHR &h87, CHR &h81
 	LOCATE 4 3 PRINT CHR &h85, CHR &h85, CHR &h85, CHR &h85, CHR &h85, CHR &h85, CHR &h85, CHR &h84
 	LOCATE 4 4 PRINT CHR &h87, CHR &h81, CHR &h8D, CHR &h85, CHR &h85, CHR &h85, CHR &h8D, CHR &h85
@@ -24,7 +24,7 @@ MENU_BLINK2:
 	W = 0
 	GOTO MENU_BLINK
 MAIN_GAME:
-	CLRSCR
+	CLS
 	GOSUB PINTA_RED
 	LOCATE 6 1 PRINT "0"
 	LOCATE 9 1 PRINT "0"
@@ -38,3 +38,4 @@ PINTA_RED:
 	PUTCHAR 7 8 &HD1 INK_WHITE + PAPER_BLACK
 	PUTCHAR 7 10 &HD1 INK_WHITE + PAPER_BLACK
 	RETURN
+
diff --git a/tokenizer.cpp b/tokenizer.cpp
index 4becbe2..bf25bc5 100644
--- a/tokenizer.cpp
+++ b/tokenizer.cpp
@@ -62,7 +62,7 @@ t_token_op tkn_tokens[] = {
 	{ "updatescr", TOKEN_UPDATESCR },
 	{ "color", TOKEN_COLOR },
 	{ "border", TOKEN_BORDER },
-	{ "clrscr", TOKEN_CLRSCR },
+	{ "cls", TOKEN_CLS },
 	{ "wait", TOKEN_WAIT },
 };
 
diff --git a/tokenizer.h b/tokenizer.h
index 9904db8..6087a31 100644
--- a/tokenizer.h
+++ b/tokenizer.h
@@ -67,7 +67,7 @@ enum t_tokentype {
 	TOKEN_UPDATESCR,
 	TOKEN_COLOR,
 	TOKEN_BORDER,
-	TOKEN_CLRSCR,
+	TOKEN_CLS,
 	TOKEN_WAIT,
 };
 
diff --git a/vdp.cpp b/vdp.cpp
index 030c8b9..3e14e01 100644
--- a/vdp.cpp
+++ b/vdp.cpp
@@ -133,7 +133,7 @@ void vdp_flip() {
 				if (((x + 2) >= 8) && ((x + 2) < 136) && (*cm & 32)) memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
 				if (((x + 3) >= 8) && ((x + 3) < 136) && (*cm & 16)) memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
 				if (((x + 4) >= 8) && ((x + 4) < 136) && (*cm & 8)) memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
-				if (((x + 5) >= 8) && ((x + 5) < 136) && (*cm & 4))  memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
+				if (((x + 5) >= 8) && ((x + 5) < 136) && (*cm & 4)) memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
 				if (((x + 6) >= 8) && ((x + 6) < 136) && (*cm & 2)) memcpy(sbt, palette[col & 0x0F], 4); sbt += 4;
 				if (((x + 7) >= 8) && ((x + 7) < 136) && (*cm & 1)) memcpy(sbt, palette[col & 0x0F], 4); sbt += (512 - 32 + 4);
 			} else {