# HG changeset patch # User smatz # Date 2008-02-19 17:45:30 # Node ID bb0778079c1cdc567c7ad8297861686cd26f921f # Parent f45b1250efde82b2d7e891da5610477ff17e4281 (svn r12186) -Fix [FS#1784](r12169): assert when trying to play tile sound at NW border of map (placing buyos, leveling land) diff --git a/src/sound.cpp b/src/sound.cpp --- a/src/sound.cpp +++ b/src/sound.cpp @@ -241,7 +241,8 @@ void SndPlayTileFx(SoundFx sound, TileIn /* emits sound from center of the tile */ int x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2; int y = TileY(tile) * TILE_SIZE - TILE_SIZE / 2; - Point pt = RemapCoords(x, y, GetSlopeZ(x, y)); + uint z = (y < 0 ? 0 : GetSlopeZ(x, y)); + Point pt = RemapCoords(x, y, z); y += 2 * TILE_SIZE; Point pt2 = RemapCoords(x, y, GetSlopeZ(x, y)); SndPlayScreenCoordFx(sound, pt.x, pt2.x, pt.y, pt2.y);