fixed V2 script freezing (bug #745421)

svn-id: r8086

1 files changed, 20 insertions, 0 deletions

diff --git a/scumm/script.cpp b/scumm/script.cpp
index 724c934420..d736e4bb40 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -653,6 +653,16 @@ void Scumm::runHook(int i) {
 void Scumm::freezeScripts(int flag) {
 	int i;
 
+	if (_features & GF_AFTER_V2) {
+		for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
+			if (_currentScript != i && vm.slot[i].status != ssDead && !vm.slot[i].freezeResistant) {
+				vm.slot[i].status |= 0x80;
+				vm.slot[i].freezeCount = 1;
+			}
+		}
+		return;
+	}
+
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
 		if (_currentScript != i && vm.slot[i].status != ssDead && (!vm.slot[i].freezeResistant || flag >= 0x80)) {
 			vm.slot[i].status |= 0x80;
@@ -671,6 +681,15 @@ void Scumm::freezeScripts(int flag) {
 
 void Scumm::unfreezeScripts() {
 	int i;
+
+	if (_features & GF_AFTER_V2) {
+		for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
+			vm.slot[i].status &= 0x7F;
+			vm.slot[i].freezeCount = 0;
+		}
+		return;
+	}
+	
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
 		if (vm.slot[i].status & 0x80) {
 			if (!--vm.slot[i].freezeCount) {
@@ -685,6 +704,7 @@ void Scumm::unfreezeScripts() {
 	}
 }
 
+
 void Scumm::runAllScripts() {
 	int i;