aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/player.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-02 21:24:22 -0400
committerPaul Gilbert2014-04-02 21:24:22 -0400
commit3f8ee8fafa0166204a6c0b9ec311aa9fb0aa3c39 (patch)
treea91f4da429e92fdbcf8357229f20c032f284353b /engines/mads/player.cpp
parent041773705be6dd1fb09d71e482f4974247cee61f (diff)
downloadscummvm-rg350-3f8ee8fafa0166204a6c0b9ec311aa9fb0aa3c39.tar.gz
scummvm-rg350-3f8ee8fafa0166204a6c0b9ec311aa9fb0aa3c39.tar.bz2
scummvm-rg350-3f8ee8fafa0166204a6c0b9ec311aa9fb0aa3c39.zip
MADS: Cleanup of UISlots and flag types
Diffstat (limited to 'engines/mads/player.cpp')
-rw-r--r--engines/mads/player.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 5546784083..a98fdb1b15 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -260,7 +260,7 @@ void Player::update() {
if (_forceRefresh || (_visible != _priorVisible)) {
int slotIndex = getSpriteSlot();
if (slotIndex >= 0)
- scene._spriteSlots[slotIndex]._SlotType = ST_EXPIRED;
+ scene._spriteSlots[slotIndex]._flags = IMG_ERASE;
int newDepth = 1;
int yp = MAX(_playerPos.y, (int16)(MADS_SCENE_HEIGHT - 1));
@@ -278,7 +278,7 @@ void Player::update() {
if (_visible) {
// Player sprite needs to be rendered
SpriteSlot slot;
- slot._SlotType = ST_FOREGROUND;
+ slot._flags = IMG_UPDATE;
slot._seqIndex = PLAYER_SEQ_INDEX;
slot._spritesIndex = _spritesStart + _spritesIdx;
slot._frameNumber = _mirror ? -_frameNumber : _frameNumber;
@@ -299,7 +299,7 @@ void Player::update() {
if (equal)
// Undo the prior expiry of the player sprite
- s2._SlotType = ST_NONE;
+ s2._flags = IMG_STATIC;
else
slotIndex = -1;
}
@@ -532,7 +532,7 @@ int Player::getSpriteSlot() {
for (uint idx = 0; idx < spriteSlots.size(); ++idx) {
if (spriteSlots[idx]._seqIndex == PLAYER_SEQ_INDEX &&
- spriteSlots[idx]._SlotType >= ST_NONE)
+ spriteSlots[idx]._flags >= IMG_STATIC)
return idx;
}