diff options
| author | Benjamin Haisch | 2008-09-17 11:01:43 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-20 22:43:06 +0100 |
| commit | 150e555953d8efae73d1275e138586c91f655809 (patch) | |
| tree | 51a87015cf5acbc6845e212e71896a3ba4d2490c | |
| parent | ade8eec8cf853c8f5fe16cbf410440e76e0ac23e (diff) | |
| download | scummvm-rg350-150e555953d8efae73d1275e138586c91f655809.tar.gz scummvm-rg350-150e555953d8efae73d1275e138586c91f655809.tar.bz2 scummvm-rg350-150e555953d8efae73d1275e138586c91f655809.zip | |
TOLTECS: Renamed ybottom to priority
| -rw-r--r-- | engines/toltecs/screen.h | 2 | ||||
| -rw-r--r-- | engines/toltecs/segmap.cpp | 8 | ||||
| -rw-r--r-- | engines/toltecs/segmap.h | 2 | ||||
| -rw-r--r-- | engines/toltecs/sprite.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/toltecs/screen.h b/engines/toltecs/screen.h index 0e188607e6..e8866317e6 100644 --- a/engines/toltecs/screen.h +++ b/engines/toltecs/screen.h @@ -64,7 +64,7 @@ struct SpriteDrawItem { int16 xdelta, ydelta; uint16 flags; int16 skipX, yerror; - int16 ybottom; + int16 priority; int16 baseColor; }; diff --git a/engines/toltecs/segmap.cpp b/engines/toltecs/segmap.cpp index f0b3082d8a..28965ceb4f 100644 --- a/engines/toltecs/segmap.cpp +++ b/engines/toltecs/segmap.cpp @@ -75,10 +75,10 @@ void SegmentMap::load(byte *source) { maskRect.width = READ_LE_UINT16(source + 6); maskRect.maskOffset = READ_LE_UINT16(source + 8); maskRect.maskOffset -= maskRectDataSize; - maskRect.ybottom = READ_LE_UINT16(source + 10); + maskRect.priority = READ_LE_UINT16(source + 10); debug(0, "SegmentMap::load() (%d, %d, %d, %d, %04X, %d)", - maskRect.x, maskRect.y, maskRect.width, maskRect.height, maskRect.maskOffset, maskRect.ybottom); + maskRect.x, maskRect.y, maskRect.width, maskRect.height, maskRect.maskOffset, maskRect.priority); source += 12; _maskRects.push_back(maskRect); @@ -393,7 +393,7 @@ void SegmentMap::restoreMasksBySprite(SpriteDrawItem *sprite) { for (uint i = 0; i < _maskRects.size(); i++) { #if 0 - if ( *(__int16 *)((char *)&spriteDrawList[0].y2 + v5) <= (unsigned __int16)v3->ybottom ) + if ( *(__int16 *)((char *)&spriteDrawList[0].y2 + v5) <= (unsigned __int16)v3->priority ) { if ( (unsigned __int16)(*(__int16 *)((char *)&spriteDrawList[0].height + v5) + *(__int16 *)((char *)&spriteDrawList[0].y + v5)) > v3->y ) @@ -408,7 +408,7 @@ void SegmentMap::restoreMasksBySprite(SpriteDrawItem *sprite) { #endif - if (sprite->ybottom <= _maskRects[i].ybottom) { + if (sprite->priority <= _maskRects[i].priority) { restoreMask(i); } } diff --git a/engines/toltecs/segmap.h b/engines/toltecs/segmap.h index a625c84843..7e5150ba4a 100644 --- a/engines/toltecs/segmap.h +++ b/engines/toltecs/segmap.h @@ -83,7 +83,7 @@ public: // for debugging purposes int16 y, x; int16 height, width; int16 maskOffset; - int16 ybottom; + int16 priority; }; struct SegmapPathRect { diff --git a/engines/toltecs/sprite.cpp b/engines/toltecs/sprite.cpp index b9f8ffe0a4..3327f04bdd 100644 --- a/engines/toltecs/sprite.cpp +++ b/engines/toltecs/sprite.cpp @@ -209,7 +209,7 @@ void Screen::addDrawRequest(const DrawRequest &drawRequest) { sprite.baseColor = drawRequest.baseColor; sprite.x = drawRequest.x; sprite.y = drawRequest.y; - sprite.ybottom = drawRequest.y; + sprite.priority = drawRequest.y; sprite.resIndex = drawRequest.resIndex; spriteData = _vm->_res->load(drawRequest.resIndex); @@ -393,7 +393,7 @@ void Screen::addDrawRequest(const DrawRequest &drawRequest) { // Add sprite sorted by priority Common::List<SpriteDrawItem>::iterator iter = _spriteDrawList.begin(); - while (iter != _spriteDrawList.end() && (*iter).ybottom <= sprite.ybottom) { + while (iter != _spriteDrawList.end() && (*iter).priority <= sprite.priority) { iter++; } _spriteDrawList.insert(iter, sprite); |