Tile transparency in water without overlays.

In order for jpeg's waves to work on deep water as well as shallow, we
need to not use partially transparent overlays to simulate an actor or an
item being submerged.  Now, non-flying objects on water will be drawn
transparently to blend with the water below.  This should mostly look the
same, except it will now work on top of waves and will not require a mask
for each water type.

As a nice side-effect, ghosts are now transparent again and the water on
top of submerged objects now animates properly.

See the comments in tilebuf.cc for details.  The mask tile itself can be
adjusted to change the water level, but the parameters to
SubmergedTileBuffer will need to be changed to compensate depending on
what the new art looks like.

1 files changed, 0 insertions, 25 deletions

diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h
index 993de5c302..8e0812e35a 100644
--- a/crawl-ref/source/tilesdl.h
+++ b/crawl-ref/source/tilesdl.h
@@ -11,24 +11,6 @@
 #include "externs.h"
 #include "tilereg.h"
 
-// This struct defines all of the state that any particular rendering needs.
-// If other rendering states are needed, they should be added here so that
-// they do not introduce unneeded side effects for other parts of the code
-// that have not thought about turning that new state off.
-struct GLState
-{
-    GLState();
-
-    // vertex arrays
-    bool array_vertex;
-    bool array_texcoord;
-    bool array_colour;
-
-    // render state
-    bool blend;
-    bool texture;
-};
-
 enum key_mod
 {
     MOD_SHIFT = 0x1,
@@ -68,13 +50,6 @@ struct MouseEvent
     unsigned int py;
 };
 
-class GLStateManager
-{
-public:
-    static void init();
-    static void set(const GLState& state);
-};
-
 class SDL_Surface;
 class FTFont;