[Scummvm-cvs-logs] SF.net SVN: scummvm: [32582] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri Jun 6 21:29:59 CEST 2008
Revision: 32582
http://scummvm.svn.sourceforge.net/scummvm/?rev=32582&view=rev
Author: sev
Date: 2008-06-06 12:29:59 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Move more room code into roomActions[].
Modified Paths:
--------------
scummvm/trunk/engines/drascula/rooms.cpp
scummvm/trunk/engines/drascula/staticdata.h
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2008-06-06 19:17:21 UTC (rev 32581)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2008-06-06 19:29:59 UTC (rev 32582)
@@ -683,9 +683,7 @@
flags[23] = 1;
openDoor(5,3);
withoutVerb();
- } else if (pickedObject == kVerbLook && fl == 175)
- talk(429);
- else if (fl == 150)
+ } else if (fl == 150)
talk(460);
else
hasAnswer = 0;
@@ -831,7 +829,7 @@
bool DrasculaEngine::room_54(int fl) {
if ((pickedObject == kVerbTalk && fl == 118) || (pickedObject == kVerbLook && fl == 118 && flags[0] == 0))
animation_1_5();
- else if (pickedObject == kVerbLook && fl == 118 && flags[0]==1)
+ else if (pickedObject == kVerbLook && fl == 118 && flags[0] == 1)
talk(124);
else if (pickedObject == kVerbTalk && fl == 53 && flags[14] == 0) {
talk(288);
@@ -1008,8 +1006,6 @@
pickObject(20);
else if (pickedObject == 20 && fl == 100)
animation_6_6();
- else if (pickedObject == kVerbPick || pickedObject == kVerbOpen)
- talk(453);
else
hasAnswer = 0;
Modified: scummvm/trunk/engines/drascula/staticdata.h
===================================================================
--- scummvm/trunk/engines/drascula/staticdata.h 2008-06-06 19:17:21 UTC (rev 32581)
+++ scummvm/trunk/engines/drascula/staticdata.h 2008-06-06 19:29:59 UTC (rev 32582)
@@ -412,6 +412,8 @@
{ 26, -1, kVerbLook, 168, 476 },
{ 26, -1, kVerbPick, 168, 477 },
// ==================================
+ { 27, -1, kVerbLook, 175, 429 },
+ // ==================================
{ 29, -1, kVerbLook, 152, 463 },
{ 29, -1, kVerbOpen, 152, 464 },
// ----------------------------------
@@ -507,6 +509,8 @@
// ==================================
{ 102, -1, kVerbLook, 100, 452 },
{ 102, -1, kVerbLook, 101, 123 },
+ { 102, -1, kVerbPick, -1, 453 },
+ { 102, -1, kVerbOpen, -1, 453 },
// ==================================
// Pseudoroom. checkAction() menuScreen == 1
{ 200, 1, kVerbLook, 28, 328 },
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