Skip to content

Commit d13ede6

Browse files
committed
Allow projectiles to go through terrain again.
Reverts part of 08f9fa5. Closes #2386.
1 parent a8fb8be commit d13ede6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/map.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,10 @@ extern BOOL mapObjIsAboveGround( BASE_OBJECT *psObj )
587587
tileY = map_coord(psObj->pos.y),
588588
tileYOffset1 = (tileY * mapWidth),
589589
tileYOffset2 = ((tileY+1) * mapWidth),
590-
h1 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset1 + tileX) ].height * ELEVATION_SCALE,
591-
h2 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset1 + tileX + 1)].height * ELEVATION_SCALE,
592-
h3 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset2 + tileX) ].height * ELEVATION_SCALE,
593-
h4 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset2 + tileX + 1)].height * ELEVATION_SCALE;
590+
h1 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset1 + tileX) ].height,
591+
h2 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset1 + tileX + 1)].height,
592+
h3 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset2 + tileX) ].height,
593+
h4 = psMapTiles[MIN(mapWidth * mapHeight, tileYOffset2 + tileX + 1)].height;
594594

595595
/* trivial test above */
596596
if ( (psObj->pos.z > h1) && (psObj->pos.z > h2) &&

0 commit comments

Comments
 (0)