From 423bd85aa1ca8051129df388aa2211dfbbe8ec1e Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 21 May 2005 23:39:51 +0000 Subject: Fix opacity of Window titles in OpenGL and scroll areas which broke last commit --- src/gui/inventory.cpp | 2 ++ src/resources/image.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src') diff --git a/src/gui/inventory.cpp b/src/gui/inventory.cpp index f73c240e..95cc4bd3 100644 --- a/src/gui/inventory.cpp +++ b/src/gui/inventory.cpp @@ -78,6 +78,8 @@ InventoryWindow::~InventoryWindow() void InventoryWindow::logic() { + Window::logic(); + // It would be nicer if this update could be event based, needs some // redesign of InventoryWindow and ItemContainer probably. updateButtons(); diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 98add234..59745894 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -292,6 +292,7 @@ bool Image::draw(SDL_Surface *screen, int srcX, int srcY, int dstX, int dstY, glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); #endif return true; @@ -435,6 +436,7 @@ bool SubImage::draw(SDL_Surface *screen, int srcX, int srcY, glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); #endif return true; -- cgit v1.2.3-70-g09d2