summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilebuf.h
diff options
context:
space:
mode:
authorEnne Walker <enne.walker@gmail.com>2010-05-14 18:07:48 -0400
committerEnne Walker <enne.walker@gmail.com>2010-05-14 18:18:55 -0400
commit451ecf4a58b193f3fb14b78108757ed6b91152fe (patch)
treec6d64aa81bb9e1ba0baed05a8331940f5b39cde8 /crawl-ref/source/tilebuf.h
parent41576b825cdd678e29b26753a438f55a48b5c8f9 (diff)
downloadcrawl-ref-451ecf4a58b193f3fb14b78108757ed6b91152fe.tar.gz
crawl-ref-451ecf4a58b193f3fb14b78108757ed6b91152fe.zip
Remove "better water transparency" option.
The amount of code complexity to draw ~6 extra transparent pixels isn't really worth it. Also, the fact that it can't be turned on by default due to bad OpenGL drivers means that few people are likely using it.
Diffstat (limited to 'crawl-ref/source/tilebuf.h')
-rw-r--r--crawl-ref/source/tilebuf.h23
1 files changed, 2 insertions, 21 deletions
diff --git a/crawl-ref/source/tilebuf.h b/crawl-ref/source/tilebuf.h
index 5cd0e4fec3..dbba0b9f0f 100644
--- a/crawl-ref/source/tilebuf.h
+++ b/crawl-ref/source/tilebuf.h
@@ -33,7 +33,6 @@ public:
unsigned int size() const;
// State Manipulation
- void set_state(const GLState &state);
void add_primitive(const GLWPrim &rect);
void clear();
@@ -86,19 +85,7 @@ public:
class SubmergedTileBuffer
{
public:
- // mask_idx is the tile index in tex of the mask texture
- // It should be opaque white for water and fully transparent above.
- //
- // above_max is the maximum height (from the top of the tile) where
- // there are still pixels above water.
- //
- // below_min is the minimum height (from the top of the tile) where
- // there are still pixels below water.
- //
- // All heights are from 0 (top of the tile) to TILE_Y-1 (bottom of the tile)
- SubmergedTileBuffer(const TilesTexture *tex,
- int mask_idx, int above_max, int below_min,
- bool better_transparency);
+ SubmergedTileBuffer(const TilesTexture *tex, int water_level);
void add(int idx, int x, int y, int z = 0, bool submerged = false,
bool ghost = false, int ox = 0, int oy = 0, int ymax = -1);
@@ -107,15 +94,9 @@ public:
void clear();
protected:
- int m_mask_idx;
- int m_above_max;
- int m_below_min;
-
- int m_max_z;
- bool m_better_trans;
+ int m_water_level;
ColouredTileBuffer m_below_water;
- ColouredTileBuffer m_mask;
ColouredTileBuffer m_above_water;
};