Skip to content

Commit

Permalink
Remove unused TILE_HILIGHT bits.
Browse files Browse the repository at this point in the history
  • Loading branch information
perim committed Oct 18, 2010
1 parent ceaaaef commit 1f857b4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
12 changes: 0 additions & 12 deletions src/display3d.c
Expand Up @@ -928,18 +928,6 @@ static void drawTiles(iView *player)
// draw skybox
renderSurroundings();

// clear the terrain highlight
for (i = 0; i < visibleTiles.y; i++)
{
for (j = 0; j < visibleTiles.x; j++)
{
if (tileOnMap(playerXTile + j, playerZTile + i))
{
CLEAR_TILE_HIGHLIGHT(mapTile(playerXTile + j, playerZTile + i));
}
}
}

// and prepare for rendering the models
pie_SetRendMode(REND_OPAQUE);
pie_SetAlphaTest(true);
Expand Down
11 changes: 0 additions & 11 deletions src/map.h
Expand Up @@ -68,8 +68,6 @@ typedef enum _terrain_type
#define TILE_ROTMASK 0x3000
#define TILE_ROTSHIFT 12
#define TILE_TRIFLIP 0x0800 // This bit describes the direction the tile is split into 2 triangles (same as triangleFlip)
#define TILE_HILIGHT 0x0400 // set when the tile has the structure cursor over it

#define TILE_NUMMASK 0x01ff


Expand Down Expand Up @@ -164,12 +162,6 @@ static inline bool tileIsExplored(const MAPTILE *psTile)
return psTile->tileExploredBits & (1 << selectedPlayer);
}

/** Check if tile is highlighted by the user. Function is thread-safe. */
static inline bool TileIsHighlighted(const MAPTILE* tile)
{
return tile->texture & TILE_HILIGHT;
}

/** Check if tile is not blocking, even if structure or feature on it */
static inline bool TileIsNotBlocking(const MAPTILE *tile)
{
Expand All @@ -196,9 +188,6 @@ static inline bool TileHasSmallStructure(const MAPTILE* tile)
#define CLEAR_TILE_DECAL(x) ((x)->tileInfoBits &= ~BITS_DECAL)
#define TILE_HAS_DECAL(x) ((x)->tileInfoBits & BITS_DECAL)

#define SET_TILE_HIGHLIGHT(x) ((x)->texture |= TILE_HILIGHT)
#define CLEAR_TILE_HIGHLIGHT(x) ((x)->texture &= ~TILE_HILIGHT)

#define SET_TILE_TALLSTRUCTURE(x) ((x)->tileInfoBits |= BITS_TALLSTRUCTURE)
#define CLEAR_TILE_TALLSTRUCTURE(x) ((x)->tileInfoBits &= ~BITS_TALLSTRUCTURE)

Expand Down

0 comments on commit 1f857b4

Please sign in to comment.