[Scummvm-cvs-logs] SF.net SVN: scummvm: [24005] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 24005
          http://svn.sourceforge.net/scummvm/?rev=24005&view=rev
Author:   kirben
Date:     2006-09-28 23:16:28 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Fix input in PP

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/vga.cpp

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-09-29 05:38:50 UTC (rev 24004)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-09-29 06:16:28 UTC (rev 24005)
@@ -1096,7 +1096,9 @@
 			_hitAreaObjectItem = _lastHitArea->item_ptr;
 			id = 0xFFFF;
 			if (_lastHitArea->flags & kBFTextBox) {
-				if (getGameType() == GType_FF && (_lastHitArea->flags & kBFHyperBox))
+				if (getGameType() == GType_PP)
+					id = _lastHitArea->id;
+				else if (getGameType() == GType_FF && (_lastHitArea->flags & kBFHyperBox))
 					id = _lastHitArea->data;
 				else
 					id = _lastHitArea->flags / 256;
@@ -1192,7 +1194,9 @@
 				_hitAreaSubjectItem = ha->item_ptr;
 				id = 0xFFFF;
 				if (ha->flags & kBFTextBox) {
-					if (getGameType() == GType_FF && (ha->flags & kBFHyperBox))
+					if (getGameType() == GType_PP)
+						id = _lastHitArea->id;
+					else if (getGameType() == GType_FF && (ha->flags & kBFHyperBox))
 						id = ha->data;
 					else
 						id = ha->flags / 256;

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-09-29 05:38:50 UTC (rev 24004)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-09-29 06:16:28 UTC (rev 24005)
@@ -946,7 +946,7 @@
 	}
 	state->x = cur;
 
-	maxWidth = (getGameType() == GType_FF || getGameType() == GType_PP) ? 640 : (vlut[2] * 2);
+	maxWidth = (getGameType() == GType_FF || getGameType() == GType_PP) ? _screenWidth : (vlut[2] * 2);
 	cur += state->draw_width - maxWidth;
 	if (cur > 0) {
 		do {
@@ -965,7 +965,7 @@
 	}
 	state->y = cur;
 
-	maxHeight = (getGameType() == GType_FF || getGameType() == GType_PP) ? 480 : vlut[3];
+	maxHeight = (getGameType() == GType_FF || getGameType() == GType_PP) ? _screenHeight : vlut[3];
 	cur += state->draw_height - maxHeight;
 	if (cur > 0) {
 		do {
@@ -1067,7 +1067,7 @@
 
 
 			if (state->flags & kDFMasked) {
-				if (!getBitFlag(81)) {
+				if (getGameType() == GType_FF && !getBitFlag(81)) {
 					if (state->x  > _feebleRect.right)
 						return;
 					if (state->y > _feebleRect.bottom)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.