Skip to content
Snippets Groups Projects
Commit 07933057 authored by rswindell's avatar rswindell
Browse files

Fix what appears to be a bug caused by a typo (* instead of &) in

ciolib_attrfont(), caught by GCC v7.3.0:
	warning: ‘*’ in boolean context, suggest ‘&&’ instead
parent 010acb5a
No related branches found
No related tags found
No related merge requests found
...@@ -1134,7 +1134,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void) ...@@ -1134,7 +1134,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void)
CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void) CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void)
{ {
CIOLIB_INIT(); CIOLIB_INIT();
if(cio_api.normvideo) { if(cio_api.normvideo) {
cio_api.normvideo(); cio_api.normvideo();
return; return;
...@@ -1209,7 +1209,7 @@ static char c64_color_xlat(char colour) ...@@ -1209,7 +1209,7 @@ static char c64_color_xlat(char colour)
return 15; return 15;
case DARKGRAY: case DARKGRAY:
return 11; return 11;
case LIGHTBLUE: case LIGHTBLUE:
return 14; return 14;
case LIGHTGREEN: case LIGHTGREEN:
return 13; return 13;
...@@ -1556,7 +1556,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int ch) ...@@ -1556,7 +1556,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int ch)
puttext_can_move=old_puttext_can_move; puttext_can_move=old_puttext_can_move;
return(a1); return(a1);
} }
/* **MUST** be implemented */ /* **MUST** be implemented */
...@@ -1673,7 +1673,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_loadfont(char *filename) ...@@ -1673,7 +1673,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_loadfont(char *filename)
CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos) CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos)
{ {
CIOLIB_INIT(); CIOLIB_INIT();
if(cio_api.get_window_info!=NULL) if(cio_api.get_window_info!=NULL)
return(cio_api.get_window_info(width,height,xpos,ypos)); return(cio_api.get_window_info(width,height,xpos,ypos));
else { else {
...@@ -1965,7 +1965,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_attrfont(uint8_t attr) ...@@ -1965,7 +1965,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_attrfont(uint8_t attr)
flags = ciolib_getvideoflags(); flags = ciolib_getvideoflags();
if ((flags & CIOLIB_VIDEO_ALTCHARS) && (attr & 0x08)) if ((flags & CIOLIB_VIDEO_ALTCHARS) && (attr & 0x08))
font |= 1; font |= 1;
if ((flags * CIOLIB_VIDEO_BLINKALTCHARS) && (attr & 0x80)) if ((flags & CIOLIB_VIDEO_BLINKALTCHARS) && (attr & 0x80))
font |= 2; font |= 2;
return ciolib_getfont(font+1); return ciolib_getfont(font+1);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment