diff options
| -rw-r--r-- | engines/saga/actor.cpp | 15 | ||||
| -rw-r--r-- | engines/saga/sfuncs.cpp | 8 |
2 files changed, 0 insertions, 23 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) { diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp index 2175d8f40a..6456daeb02 100644 --- a/engines/saga/sfuncs.cpp +++ b/engines/saga/sfuncs.cpp @@ -704,14 +704,6 @@ void Script::sfDropObject(SCRIPTFUNC_PARAMS) { obj->_sceneNumber = _vm->_scene->currentSceneNumber(); - // HACK for the compact disk in Ellen's chapter - // Change the scene number of the compact disk so that it's not shown. It will be shown - // once Ellen says that there's something different (i.e. after speaking with AM) - // See Actor::actorSpeech for the other part of this hack - if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 3 && - _vm->_scene->currentSceneNumber() == 59 && obj->_id == 16385) - obj->_sceneNumber = -1; - if (_vm->getGameId() == GID_IHNM) { // Don't update _spriteListResourceId if spriteId is 0 and the object is not the // psychic profile. If spriteId == 0, the object's sprite is incorrectly reset. |