diff options
Diffstat (limited to 'engines/bladerunner/scene.cpp')
| -rw-r--r-- | engines/bladerunner/scene.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/scene.cpp b/engines/bladerunner/scene.cpp index c29a6345cc..abf0285660 100644 --- a/engines/bladerunner/scene.cpp +++ b/engines/bladerunner/scene.cpp @@ -108,7 +108,7 @@ bool Scene::open(int setId, int sceneId, bool isLoadingGame) { _vm->_scene->advanceFrame(_vm->_surface1, _vm->_zBuffer1); _vm->_playerActor->setAtXYZ(_actorStartPosition, _actorStartFacing); - //_vm->_playerActor->setSetId(setId); + _vm->_playerActor->setSetId(setId); _vm->_script->SceneLoaded(); @@ -120,7 +120,7 @@ bool Scene::open(int setId, int sceneId, bool isLoadingGame) { Actor *actor = _vm->_actors[i]; if (actor->getSetId() == setId) { _vm->_sceneObjects->addActor( - i, + i + SCENE_OBJECTS_ACTORS_OFFSET, actor->getBoundingBox(), actor->getScreenRectangle(), 1, @@ -251,14 +251,14 @@ bool Scene::objectGetBoundingBox(int objectId, BoundingBox *boundingBox) { void Scene::objectSetIsClickable(int objectId, bool isClickable, bool sceneLoaded) { _set->objectSetIsClickable(objectId, isClickable); if (sceneLoaded) { - _vm->_sceneObjects->setIsClickable(objectId + 198, isClickable); + _vm->_sceneObjects->setIsClickable(objectId + SCENE_OBJECTS_OBJECTS_OFFSET, isClickable); } } void Scene::objectSetIsObstacle(int objectId, bool isObstacle, bool sceneLoaded, bool updateWalkpath) { _set->objectSetIsObstacle(objectId, isObstacle); if (sceneLoaded) { - _vm->_sceneObjects->setIsObstacle(objectId + 198, isObstacle); + _vm->_sceneObjects->setIsObstacle(objectId + SCENE_OBJECTS_OBJECTS_OFFSET, isObstacle); if (updateWalkpath) { _vm->_sceneObjects->updateObstacles(); } @@ -270,7 +270,7 @@ void Scene::objectSetIsObstacleAll(bool isObstacle, bool sceneLoaded) { for (i = 0; i < (int)_set->getObjectCount(); i++) { _set->objectSetIsObstacle(i, isObstacle); if (sceneLoaded) { - _vm->_sceneObjects->setIsObstacle(i + 198, isObstacle); + _vm->_sceneObjects->setIsObstacle(i + SCENE_OBJECTS_OBJECTS_OFFSET, isObstacle); } } } @@ -278,7 +278,7 @@ void Scene::objectSetIsObstacleAll(bool isObstacle, bool sceneLoaded) { void Scene::objectSetIsTarget(int objectId, bool isTarget, bool sceneLoaded) { _set->objectSetIsTarget(objectId, isTarget); if (sceneLoaded) { - _vm->_sceneObjects->setIsTarget(objectId + 198, isTarget); + _vm->_sceneObjects->setIsTarget(objectId + SCENE_OBJECTS_OBJECTS_OFFSET, isTarget); } } |