aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/actor.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2017-08-20 16:53:37 +0300
committerFilippos Karapetis2017-08-20 17:10:32 +0300
commit06f934dc9f46a8fa4c88cdb56f6372320ad78aac (patch)
tree4203888e571ece60d1d41c2be73e1f5d0e1b21be /engines/saga/actor.cpp
parent42c6f68f7a14772ade8902826a308d3fbc2f82cf (diff)
downloadscummvm-rg350-06f934dc9f46a8fa4c88cdb56f6372320ad78aac.tar.gz
scummvm-rg350-06f934dc9f46a8fa4c88cdb56f6372320ad78aac.tar.bz2
scummvm-rg350-06f934dc9f46a8fa4c88cdb56f6372320ad78aac.zip
SAGA: Remove obsolete hack for the compact disk in Ellen's chapter
This has been added in commit 5624ba23d0 and is no longer needed. The gem is shown correctly over the compact disk in that scene, and the behavior is the same as the original
Diffstat (limited to 'engines/saga/actor.cpp')
-rw-r--r--engines/saga/actor.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index d8b115f9bd..8c45a2890e 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -1174,21 +1174,6 @@ void Actor::actorSpeech(uint16 actorId, const char **strings, int stringsCount,
_activeSpeech.speechBox.right = _vm->getDisplayInfo().width - 10;
}
- // HACK for the compact disk in Ellen's chapter
- // Once Ellen starts saying that "Something is different", bring the compact disk in the
- // scene. After speaking with AM, the compact disk is visible. She always says this line
- // when entering room 59, after speaking with AM, if the compact disk is not picked up yet
- // Check Script::sfDropObject for the other part of this hack
- if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 3 &&
- _vm->_scene->currentSceneNumber() == 59 && _activeSpeech.sampleResourceId == 286) {
- for (ObjectDataArray::iterator obj = _objs.begin(); obj != _objs.end(); ++obj) {
- if (obj->_id == 16385) { // the compact disk
- obj->_sceneNumber = 59;
- break;
- }
- }
- }
-
}
void Actor::nonActorSpeech(const Common::Rect &box, const char **strings, int stringsCount, int sampleResourceId, int speechFlags) {