X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_loadscreen.pas;h=d95d3a475ff26184f36d504676683503269f8157;hb=92cb2a1c5eab5380829b60c0c65b3e7730d76425;hp=bc2f23684ccfc8aaf177570b291adde317a255da;hpb=6dd60afe238e2d7e403568cc286e8f1152b138a0;p=d2df-sdl.git diff --git a/src/game/renders/opengl/r_loadscreen.pas b/src/game/renders/opengl/r_loadscreen.pas index bc2f236..d95d3a4 100644 --- a/src/game/renders/opengl/r_loadscreen.pas +++ b/src/game/renders/opengl/r_loadscreen.pas @@ -31,11 +31,7 @@ interface implementation uses - {$IFDEF USE_GLES1} - GLES11, - {$ELSE} - GL, GLEXT, - {$ENDIF} + {$I ../../../nogl/noGLuses.inc} {$IFDEF ENABLE_SYSTEM} g_system, {$ENDIF} @@ -63,10 +59,10 @@ implementation procedure r_LoadScreen_Load; begin - BarL := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LLEFT'); - BarM := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LMIDDLE'); - BarR := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LRIGHT'); - BarF := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LMARKER'); + BarL := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LLEFT', [TGLHints.txNoRepeat]); + BarM := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LMIDDLE', []); + BarR := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LRIGHT', [TGLHints.txNoRepeat]); + BarF := r_Textures_LoadFromFile(GameWAD + ':TEXTURES/LMARKER', []); end; procedure r_LoadScreen_Free; @@ -142,9 +138,9 @@ implementation xx := gScreenWidth div 3; yy := gScreenHeight div 3; hh := gScreenHeight - yy - 96; - r_Draw_Setup(gScreenWidth, gScreenHeight); + r_Draw_Setup(gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight); glClearColor(0.0, 0.0, 0.0, 0.0); - glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); r_Common_DrawBackground(GameWad + ':TEXTURES/INTER'); r_Draw_FillRect(0, 0, gScreenWidth - 1, gScreenHeight - 1, 0, 0, 0, 105); if menufont <> nil then