[Scummvm-cvs-logs] SF.net SVN: scummvm: [24392] scummvm/branches/branch-0-9-0
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Thu Oct 19 14:47:07 CEST 2006
Revision: 24392
http://svn.sourceforge.net/scummvm/?rev=24392&view=rev
Author: kirben
Date: 2006-10-19 05:46:55 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Back port CP changes
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/README
scummvm/branches/branch-0-9-0/doc/games-copyprot.tex
scummvm/branches/branch-0-9-0/engines/scumm/script_v5.cpp
Modified: scummvm/branches/branch-0-9-0/README
===================================================================
--- scummvm/branches/branch-0-9-0/README 2006-10-19 12:14:53 UTC (rev 24391)
+++ scummvm/branches/branch-0-9-0/README 2006-10-19 12:46:55 UTC (rev 24392)
@@ -217,9 +217,7 @@
Maniac Mansion
Zak McKracken and the Alien Mindbenders
-Indiana Jones and the Last Crusade (EGA)
Loom (EGA)
-The Secret of Monkey Island (EGA)
The Secret of Monkey Island (VGA)
Monkey Island 2: LeChuck's Revenge
Modified: scummvm/branches/branch-0-9-0/doc/games-copyprot.tex
===================================================================
--- scummvm/branches/branch-0-9-0/doc/games-copyprot.tex 2006-10-19 12:14:53 UTC (rev 24391)
+++ scummvm/branches/branch-0-9-0/doc/games-copyprot.tex 2006-10-19 12:46:55 UTC (rev 24392)
@@ -15,9 +15,7 @@
\begin{tabular}{l}
Maniac Mansion\\
Zak McKracken and the Alien Mindbenders\\
-Indiana Jones and the Last Crusade (EGA)\\
Loom (EGA)\\
-The Secret of Monkey Island (EGA)\\
The Secret of Monkey Island (VGA)\\
Monkey Island 2: LeChuck's Revenge\\
\end{tabular}
Modified: scummvm/branches/branch-0-9-0/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/script_v5.cpp 2006-10-19 12:14:53 UTC (rev 24391)
+++ scummvm/branches/branch-0-9-0/engines/scumm/script_v5.cpp 2006-10-19 12:46:55 UTC (rev 24392)
@@ -1453,14 +1453,6 @@
room = getVarOrDirectByte(PARAM_1);
- if (!_copyProtection) {
- // Skip copy protection scheme
- if (_game.id == GID_INDY3 && (_game.features & GF_OLD_BUNDLE) && room == 92) {
- VAR(57) = 1;
- return;
- }
- }
-
// For small header games, we only call startScene if the room
// actually changed. This avoid unwanted (wrong) fades in Zak256
// and others. OTOH, it seems to cause a problem in newer games.
@@ -2243,17 +2235,23 @@
// FIXME: Script 171 loads a complete room resource, instead of the actual script.
// Causing invalid opcode cases, see bug #1290485
- if (_game.id == GID_ZAK && (_game.platform == Common::kPlatformFMTowns) && script == 171)
+ if (_game.id == GID_ZAK && _game.platform == Common::kPlatformFMTowns && script == 171)
return;
+ // Method used by original games to skip copy protection scheme
if (!_copyProtection) {
- // Method used by original games to skip copy protection scheme
- if (_game.id == GID_LOOM && _game.version == 3 && _currentRoom == 69 && script == 201)
+ // Copy protection was disabled in LucasArts Classic Adventures (PC Disk)
+ if (_game.id == GID_LOOM && _game.platform == Common::kPlatformPC && _game.version == 3 && _currentRoom == 69 && script == 201)
script = 205;
- else if ((_game.id == GID_MONKEY_VGA || _game.id == GID_MONKEY_EGA) && script == 152)
+ // Copy protection was disabled in LucasArts Classic Adventures (PC Disk)
+ if (_game.id == GID_MONKEY_VGA && _game.platform == Common::kPlatformPC && script == 152)
return;
+ // Copy protection was disabled in LucasArts Mac CD Game Pack II (Macintosh CD)
+ if (_game.id == GID_MONKEY && _game.platform == Common::kPlatformMacintosh && script == 155)
+ return;
}
+
runScript(script, (op & 0x20) != 0, (op & 0x40) != 0, data);
}
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