From f4165c5f8a2a15a6b3cdf1ce46732e2e5efe772a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 12 Apr 2014 22:08:21 -0400
Subject: MADS: Field/method renaming

---
 engines/mads/palette.cpp |  2 +-
 engines/mads/scene.cpp   | 12 ++++++------
 engines/mads/scene.h     |  2 +-
 engines/mads/sprites.cpp |  2 +-
 engines/mads/sprites.h   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 157754f0d4..64e0f80766 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -527,7 +527,7 @@ void Palette::unlock() {
 
 void Palette::refreshHighColors() {
 	int val = 18;
-	if (_vm->_game->_scene._animFlag)
+	if (_vm->_game->_scene._cyclingActive)
 		val += _vm->_game->_scene._animCount;
 
 	setPalette(_mainPalette, val, 256 - val);
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 92c5cedc04..1aa1fd7f32 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -37,7 +37,7 @@ Scene::Scene(MADSEngine *vm): _vm(vm), _action(_vm), _depthSurface(vm),
 	_currentSceneId = 0;
 	_sceneLogic = nullptr;
 	_sceneInfo = nullptr;
-	_animFlag = false;
+	_cyclingActive = false;
 	_animVal1 = 0;
 	_depthStyle = 0;
 	_roomChanged = false;
@@ -257,7 +257,7 @@ void Scene::initPaletteAnimation(Common::Array<RGB4> &animData, bool animFlag) {
 		_animCount += _animPalData[i].r;
 
 	_animVal1 = (_animCount > 16) ? 3 : 0;
-	_animFlag = animFlag;
+	_cyclingActive = animFlag;
 }
 
 bool Scene::getDepthHighBits(const Common::Point &pt) {
@@ -393,7 +393,7 @@ void Scene::doFrame() {
 	}
 
 	if (_vm->_game->_fx)
-		_animFlag = true;
+		_cyclingActive = true;
 	_vm->_game->_fx = kTransitionNone;
 
 	if (_freeAnimationFlag && _activeAnimation) {
@@ -403,7 +403,7 @@ void Scene::doFrame() {
 }
 
 void  Scene::drawElements(ScreenTransition transitionType, bool surfaceFlag) {
-	// Draw any sprites
+	// Draw any sprite backgrounds
 	_spriteSlots.drawBackground();
 
 	// Set up dirty areas for any text display
@@ -420,8 +420,8 @@ void  Scene::drawElements(ScreenTransition transitionType, bool surfaceFlag) {
 	_textDisplay.setDirtyAreas2();
 	_dirtyAreas.merge(1, DIRTY_AREAS_SIZE);
 
-	// Draw foreground sprites
-	_spriteSlots.drawForeground(&_vm->_screen);
+	// Draw sprites that have changed
+	_spriteSlots.drawSprites(&_vm->_screen);
 
 	// Draw text elements onto the view
 	_textDisplay.draw(&_vm->_screen);
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 4d9a3f8efa..e00924a543 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -106,7 +106,7 @@ public:
 	MSurface _backgroundSurface;
 	DepthSurface _depthSurface;
 	UserInterface _userInterface;
-	bool _animFlag;
+	bool _cyclingActive;
 	int _animVal1;
 	int _animCount;
 	Common::Array<uint32> _animTicksList;
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 0dd640bca0..83f01430eb 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -283,7 +283,7 @@ void SpriteSlots::drawBackground() {
 	}
 }
 
-void SpriteSlots::drawForeground(MSurface *s) {
+void SpriteSlots::drawSprites(MSurface *s) {
 	DepthList depthList;
 	Scene &scene = _vm->_game->_scene;
 
diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h
index 962d8c9e75..745e0700e8 100644
--- a/engines/mads/sprites.h
+++ b/engines/mads/sprites.h
@@ -192,7 +192,7 @@ public:
 	/**
 	* Draw any sprites into the foreground of the scene
 	*/
-	void drawForeground(MSurface *s);
+	void drawSprites(MSurface *s);
 
 	void cleanUp();
 };
-- 
cgit v1.2.3