Ticket #8012: simonlock.diff

scummvm/simon/simon.cpp

@@ -3114 +3114 @@
         if (!(h > 0 && w > 0 && ha->x + w <= 320 && ha->y + h <= 200)) {
                 warning("Invalid coordinates in video_toggle_colors (%d,%d,%d,%d)", ha->x, ha->y, ha->width,
                                                 ha->height);
+                _lock_word &= ~0x8000;
                 return;
         }
 
@@ -4357 +4358 @@
 #endif
 
         f = fopen(gen_savename(slot), "wb");
-        if (f == NULL)
+        if (f == NULL) {
+                _lock_word &= ~0x100;
                 return false;
+        }
 
         fwrite(caption, 1, 0x12, f);
 
@@ -4472 +4475 @@
 #endif
 
         f = fopen(gen_savename(slot), "rb");
-        if (f == NULL)
+        if (f == NULL) {
+                _lock_word &= ~0x100;
                 return false;
+        }
 
         fread(ident, 1, 18, f);
 
@@ -4481 +4486 @@
 
         if (fileReadBE32(f) != 0xFFFFFFFF || num != _itemarray_inited - 1) {
                 fclose(f);
+                _lock_word &= ~0x100;
                 return false;
         }