diff options
| author | rubidium <rubidium@openttd.org> | 2008-09-02 15:20:38 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-09-02 15:20:38 +0000 |
| commit | c8e8911ef676f503ac5789d3fefac1278cdef971 (patch) | |
| tree | e7050537d14303dbc6bc9a461ff38931861cc4aa /src/viewport.cpp | |
| parent | cbe397388f0ef537b61095b05ee4edfe9dd92202 (diff) | |
| download | openttd-c8e8911ef676f503ac5789d3fefac1278cdef971.tar.xz | |
(svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites.
Diffstat (limited to 'src/viewport.cpp')
| -rw-r--r-- | src/viewport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/viewport.cpp b/src/viewport.cpp index dce5424d2..ba4d44f82 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -567,7 +567,7 @@ void OffsetGroundSprite(int x, int y) static void AddCombinedSprite(SpriteID image, SpriteID pal, int x, int y, byte z, const SubSprite *sub) { Point pt = RemapCoords(x, y, z); - const Sprite* spr = GetSprite(image & SPRITE_MASK); + const Sprite* spr = GetSprite(image & SPRITE_MASK, ST_NORMAL); if (pt.x + spr->x_offs >= _vd.dpi.left + _vd.dpi.width || pt.x + spr->x_offs + spr->width <= _vd.dpi.left || @@ -632,7 +632,7 @@ void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, top = tmp_top = RemapCoords(x + bb_offset_x, y + bb_offset_y, z + dz ).y; bottom = RemapCoords(x + w , y + h , z + bb_offset_z).y + 1; } else { - const Sprite *spr = GetSprite(image & SPRITE_MASK); + const Sprite *spr = GetSprite(image & SPRITE_MASK, ST_NORMAL); left = tmp_left = (pt.x += spr->x_offs); right = (pt.x + spr->width ); top = tmp_top = (pt.y += spr->y_offs); |