diff options
| author | Andrew Kurushin | 2004-12-28 21:27:18 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2004-12-28 21:27:18 +0000 |
| commit | d6a4ffc2b034aa4ee065451ce7d611e0501d305b (patch) | |
| tree | 9fcbe5c15ef7eae4dfcd83b86ff5be22c54a5f51 /saga/sprite.cpp | |
| parent | a40ed29abd3c164743f2b56c2f73aa4a956b34a8 (diff) | |
| download | scummvm-rg350-d6a4ffc2b034aa4ee065451ce7d611e0501d305b.tar.gz scummvm-rg350-d6a4ffc2b034aa4ee065451ce7d611e0501d305b.tar.bz2 scummvm-rg350-d6a4ffc2b034aa4ee065451ce7d611e0501d305b.zip | |
- many actor walk related functions added
- implemented script functions for scriptDoors (except iso mode)
- introduced getDisplayWidth() getDisplayHeight() getStatusYOffset getPathYOffset()
svn-id: r16363
Diffstat (limited to 'saga/sprite.cpp')
| -rw-r--r-- | saga/sprite.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/saga/sprite.cpp b/saga/sprite.cpp index 6b8289a105..a68482afa1 100644 --- a/saga/sprite.cpp +++ b/saga/sprite.cpp @@ -286,10 +286,10 @@ int Sprite::drawOccluded(SURFACE *ds, SPRITELIST *sprite_list, int sprite_num, c CLIPINFO ci; // BG mask variables - int mask_w; - int mask_h; - byte *mask_buf; - size_t mask_buf_len; + int maskWidth; + int maskHeight; + byte *maskBuffer; + size_t maskBufferLength; byte *mask_row_p; int mask_z; @@ -326,7 +326,7 @@ int Sprite::drawOccluded(SURFACE *ds, SPRITELIST *sprite_list, int sprite_num, c sprite_data_p = sprite_p + readS.pos(); - _vm->_scene->getBGMaskInfo(&mask_w, &mask_h, &mask_buf, &mask_buf_len); + _vm->_scene->getBGMaskInfo(maskWidth, maskHeight, maskBuffer, maskBufferLength); if (scale < 256) scaleSpriteCoords(scale, &s_width, &s_height, &x_align, &y_align); @@ -339,7 +339,7 @@ int Sprite::drawOccluded(SURFACE *ds, SPRITELIST *sprite_list, int sprite_num, c spr_dst_rect.left = 0; spr_dst_rect.top = 0; spr_dst_rect.right = ds->clip_rect.right; - spr_dst_rect.bottom = MIN(ds->clip_rect.bottom, (int16)mask_h); + spr_dst_rect.bottom = MIN(ds->clip_rect.bottom, (int16)maskHeight); spr_pt.x = screenCoord.x + x_align; spr_pt.y = screenCoord.y + y_align; @@ -363,7 +363,7 @@ int Sprite::drawOccluded(SURFACE *ds, SPRITELIST *sprite_list, int sprite_num, c src_row_p = _decodeBuf + ci.src_draw_x + (ci.src_draw_y * s_width); dst_row_p = (byte *)ds->pixels + ci.dst_draw_x + (ci.dst_draw_y * ds->pitch); - mask_row_p = mask_buf + ci.dst_draw_x + (ci.dst_draw_y * mask_w); + mask_row_p = maskBuffer + ci.dst_draw_x + (ci.dst_draw_y * maskWidth); for (y = 0; y < ci.draw_h; y++) { src_p = src_row_p; @@ -381,7 +381,7 @@ int Sprite::drawOccluded(SURFACE *ds, SPRITELIST *sprite_list, int sprite_num, c mask_p++; } dst_row_p += ds->pitch; - mask_row_p += mask_w; + mask_row_p += maskWidth; src_row_p += s_width; } /* |