(svn r12186) -Fix [FS#1784](r12169): assert when trying to play tile sound at NW border of map (placing buyos, leveling land)
authorsmatz
Tue, 19 Feb 2008 17:45:30 +0000
changeset 9100 a68061bad214
parent 9099 b547d33e53d8
child 9101 cd8280bf595c
(svn r12186) -Fix [FS#1784](r12169): assert when trying to play tile sound at NW border of map (placing buyos, leveling land)
src/sound.cpp
--- a/src/sound.cpp	Mon Feb 18 23:37:16 2008 +0000
+++ b/src/sound.cpp	Tue Feb 19 17:45:30 2008 +0000
@@ -241,7 +241,8 @@
 	/* 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);