aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/tads
diff options
context:
space:
mode:
authorPaul Gilbert2019-07-06 17:02:26 -0700
committerPaul Gilbert2019-07-06 17:02:26 -0700
commit3b9547edde674d3517a60ec8189a063bfb6a4d13 (patch)
treef4f6049f42c6e96d653bc8aa8ee9a816b98ab1f4 /engines/glk/tads
parentf282fbb49bf941c5b8ac1a2dd0b26a4a63978060 (diff)
downloadscummvm-rg350-3b9547edde674d3517a60ec8189a063bfb6a4d13.tar.gz
scummvm-rg350-3b9547edde674d3517a60ec8189a063bfb6a4d13.tar.bz2
scummvm-rg350-3b9547edde674d3517a60ec8189a063bfb6a4d13.zip
GLK: Fix various gcc warnings
Diffstat (limited to 'engines/glk/tads')
-rw-r--r--engines/glk/tads/os_glk.cpp2
-rw-r--r--engines/glk/tads/tads2/qa_scriptor.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/glk/tads/os_glk.cpp b/engines/glk/tads/os_glk.cpp
index 03d8a3a445..808eb108ee 100644
--- a/engines/glk/tads/os_glk.cpp
+++ b/engines/glk/tads/os_glk.cpp
@@ -1018,7 +1018,7 @@ void os_xlat_html4(unsigned int html4_char, char *result, size_t result_len) {
case 339: /* oe ligature */
strcpy(result, "oe"); return;
case 159: /* Yuml */
- result[0] = (char)255;
+ result[0] = (char)255; return;
case 376: /* Y with diaresis */
result[0] = 'Y'; break;
case 352: /* S with caron */
diff --git a/engines/glk/tads/tads2/qa_scriptor.cpp b/engines/glk/tads/tads2/qa_scriptor.cpp
index ec4e770322..bb235d52d2 100644
--- a/engines/glk/tads/tads2/qa_scriptor.cpp
+++ b/engines/glk/tads/tads2/qa_scriptor.cpp
@@ -105,9 +105,7 @@ char *qasgets(char *buf, int bufl) {
/* return the command */
return buf;
}
- }
- else if (c == EOF )
- {
+ } else if ((int)c == EOF) {
/* end of file - close the script and return eof */
qasclose();
return 0;