[Scummvm-cvs-logs] SF.net SVN: scummvm: [28736] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28736
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28736&view=rev
Author:   thebluegr
Date:     2007-08-25 16:19:55 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
Removed the showactors flag and substituted it with RF_DISABLE_ACTORS

Modified Paths:
--------------
    scummvm/trunk/engines/saga/actor.cpp
    scummvm/trunk/engines/saga/actor.h
    scummvm/trunk/engines/saga/events.cpp
    scummvm/trunk/engines/saga/scene.cpp

Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp	2007-08-25 20:37:41 UTC (rev 28735)
+++ scummvm/trunk/engines/saga/actor.cpp	2007-08-25 23:19:55 UTC (rev 28736)
@@ -278,8 +278,6 @@
 	_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 @@
 		return;
 	}
 
-	if (!_showActors) {
-		return;
-	}
-
 	CommonObjectOrderList::iterator drawOrderIterator;
 	CommonObjectDataPointer drawObject;
 	int frameNumber;

Modified: scummvm/trunk/engines/saga/actor.h
===================================================================
--- scummvm/trunk/engines/saga/actor.h	2007-08-25 20:37:41 UTC (rev 28735)
+++ scummvm/trunk/engines/saga/actor.h	2007-08-25 23:19:55 UTC (rev 28736)
@@ -612,8 +612,6 @@
 	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 @@
 	int _xCellCount;
 	int _yCellCount;
 	Rect _pathRect;
-	bool _showActors;
 
 	PathDirectionData *_pathDirectionList;
 	int _pathDirectionListCount;

Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp	2007-08-25 20:37:41 UTC (rev 28735)
+++ scummvm/trunk/engines/saga/events.cpp	2007-08-25 23:19:55 UTC (rev 28736)
@@ -358,7 +358,7 @@
 					_vm->_gfx->setPalette(palPointer);
 				}
 			}
-			_vm->_actor->showActors(true);
+			_vm->_render->clearFlag(RF_DISABLE_ACTORS);
 		}
 		break;
 	case kPsychicProfileBgEvent:

Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp	2007-08-25 20:37:41 UTC (rev 28735)
+++ scummvm/trunk/engines/saga/scene.cpp	2007-08-25 23:19:55 UTC (rev 28736)
@@ -712,7 +712,7 @@
 	_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 @@
 	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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.