aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/scene.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-12 22:08:21 -0400
committerPaul Gilbert2014-04-12 22:08:21 -0400
commitf4165c5f8a2a15a6b3cdf1ce46732e2e5efe772a (patch)
tree5cac04594d2325ff9de12a91a35d9ef98304e434 /engines/mads/scene.cpp
parentfc7e91691d73bcc0e58cd89f85597a2c42fd6d57 (diff)
downloadscummvm-rg350-f4165c5f8a2a15a6b3cdf1ce46732e2e5efe772a.tar.gz
scummvm-rg350-f4165c5f8a2a15a6b3cdf1ce46732e2e5efe772a.tar.bz2
scummvm-rg350-f4165c5f8a2a15a6b3cdf1ce46732e2e5efe772a.zip
MADS: Field/method renaming
Diffstat (limited to 'engines/mads/scene.cpp')
-rw-r--r--engines/mads/scene.cpp12
1 files changed, 6 insertions, 6 deletions
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);