ILLUSIONS: Rename tag -> sceneId

6 files changed, 28 insertions, 28 deletions

diff --git a/engines/illusions/resources/actorresource.cpp b/engines/illusions/resources/actorresource.cpp
index b93cf0f83d..8c65626b0f 100644
--- a/engines/illusions/resources/actorresource.cpp
+++ b/engines/illusions/resources/actorresource.cpp
@@ -180,7 +180,7 @@ ActorInstance::ActorInstance(IllusionsEngine *vm)
 void ActorInstance::load(Resource *resource) {
 	_actorResource = new ActorResource();
 	_actorResource->load(resource);
-	_tag = resource->_tag;
+	_sceneId = resource->_sceneId;
 	_pauseCtr = 0;
 	initActorTypes();
 	registerResources();
@@ -260,15 +260,15 @@ void ActorInstanceList::removeActorInstance(ActorInstance *actorInstance) {
 	_items.remove(actorInstance);
 }
 
-void ActorInstanceList::pauseByTag(uint32 tag) {
+void ActorInstanceList::pauseBySceneId(uint32 sceneId) {
 	for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
-		if ((*it)->_tag == tag)
+		if ((*it)->_sceneId == sceneId)
 			(*it)->pause();
 }
 
-void ActorInstanceList::unpauseByTag(uint32 tag) {
+void ActorInstanceList::unpauseBySceneId(uint32 sceneId) {
 	for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
-		if ((*it)->_tag == tag)
+		if ((*it)->_sceneId == sceneId)
 			(*it)->unpause();
 }
 
diff --git a/engines/illusions/resources/actorresource.h b/engines/illusions/resources/actorresource.h
index b78e515f3f..c24213dba9 100644
--- a/engines/illusions/resources/actorresource.h
+++ b/engines/illusions/resources/actorresource.h
@@ -101,7 +101,7 @@ public:
 	virtual void unpause();
 public:
 	IllusionsEngine *_vm;
-	uint32 _tag;
+	uint32 _sceneId;
 	int _pauseCtr;
 	ActorResource *_actorResource;
 protected:
@@ -116,8 +116,8 @@ public:
 	~ActorInstanceList();
 	ActorInstance *createActorInstance(Resource *resource);
 	void removeActorInstance(ActorInstance *actorInstance);
-	void pauseByTag(uint32 tag);
-	void unpauseByTag(uint32 tag);
+	void pauseBySceneId(uint32 sceneId);
+	void unpauseBySceneId(uint32 sceneId);
 	FramesList *findSequenceFrames(Sequence *sequence);
 	ActorInstance *findActorByResource(ActorResource *actorResource);
 	bool findNamedPoint(uint32 namedPointId, Common::Point &pt);
diff --git a/engines/illusions/resources/backgroundresource.cpp b/engines/illusions/resources/backgroundresource.cpp
index e50f46b240..d18d46bf2f 100644
--- a/engines/illusions/resources/backgroundresource.cpp
+++ b/engines/illusions/resources/backgroundresource.cpp
@@ -368,7 +368,7 @@ bool BackgroundResource::findNamedPoint(uint32 namedPointId, Common::Point &pt)
 // BackgroundInstance
 
 BackgroundInstance::BackgroundInstance(IllusionsEngine *vm)
-	: _vm(vm), _tag(0), _pauseCtr(0), _bgRes(0), _savedPalette(0) {
+	: _vm(vm), _sceneId(0), _pauseCtr(0), _bgRes(0), _savedPalette(0) {
 }
 
 void BackgroundInstance::load(Resource *resource) {
@@ -378,7 +378,7 @@ void BackgroundInstance::load(Resource *resource) {
 	backgroundResource->load(resource->_data, resource->_dataSize);
 
 	_bgRes = backgroundResource;
-	_tag = resource->_tag;
+	_sceneId = resource->_sceneId;
 	initSurface();
 	
 	// Insert background objects
@@ -549,15 +549,15 @@ void BackgroundInstanceList::removeBackgroundInstance(BackgroundInstance *backgr
 	_items.remove(backgroundInstance);
 }
 
-void BackgroundInstanceList::pauseByTag(uint32 tag) {
+void BackgroundInstanceList::pauseBySceneId(uint32 sceneId) {
 	for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
-		if ((*it)->_tag == tag)
+		if ((*it)->_sceneId == sceneId)
 			(*it)->pause();
 }
 
-void BackgroundInstanceList::unpauseByTag(uint32 tag) {
+void BackgroundInstanceList::unpauseBySceneId(uint32 sceneId) {
 	for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
-		if ((*it)->_tag == tag)
+		if ((*it)->_sceneId == sceneId)
 			(*it)->unpause();
 }
 
diff --git a/engines/illusions/resources/backgroundresource.h b/engines/illusions/resources/backgroundresource.h
index d118c3d6d0..d0c0c76233 100644
--- a/engines/illusions/resources/backgroundresource.h
+++ b/engines/illusions/resources/backgroundresource.h
@@ -190,7 +190,7 @@ public:
 	virtual void unpause();
 public:
 	IllusionsEngine *_vm;
-	uint32 _tag;
+	uint32 _sceneId;
 	int _pauseCtr;
 	BackgroundResource *_bgRes;
 	Common::Point _panPoints[kMaxBackgroundItemSurfaces];
@@ -212,8 +212,8 @@ public:
 	~BackgroundInstanceList();
 	BackgroundInstance *createBackgroundInstance(Resource *resource);
 	void removeBackgroundInstance(BackgroundInstance *backgroundInstance);
-	void pauseByTag(uint32 tag);
-	void unpauseByTag(uint32 tag);
+	void pauseBySceneId(uint32 sceneId);
+	void unpauseBySceneId(uint32 sceneId);
 	BackgroundInstance *findActiveBackgroundInstance();
 	BackgroundInstance *findBackgroundByResource(BackgroundResource *backgroundResource);
 	BackgroundResource *getActiveBgResource();
diff --git a/engines/illusions/resources/talkresource.cpp b/engines/illusions/resources/talkresource.cpp
index 9b03b37cc2..a75c3700f2 100644
--- a/engines/illusions/resources/talkresource.cpp
+++ b/engines/illusions/resources/talkresource.cpp
@@ -85,7 +85,7 @@ void TalkInstance::load(Resource *resource) {
 	talkResource->load(resource->_data, resource->_dataSize);
 	_talkRes = talkResource;
 	_talkId = resource->_resId;
-	_tag = resource->_tag;
+	_sceneId = resource->_sceneId;
 	registerResources();
 }
 
@@ -148,21 +148,21 @@ TalkInstance *TalkInstanceList::findTalkItem(uint32 talkId) {
 	return 0;
 }
 
-TalkInstance *TalkInstanceList::findTalkItemByTag(uint32 tag) {
+TalkInstance *TalkInstanceList::findTalkItemBySceneId(uint32 sceneId) {
 	for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
-		if ((*it)->_tag == tag)
+		if ((*it)->_sceneId == sceneId)
 			return (*it);
 	return 0;
 }
 
-void TalkInstanceList::pauseByTag(uint32 tag) {
-	TalkInstance *talkInstance = findTalkItemByTag(tag);
+void TalkInstanceList::pauseBySceneId(uint32 sceneId) {
+	TalkInstance *talkInstance = findTalkItemBySceneId(sceneId);
 	if (talkInstance)
 		talkInstance->pause();
 }
 
-void TalkInstanceList::unpauseByTag(uint32 tag) {
-	TalkInstance *talkInstance = findTalkItemByTag(tag);
+void TalkInstanceList::unpauseBySceneId(uint32 sceneId) {
+	TalkInstance *talkInstance = findTalkItemBySceneId(sceneId);
 	if (talkInstance)
 		talkInstance->unpause();
 }
diff --git a/engines/illusions/resources/talkresource.h b/engines/illusions/resources/talkresource.h
index a29e58ceb5..ea38aa7370 100644
--- a/engines/illusions/resources/talkresource.h
+++ b/engines/illusions/resources/talkresource.h
@@ -69,7 +69,7 @@ public:
 public:
 	IllusionsEngine *_vm;
 	uint32 _talkId;
-	uint32 _tag;
+	uint32 _sceneId;
 	TalkResource *_talkRes;
 	int _pauseCtr;
 	void registerResources();
@@ -83,9 +83,9 @@ public:
 	TalkInstance *createTalkInstance(Resource *resource);
 	void removeTalkInstance(TalkInstance *talkInstance);
 	TalkInstance *findTalkItem(uint32 talkId);
-	TalkInstance *findTalkItemByTag(uint32 tag);
-	void pauseByTag(uint32 tag);
-	void unpauseByTag(uint32 tag);
+	TalkInstance *findTalkItemBySceneId(uint32 sceneId);
+	void pauseBySceneId(uint32 sceneId);
+	void unpauseBySceneId(uint32 sceneId);
 //protected:
 public:
 	typedef Common::List<TalkInstance*> Items;