Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply r10801 

"qt branch: Fix handling of custom textures for backdrops without our internal state machine getting all confused."


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10816 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2010-05-16 01:54:27 +00:00 committed by Git SVN Gateway
parent 10c42fbef0
commit d9b06f4546
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ivis_opengl/screen.c
View File

@ -214,7 +214,7 @@ void screen_SetBackDropFromFile(const char* filename)
// Make sure the current texture page is reloaded after we are finished
// Otherwise WZ will think it is still loaded and not load it again
pie_SetTexturePage(TEXPAGE_NONE);
pie_SetTexturePage(TEXPAGE_FONT);
if( strcmp(extension,".png") == 0 )
{
@ -291,9 +291,8 @@ void screen_Upload(const char *newBackDropBmp)
// Make sure the current texture page is reloaded after we are finished
// Otherwise WZ will think it is still loaded and not load it again
pie_SetTexturePage(TEXPAGE_NONE);
pie_SetTexturePage(TEXPAGE_FONT);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, backDropTexture);
glColor3f(1, 1, 1);