diff --git a/src/client/gui/Gui.cpp b/src/client/gui/Gui.cpp index 8df59f0..0c5646e 100755 --- a/src/client/gui/Gui.cpp +++ b/src/client/gui/Gui.cpp @@ -1035,7 +1035,10 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC } void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) { - glColor4f2(1, 1, 1, .5); + glColor4f2(1, 1, 1, 1); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + minecraft->textures->loadAndBindTexture("gui/gui.png"); Inventory* inventory = minecraft->player->inventory; diff --git a/src/world/level/tile/FireTile.h b/src/world/level/tile/FireTile.h index 5dab2f0..577db4b 100755 --- a/src/world/level/tile/FireTile.h +++ b/src/world/level/tile/FireTile.h @@ -131,6 +131,10 @@ public: return false; } + int getRenderLayer() { + return Tile::RENDERLAYER_ALPHATEST; + } + bool canBurn(LevelSource* level, int x, int y, int z) { return flameOdds[level->getTile(x, y, z)] > 0; }