aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2018-10-22 18:23:29 -0700
committerPaul Gilbert2018-12-08 19:05:59 -0800
commitede0323c08fc7d5853736d42c7f5910c18ff1fd1 (patch)
treeaf14bb8a9a8a9f4fbed40fd8faf7e79b7e7ad8b6 /engines
parent8708ed4f9aead0876d09dd9b6bb9096407cd961c (diff)
downloadscummvm-rg350-ede0323c08fc7d5853736d42c7f5910c18ff1fd1.tar.gz
scummvm-rg350-ede0323c08fc7d5853736d42c7f5910c18ff1fd1.tar.bz2
scummvm-rg350-ede0323c08fc7d5853736d42c7f5910c18ff1fd1.zip
GLK: Windows don't have a non-unicode putChar method
Diffstat (limited to 'engines')
-rw-r--r--engines/gargoyle/streams.cpp4
-rw-r--r--engines/gargoyle/window_text_buffer.cpp3
-rw-r--r--engines/gargoyle/window_text_buffer.h5
-rw-r--r--engines/gargoyle/window_text_grid.cpp4
-rw-r--r--engines/gargoyle/window_text_grid.h5
-rw-r--r--engines/gargoyle/windows.h5
6 files changed, 2 insertions, 24 deletions
diff --git a/engines/gargoyle/streams.cpp b/engines/gargoyle/streams.cpp
index 7dec179cf1..749999153c 100644
--- a/engines/gargoyle/streams.cpp
+++ b/engines/gargoyle/streams.cpp
@@ -79,7 +79,7 @@ void WindowStream::putChar(unsigned char ch) {
}
}
- _window->putChar(ch);
+ _window->putCharUni(ch);
if (_window->_echoStream)
_window->_echoStream->putChar(ch);
}
@@ -118,7 +118,7 @@ void WindowStream::putBuffer(const char *buf, size_t len) {
}
for (size_t lx = 0; lx < len; lx++, buf++)
- _window->putChar(*buf);
+ _window->putCharUni(*buf);
if (_window->_echoStream)
_window->_echoStream->putBuffer(buf, len);
diff --git a/engines/gargoyle/window_text_buffer.cpp b/engines/gargoyle/window_text_buffer.cpp
index 1e85a24f8d..9b1268e218 100644
--- a/engines/gargoyle/window_text_buffer.cpp
+++ b/engines/gargoyle/window_text_buffer.cpp
@@ -277,9 +277,6 @@ glui32 TextBufferWindow::getSplit(glui32 size, bool vertical) const {
return (vertical) ? size * g_conf->_cellW : size * g_conf->_cellH;
}
-void TextBufferWindow::putChar(unsigned char ch) {
-}
-
void TextBufferWindow::putCharUni(glui32 ch) {
/*
glui32 bchars[TBLINELEN];
diff --git a/engines/gargoyle/window_text_buffer.h b/engines/gargoyle/window_text_buffer.h
index f7427d7320..0e6ee2cec9 100644
--- a/engines/gargoyle/window_text_buffer.h
+++ b/engines/gargoyle/window_text_buffer.h
@@ -133,11 +133,6 @@ public:
virtual glui32 getSplit(glui32 size, bool vertical) const override;
/**
- * Write a character
- */
- virtual void putChar(unsigned char ch) override;
-
- /**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
diff --git a/engines/gargoyle/window_text_grid.cpp b/engines/gargoyle/window_text_grid.cpp
index 41444ed33c..92bdcf5d22 100644
--- a/engines/gargoyle/window_text_grid.cpp
+++ b/engines/gargoyle/window_text_grid.cpp
@@ -82,10 +82,6 @@ glui32 TextGridWindow::getSplit(glui32 size, bool vertical) const {
size * g_conf->_cellH + g_conf->_tMarginY * 2;
}
-void TextGridWindow::putChar(unsigned char ch) {
-
-}
-
void TextGridWindow::putCharUni(uint32 ch) {
TextGridRow *ln;
diff --git a/engines/gargoyle/window_text_grid.h b/engines/gargoyle/window_text_grid.h
index 2c72dde458..8ebaf82b7f 100644
--- a/engines/gargoyle/window_text_grid.h
+++ b/engines/gargoyle/window_text_grid.h
@@ -105,11 +105,6 @@ public:
virtual glui32 getSplit(glui32 size, bool vertical) const override;
/**
- * Write a character
- */
- virtual void putChar(unsigned char ch) override;
-
- /**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
diff --git a/engines/gargoyle/windows.h b/engines/gargoyle/windows.h
index a5bc2f43f9..60f6bb4445 100644
--- a/engines/gargoyle/windows.h
+++ b/engines/gargoyle/windows.h
@@ -313,11 +313,6 @@ public:
/**
* Write a character
*/
- virtual void putChar(unsigned char ch) {}
-
- /**
- * Write a unicode character
- */
virtual void putCharUni(uint32 ch) {}
/**