[Scummvm-git-logs] scummvm master -> 7ee0f4d5931a2b2267da4516cdee1cbb25cb12f2

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ee0f4d593 GLK: FROTZ: Fix getting cursor position for non V6 games


Commit: 7ee0f4d5931a2b2267da4516cdee1cbb25cb12f2
    https://github.com/scummvm/scummvm/commit/7ee0f4d5931a2b2267da4516cdee1cbb25cb12f2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-26T19:19:46-08:00

Commit Message:
GLK: FROTZ: Fix getting cursor position for non V6 games

Changed paths:
    engines/glk/frotz/windows.cpp


diff --git a/engines/glk/frotz/windows.cpp b/engines/glk/frotz/windows.cpp
index 884d1d7..2e4fdb5 100644
--- a/engines/glk/frotz/windows.cpp
+++ b/engines/glk/frotz/windows.cpp
@@ -89,8 +89,8 @@ void Window::update() {
 	_properties[Y_SIZE] = _win->_bbox.height() / g_conf->_monoInfo._cellH;
 
 	Point pt = _win->getCursor();
-	_properties[X_CURSOR] = pt.x / g_conf->_monoInfo._cellW + 1;
-	_properties[Y_CURSOR] = pt.y / g_conf->_monoInfo._cellH + 1;
+	_properties[X_CURSOR] = (g_vm->h_version != V6) ? pt.x + 1 : pt.x / g_conf->_monoInfo._cellW + 1;
+	_properties[Y_CURSOR] = (g_vm->h_version != V6) ? pt.y + 1 : pt.y / g_conf->_monoInfo._cellH + 1;
 
 	TextBufferWindow *win = dynamic_cast<TextBufferWindow *>(_win);
 	_properties[LEFT_MARGIN] = (win ? win->_ladjw : 0) / g_conf->_monoInfo._cellW;