[Scummvm-cvs-logs] scummvm master -> 640536a5842ff4bcb42aa7122746e4cabf4bdf01

[sev-]

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

Summary:
7edb9af72c FULLPIPE: Implement ModalMainMenu::checkHover()
640536a584 FULLPIPE: Fix crash


Commit: 7edb9af72cd468d71d2cb33e8cf71aa38286e29c
    https://github.com/scummvm/scummvm/commit/7edb9af72cd468d71d2cb33e8cf71aa38286e29c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-17T22:50:28+03:00

Commit Message:
FULLPIPE: Implement ModalMainMenu::checkHover()

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index b2f5bde..50ef3ec 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1032,9 +1032,29 @@ void ModalMainMenu::updateSliderPos() {
 }
 
 int ModalMainMenu::checkHover(Common::Point &point) {
-	warning("STUB: ModalMainMenu::checkHover()");
+	for (uint i = 0; i < _areas.size(); i++) {
+		if (_areas[i]->picObjL->isPixelHitAtPos(point.x, point.y)) {
+			_areas[i]->picObjL->_flags |= 4;
 
-	return 0;
+			return i;
+		} else {
+			_areas[i]->picObjL->_flags &= 0xFFFB;
+		}
+	}
+
+	if (isOverArea(_areas[_menuSliderIdx]->picObjL, &point)) {
+		_areas[_menuSliderIdx]->picObjL->_flags |= 4;
+
+		return _menuSliderIdx;
+	}
+
+	if (isOverArea(_areas[_musicSliderIdx]->picObjL, &point)) {
+		_areas[_musicSliderIdx]->picObjL->_flags |= 4;
+
+		return _musicSliderIdx;
+	}
+
+	return -1;
 }
 
 bool ModalMainMenu::isOverArea(PictureObject *obj, Common::Point *point) {


Commit: 640536a5842ff4bcb42aa7122746e4cabf4bdf01
    https://github.com/scummvm/scummvm/commit/640536a5842ff4bcb42aa7122746e4cabf4bdf01
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-17T22:50:42+03:00

Commit Message:
FULLPIPE: Fix crash

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 50ef3ec..5cdc449 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -838,7 +838,7 @@ ModalMainMenu::ModalMainMenu() {
 	area->picObjL = _scene->getPictureObjectById(area->picIdL, 0);
 	area->picObjL->_flags &= 0xFFFB;
 	_areas.push_back(area);
-	_musicSliderIdx = _areas.size();
+	_musicSliderIdx = _areas.size() - 1;
 
 	if (g_fp->_mainMenu_debugEnabled)
 		enableDebugMenuButton();