diff --git a/lib/framework/wzapp.cpp b/lib/framework/wzapp.cpp index 07f506abd..c38525712 100644 --- a/lib/framework/wzapp.cpp +++ b/lib/framework/wzapp.cpp @@ -1,4 +1,4 @@ -/* +/* This file is part of Warzone 2100. Copyright (C) 2005-2009 Warzone Resurrection Project @@ -1142,6 +1142,7 @@ void iV_SetTextColour(PIELIGHT colour) void iV_DrawTextRotated(const char* string, float XPos, float YPos, float rotation) { + pie_SetTexturePage(TEXPAGE_FONT); glDisable(GL_CULL_FACE); // hack needed on MacOSX QPainter painter(WzMainWindow::instance()->context()->device()); painter.translate(XPos, YPos); @@ -1149,6 +1150,9 @@ void iV_DrawTextRotated(const char* string, float XPos, float YPos, float rotati painter.setPen(fontColor); painter.drawText(0, 0, QString::fromUtf8(string)); glEnable(GL_CULL_FACE); + + rendStates.rendMode = REND_ALPHA; + pie_SetRendMode(REND_OPAQUE); // beat state machinery into submission } void iV_SetTextSize(float size) diff --git a/lib/ivis_common/piestate.h b/lib/ivis_common/piestate.h index 1d94eabc3..48989e3b4 100644 --- a/lib/ivis_common/piestate.h +++ b/lib/ivis_common/piestate.h @@ -82,7 +82,6 @@ typedef struct RENDER_STATE SDWORD texPage; REND_MODE rendMode; BOOL keyingOn; - TRANSLUCENCY_MODE transMode; } RENDER_STATE; diff --git a/lib/ivis_opengl/piestate.c b/lib/ivis_opengl/piestate.c index 652edcede..db544967b 100644 --- a/lib/ivis_opengl/piestate.c +++ b/lib/ivis_opengl/piestate.c @@ -444,7 +444,6 @@ void pie_SetRendMode(REND_MODE rendMode) switch (rendMode) { case REND_OPAQUE: - rendStates.transMode = TRANS_DECAL; glDisable(GL_BLEND); break;