Skip to content

Commit 663bc6d

Browse files
committed
Revert "Add a define for SMALL_CLIFFS."
This reverts commit 1864dce. Source comments were wrong, this not only has a impact on cliffs, it also controls water as well.
1 parent eea0d02 commit 663bc6d

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

‎src/map.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ MAPTILE *psMapTiles = NULL;
111111

112112
#define WATER_DEPTH 180
113113

114-
// Enable the below define to render cliffs that are small, and otherwise wouldn't show up.
115-
//#define SMALL_CLIFFS
116-
117114
static void SetGroundForTile(const char *filename, const char *nametype);
118115
static int getTextureType(const char *textureType);
119116
static BOOL hasDecals(int i, int j);
@@ -608,8 +605,9 @@ static int determineGroundType(int x, int y, const char *tileset)
608605

609606
votes[i][j] = 0;
610607

611-
#ifdef SMALL_CLIFFS
612-
// cliffs are so small they won't show up otherwise
608+
// This controls the way cliffs look, and also plays a role with water
609+
// FIXME: The current way this is done, we don't have control over how well defined the area
610+
// in question behaves. You lose definition between what is passable and what is impassable.
613611
if (urban)
614612
{
615613
if (ground[i][j] == getTextureType("u_cliff"))
@@ -625,7 +623,6 @@ static int determineGroundType(int x, int y, const char *tileset)
625623
if (ground[i][j] == getTextureType("r_cliff"))
626624
return ground[i][j];
627625
}
628-
#endif
629626
}
630627
}
631628

0 commit comments

Comments
 (0)