diff options
| -rw-r--r-- | engines/saga/actor.cpp | 6 | ||||
| -rw-r--r-- | engines/saga/actor.h | 3 | ||||
| -rw-r--r-- | engines/saga/events.cpp | 2 | ||||
| -rw-r--r-- | engines/saga/scene.cpp | 4 | 
4 files changed, 3 insertions, 12 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 549f1f365c..41e4ce7b47 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -278,8 +278,6 @@ Actor::Actor(SagaEngine *vm) : _vm(vm) {  	_pathRect.top = _vm->getDisplayInfo().pathStartY;  	_pathRect.bottom = _vm->_scene->getHeight(); -	_showActors = true; -  	// Get actor resource file context  	_actorContext = _vm->_resource->getContext(GAME_RESOURCEFILE);  	if (_actorContext == NULL) { @@ -1830,10 +1828,6 @@ void Actor::drawActors() {  		return;  	} -	if (!_showActors) { -		return; -	} -  	CommonObjectOrderList::iterator drawOrderIterator;  	CommonObjectDataPointer drawObject;  	int frameNumber; diff --git a/engines/saga/actor.h b/engines/saga/actor.h index ef62661c6c..971fe8f5be 100644 --- a/engines/saga/actor.h +++ b/engines/saga/actor.h @@ -612,8 +612,6 @@ public:  	void freeObjList();  	void loadObjList(int objectCount, int objectsResourceID); -	void showActors(bool flag) { _showActors = flag; } -  protected:  	friend class Script;  	bool loadActorResources(ActorData *actor); @@ -709,7 +707,6 @@ private:  	int _xCellCount;  	int _yCellCount;  	Rect _pathRect; -	bool _showActors;  	PathDirectionData *_pathDirectionList;  	int _pathDirectionListCount; diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp index 197d2e8842..298ce6acdb 100644 --- a/engines/saga/events.cpp +++ b/engines/saga/events.cpp @@ -358,7 +358,7 @@ int Events::handleOneShot(Event *event) {  					_vm->_gfx->setPalette(palPointer);  				}  			} -			_vm->_actor->showActors(true); +			_vm->_render->clearFlag(RF_DISABLE_ACTORS);  		}  		break;  	case kPsychicProfileBgEvent: diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 6b2a57ca8d..c9bcb7858b 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -712,7 +712,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {  	_sceneLoaded = true;  	// Scene is loaded, but don't show actors till the scene's background is drawn  	// via kEventDisplay later on -	_vm->_actor->showActors(false); +	_vm->_render->setFlag(RF_DISABLE_ACTORS);  	q_event = NULL; @@ -1461,7 +1461,7 @@ void Scene::clearPsychicProfile() {  	if (_vm->_interface->getMode() == kPanelPlacard || _vm->getGameId() == GID_IHNM_DEMO) {  		_vm->_scene->clearPlacard();  		_vm->_scene->_textList.clear(); -		_vm->_actor->showActors(false); +		_vm->_render->setFlag(RF_DISABLE_ACTORS);  		_vm->_gfx->restorePalette();  		_vm->_scene->restoreScene();  		_vm->_interface->activate();  | 
