diff options
| author | Filippos Karapetis | 2010-09-13 13:17:55 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-09-13 13:17:55 +0000 |
| commit | e242814990862998c2af9289f88f0cbc8060fb13 (patch) | |
| tree | 80dda8835c811d870797941516fad1b4e850df02 /engines/sci/engine/script.h | |
| parent | c2fb737950bd27d8f86a66a08d3c17b7b734fc1c (diff) | |
| download | scummvm-rg350-e242814990862998c2af9289f88f0cbc8060fb13.tar.gz scummvm-rg350-e242814990862998c2af9289f88f0cbc8060fb13.tar.bz2 scummvm-rg350-e242814990862998c2af9289f88f0cbc8060fb13.zip | |
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
Diffstat (limited to 'engines/sci/engine/script.h')
| -rw-r--r-- | engines/sci/engine/script.h | 23 |
1 files changed, 15 insertions, 8 deletions
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 |