diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-21 23:39:51 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-21 23:39:51 +0000 |
| commit | 423bd85aa1ca8051129df388aa2211dfbbe8ec1e (patch) | |
| tree | a997d543841e0e3a5b12b46bb776cdd9dd12956b | |
| parent | e4e3f73db10d345453f2c6d06ae1dc499a4c7404 (diff) | |
| download | mana-423bd85aa1ca8051129df388aa2211dfbbe8ec1e.tar.gz mana-423bd85aa1ca8051129df388aa2211dfbbe8ec1e.tar.bz2 mana-423bd85aa1ca8051129df388aa2211dfbbe8ec1e.tar.xz mana-423bd85aa1ca8051129df388aa2211dfbbe8ec1e.zip | |
Fix opacity of Window titles in OpenGL and scroll areas which broke last commit
| -rw-r--r-- | src/gui/inventory.cpp | 2 | ||||
| -rw-r--r-- | src/resources/image.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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; |