aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction_ns.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-09-02 18:34:11 +0000
committerNicola Mettifogo2007-09-02 18:34:11 +0000
commit21e4f4f1760e204de6e8d0a413f8e8f8987dd083 (patch)
tree1902fcb1756b1226e05dc12a4bfabead8ba9215d /engines/parallaction/parallaction_ns.cpp
parentf1f324cee424cb97da1a14789db2806002ba3f6e (diff)
downloadscummvm-rg350-21e4f4f1760e204de6e8d0a413f8e8f8987dd083.tar.gz
scummvm-rg350-21e4f4f1760e204de6e8d0a413f8e8f8987dd083.tar.bz2
scummvm-rg350-21e4f4f1760e204de6e8d0a413f8e8f8987dd083.zip
Simplified global label management and added subtitles for BRA.
svn-id: r28828
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r--engines/parallaction/parallaction_ns.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 8bac86b121..6775553887 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -232,16 +232,10 @@ void Parallaction_ns::changeLocation(char *location) {
_soundMan->playLocationMusic(location);
- // WORKAROUND: this if-statement has been added to avoid crashes caused by
+ // WORKAROUND: this hideLabel has been added to avoid crashes caused by
// execution of label jobs after a location switch. The other workaround in
// Parallaction::runGame should have been rendered useless by this one.
- if (_jDrawLabel != NULL) {
- removeJob(_jDrawLabel);
- removeJob(_jEraseLabel);
- _jDrawLabel = NULL;
- _jEraseLabel = NULL;
- }
-
+ hideLabel(kPriority99);
_hoverZone = NULL;
if (_engineFlags & kEngineBlockInput) {