[Scummvm-cvs-logs] SF.net SVN: scummvm:[34161] scummvm/branches/branch-0-12-0/engines/drascula
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Aug 25 17:59:49 CEST 2008
Revision: 34161
http://scummvm.svn.sourceforge.net/scummvm/?rev=34161&view=rev
Author: thebluegr
Date: 2008-08-25 15:59:46 +0000 (Mon, 25 Aug 2008)
Log Message:
-----------
(backport) Fix for original game bug with the wall plug in chapter 5.
Fixes bug #2059621 - DRASCULA: Plug bug
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp
scummvm/branches/branch-0-12-0/engines/drascula/rooms.cpp
Modified: scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp 2008-08-25 15:58:45 UTC (rev 34160)
+++ scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp 2008-08-25 15:59:46 UTC (rev 34161)
@@ -505,7 +505,12 @@
} else {
#else
}
- if (rightMouseButton == 1 && menuScreen == 0) {
+
+ // Do not show the inventory screen in chapter 5, if the right mouse button is clicked
+ // while the plug (object 16) is held
+ // Fixes bug #2059621 - "DRASCULA: Plug bug"
+ if (rightMouseButton == 1 && menuScreen == 0 &&
+ !(currentChapter == 5 && pickedObject == 16)) {
#endif
delay(100);
characterMoved = 0;
Modified: scummvm/branches/branch-0-12-0/engines/drascula/rooms.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/drascula/rooms.cpp 2008-08-25 15:58:45 UTC (rev 34160)
+++ scummvm/branches/branch-0-12-0/engines/drascula/rooms.cpp 2008-08-25 15:59:46 UTC (rev 34161)
@@ -815,10 +815,11 @@
flags[2] = 1;
withoutVerb();
updateVisible();
+ pickedObject = kVerbMove;
} else if (pickedObject == 16) {
- talk(439);
- withoutVerb();
+ // Wall plug in chapter 5
visible[3] = 1;
+ hasAnswer = 0;
} else
hasAnswer = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list