Ticket #8242: copyprot-restart.diff

scummvm/scumm/script.cpp

@@ -450 +450 @@
 
 int Scumm::readVar(uint var) {
         int a;
-#if defined(BYPASS_COPY_PROT)
-        static byte copyprotbypassed = false;
-#endif
 
         debug(9, "readvar(%d)", var);
 
@@ -467 +464 @@
 
         if (!(var & 0xF000)) {
 #if defined(BYPASS_COPY_PROT)
-                if (var == 490 && _gameId == GID_MONKEY2 && !copyprotbypassed) {
-                        copyprotbypassed = true;
+                if (var == 490 && _gameId == GID_MONKEY2 && _currentRoom == 108) {
                         var = 518;
-                } else if (var == 179 && (_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && !copyprotbypassed) {
-                        copyprotbypassed = true;
+                } else if (var == 179 && (_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && _currentRoom == 90) {
                         var = 266;
                 }
 #endif
@@ -488 +483 @@
                         // INDY3 checks this during the game...
                         if (_gameId == GID_INDY3 && var == 94 && bit == 4) {
                                 return 0;
-                        } else if (_gameId == GID_LOOM && var == 214 && bit == 15 && !copyprotbypassed) {
-                                copyprotbypassed = true;
+                        } else if (_gameId == GID_LOOM && var == 214 && bit == 15 && _currentRoom == 69) {
                                 return 0;
                         } else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) {
                                 return 0;