[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.60,1.61 verbs.cpp,1.22,1.23
James Brown
ender at users.sourceforge.net
Wed Apr 3 18:59:02 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28596
Modified Files:
script_v1.cpp verbs.cpp
Log Message:
Fix Zak/Indy3 verbage issues.
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** script_v1.cpp 3 Apr 2002 15:51:43 -0000 1.60
--- script_v1.cpp 4 Apr 2002 02:58:04 -0000 1.61
***************
*** 1915,1918 ****
--- 1915,1921 ----
switch(_opcode) {
case 1: /* hide verbs */
+ if (_gameId & GID_ZAK256) // FIXME?
+ return;
+
while (a<=b) {
slot = getVerbSlot(a,0);
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** verbs.cpp 20 Mar 2002 17:51:07 -0000 1.22
--- verbs.cpp 4 Apr 2002 02:58:04 -0000 1.23
***************
*** 87,93 ****
vs = &_verbs[i];
do {
- if (_features & GF_OLD256)
- vs->saveid = 0;
-
if (vs->curmode!=1 || !vs->verbid || vs->saveid ||
y < vs->y || y >= vs->bottom)
--- 87,90 ----
***************
*** 256,260 ****
nukeResource(rtVerb, slot);
! if (vs->saveid==0) {
drawVerb(slot, 0);
verbMouseOver(0);
--- 253,257 ----
nukeResource(rtVerb, slot);
! if (vs->saveid==0){
drawVerb(slot, 0);
verbMouseOver(0);
More information about the Scummvm-git-logs
mailing list