diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/common/virtual-keyboard-gui.cpp | 3 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/backends/common/virtual-keyboard-gui.cpp b/backends/common/virtual-keyboard-gui.cpp index 162ce48240..ca246a17a1 100644 --- a/backends/common/virtual-keyboard-gui.cpp +++ b/backends/common/virtual-keyboard-gui.cpp @@ -43,6 +43,8 @@ VirtualKeyboardGUI::VirtualKeyboardGUI(VirtualKeyboard *kbd) { _firstRun = true; _displayEnabled = false; + + _cursorAnimateTimer = 0; } void VirtualKeyboardGUI::initMode(VirtualKeyboard::Mode *mode) { @@ -266,6 +268,7 @@ void VirtualKeyboardGUI::redraw() { OverlayColor *scr = (OverlayColor *)surf.pixels; const OverlayColor *ove = (OverlayColor *) _overlayBackup.getBasePtr(_dirtyRect.left, _dirtyRect.top); int16 h = surf.h; + while (h-- > 0) { memcpy(scr, ove, surf.w * sizeof(OverlayColor)); scr += surf.w; diff --git a/backends/common/virtual-keyboard.cpp b/backends/common/virtual-keyboard.cpp index c852839871..4a125bb727 100644 --- a/backends/common/virtual-keyboard.cpp +++ b/backends/common/virtual-keyboard.cpp @@ -67,7 +67,6 @@ void VirtualKeyboard::reset() { } bool VirtualKeyboard::loadKeyboardPack(Common::String packName) { - if (Common::File::exists(packName + ".xml")) { // uncompressed keyboard pack if (!_parser->loadFile(packName + ".xml")) @@ -81,7 +80,7 @@ bool VirtualKeyboard::loadKeyboardPack(Common::String packName) { unz_file_info fileInfo; unzOpenCurrentFile(zipFile); unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0); - byte *buffer = new byte[fileInfo.uncompressed_size+1]; + byte *buffer = (byte *)malloc(fileInfo.uncompressed_size+1 * sizeof(byte)); assert(buffer); memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(byte)); unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size); |