thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct o2_initScreen() for Woodruff (screen positioning, clipping and cursor limiting)

Browse source 
svn-id: r31846
This commit is contained in:
Sven Hesse 2008-05-03 20:08:46 +00:00
parent 7e3ce73a58
commit edff41b1c3
9 changed files with 117 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/gob/util.cpp
View file

@ -128,11 +128,11 @@ void Util::processInput(bool scroll) {
}
_vm->_global->_speedFactor = MIN(_fastMode + 1, 3);
if (scroll && hasMove) {
if (y >= (_vm->_height - _vm->_video->_splitHeight2)) {
y = _vm->_height - _vm->_video->_splitHeight2 - 1;
_vm->_util->setMousePos(x, y);
}
if (hasMove && scroll) {
x = CLIP(x, _vm->_global->_mouseMinX, _vm->_global->_mouseMaxX);
y = CLIP(y, _vm->_global->_mouseMinY, _vm->_global->_mouseMaxY);
_vm->_util->setMousePos(x - _vm->_video->_screenDeltaX, y - _vm->_video->_screenDeltaY);
_vm->_game->evaluateScroll(x, y);
}
}
@ -228,15 +228,15 @@ int16 Util::checkKey(void) {
void Util::getMouseState(int16 *pX, int16 *pY, int16 *pButtons) {
Common::Point mouse = g_system->getEventManager()->getMousePos();
*pX = mouse.x + _vm->_video->_scrollOffsetX;
*pY = mouse.y + _vm->_video->_scrollOffsetY;
*pX = mouse.x + _vm->_video->_scrollOffsetX - _vm->_video->_screenDeltaX;
*pY = mouse.y + _vm->_video->_scrollOffsetY - _vm->_video->_screenDeltaY;
if (pButtons != 0)
*pButtons = _mouseButtons;
}
void Util::setMousePos(int16 x, int16 y) {
g_system->warpMouse(x, y);
g_system->warpMouse(x + _vm->_video->_screenDeltaX, y + _vm->_video->_screenDeltaY);
}
void Util::waitMouseUp(void) {