[Scummvm-cvs-logs] scummvm master -> ac2c5ff084a6d2f74473e144662facc7a9a3006a

sev- sev at scummvm.org
Wed Apr 16 19:17:41 CEST 2014


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:
ac2c5ff084 FULLPIPE: Implement ModalMainMenu::isOverArea()


Commit: ac2c5ff084a6d2f74473e144662facc7a9a3006a
    https://github.com/scummvm/scummvm/commit/ac2c5ff084a6d2f74473e144662facc7a9a3006a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-16T20:17:02+03:00

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

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index ba42096..b2f5bde 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1037,6 +1037,22 @@ int ModalMainMenu::checkHover(Common::Point &point) {
 	return 0;
 }
 
+bool ModalMainMenu::isOverArea(PictureObject *obj, Common::Point *point) {
+	Common::Point p;
+
+	obj->getDimensions(&p);
+
+	int left = point->x - 8;
+	int right = point->x + 12;
+	int down = point->y - 11;
+	int up = point->y + 9;
+
+	if (left >= obj->_ox && right < obj->_ox + p.x && down >= obj->_oy && up < obj->_oy + p.y)
+		return true;
+
+	return false;
+}
+
 bool ModalMainMenu::isSaveAllowed() {
 	warning("STUB: ModalMainMenu::isSaveAllowed()");
 
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index c891ed4..78ddf71 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -186,6 +186,7 @@ private:
 	int checkHover(Common::Point &point);
 	void updateVolume();
 	void updateSliderPos();
+	bool isOverArea(PictureObject *obj, Common::Point *point);
 };
 
 class ModalHelp : public BaseModalObject {






More information about the Scummvm-git-logs mailing list