From e242814990862998c2af9289f88f0cbc8060fb13 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 13 Sep 2010 13:17:55 +0000
Subject: SCI: Proper fix for bug #3038837 - "HOYLE3: EGA/VGA Crashes" and some
 cleanup

System scripts (i.e. 0 and 900-999) are now protected and never destroyed during a
game

svn-id: r52702
---
 engines/sci/engine/script.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'engines/sci/engine/script.h')

diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index c60cc4b19f..e316fc0c8d 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -159,14 +159,7 @@ public:
 	 * @param segMan	A reference to the segment manager
 	 * @param segmentId	The script's segment id
 	 */
-	void initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId);
-
-	/**
-	 * Initializes the script's objects (SCI1.1+)
-	 * @param segMan	A reference to the segment manager
-	 * @param segmentId	The script's segment id
-	 */
-	void initialiseObjectsSci11(SegManager *segMan, SegmentId segmentId);
+	void initialiseObjects(SegManager *segMan, SegmentId segmentId);
 
 	// script lock operations
 
@@ -260,6 +253,20 @@ private:
 	void relocate(reg_t block);
 
 	bool relocateLocal(SegmentId segment, int location);
+
+	/**
+	 * Initializes the script's objects (SCI0)
+	 * @param segMan	A reference to the segment manager
+	 * @param segmentId	The script's segment id
+	 */
+	void initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId);
+
+	/**
+	 * Initializes the script's objects (SCI1.1+)
+	 * @param segMan	A reference to the segment manager
+	 * @param segmentId	The script's segment id
+	 */
+	void initialiseObjectsSci11(SegManager *segMan, SegmentId segmentId);
 };
 
 } // End of namespace Sci
-- 
cgit v1.2.3