X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=da2db1b1a8a484e69016a2091ba9af103a9dbf1b;hb=3a6c3884caee5abb903ab88adc172a0fa8edf78b;hp=3e092381baf7ad01f2d84574955e044aaae87d5b;hpb=bff90d671581e556daa820b41bf9c9c2c36f9ca0;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 3e09238..da2db1b 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -4005,13 +4005,8 @@ begin if gState = STATE_ENDPIC then begin ID := DWORD(-1); - if not g_Texture_Get('TEXTURE_endpic', ID) then - g_Texture_Get(_lc[I_TEXTURE_ENDPIC], ID); - - if ID <> DWORD(-1) then - e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight) - else - e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); + if g_Texture_Get('TEXTURE_endpic', ID) then DrawMenuBackground('TEXTURE_endpic') + else DrawMenuBackground(_lc[I_TEXTURE_ENDPIC]); if g_ActiveWindow <> nil then begin @@ -7219,6 +7214,7 @@ begin (tgcLocal) and Sound.IsPlaying() then begin +(* if ((gPlayer1 <> nil) and g_CollidePoint(gPlayer1.GameX, gPlayer1.GameY, X, Y, Width, Height)) or ((gPlayer2 <> nil) and g_CollidePoint(gPlayer2.GameX, gPlayer2.GameY, X, Y, Width, Height)) then begin @@ -7226,6 +7222,7 @@ begin Sound.SetVolume(tgcVolume/255.0); end else +*) Sound.SetCoords(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0); end; end;