[Scummvm-cvs-logs] SF.net SVN: scummvm: [23963] scummvm/branches/branch-0-9-0

[sev at users.sourceforge.net]

Revision: 23963
          http://svn.sourceforge.net/scummvm/?rev=23963&view=rev
Author:   sev
Date:     2006-09-21 05:16:44 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Backport fix fir bug #1536932: "MANIACNES: Crash on click in speechtext-area"

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/NEWS
    scummvm/branches/branch-0-9-0/engines/scumm/verbs.cpp

Modified: scummvm/branches/branch-0-9-0/NEWS
===================================================================
--- scummvm/branches/branch-0-9-0/NEWS	2006-09-21 12:14:29 UTC (rev 23962)
+++ scummvm/branches/branch-0-9-0/NEWS	2006-09-21 12:16:44 UTC (rev 23963)
@@ -14,6 +14,7 @@
    - Fixed graphical glitches in HE80 version of Putt-Putt Travels Through
      Time.
    - Fixed FM-TOWNS version of Indy3 failing on Amiga port.
+   - Fixed crash in MM NES when clicking on top screen area
 
  Simon:
    - Improved support for international versions of the Feeble Files.

Modified: scummvm/branches/branch-0-9-0/engines/scumm/verbs.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/verbs.cpp	2006-09-21 12:14:29 UTC (rev 23962)
+++ scummvm/branches/branch-0-9-0/engines/scumm/verbs.cpp	2006-09-21 12:16:44 UTC (rev 23963)
@@ -518,6 +518,11 @@
 		byte code = _mouseAndKeyboardStat & MBS_LEFT_CLICK ? 1 : 2;
 		int inventoryArea = (_game.platform == Common::kPlatformNES) ? 48: 32;
 
+		// This could be kUnkVirtScreen.
+		// Fixes bug #1536932: "MANIACNES: Crash on click in speechtext-area"
+		if (!zone)
+			return;
+
 		if (_game.version <= 2 && zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 			// Click into V2 sentence line
 			runInputScript(5, 0, 0);


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