diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 24f6324b56bc27a00db40c43d9dce0f735cfc26b..cba96c630a3a271f6f533a1a43c916785664fb50 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
if (y < 0) then y := gScreenHeight-(hgt-1)+y;
// background
//e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 255, 255, 255, 200, B_BLEND);
- e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE);
+ //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE);
+ e_DarkenQuadWH(x, y, wdt, hgt, 150);
// title
yy := y+2;
for ii := 0 to High(prof.bars) do
gExit := 0;
end;
+procedure drawTime(X, Y: Integer); inline;
+begin
+ e_TextureFontPrint(x, y,
+ Format('%d:%.2d:%.2d', [
+ gTime div 1000 div 3600,
+ (gTime div 1000 div 60) mod 60,
+ gTime div 1000 mod 60
+ ]),
+ gStdFont);
+end;
+
procedure DrawStat();
var
pc, x, y, w, h: Integer;
e_DrawFillQuad(x, y, x+w-1, y+h-1, 64, 64, 64, 32);
e_DrawQuad(x, y, x+w-1, y+h-1, 255, 127, 0);
+ drawTime(x+w-78, y+8);
+
wad := g_ExtractWadNameNoPath(gMapInfo.Map);
map := g_ExtractFileName(gMapInfo.Map);
mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name;
if gPause and gGameOn and (g_ActiveWindow = nil) then
begin
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
e_CharFont_GetSize(gMenuFont, _lc[I_MENU_PAUSE], w, h);
e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(w div 2),
else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
if g_ActiveWindow <> nil then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ begin
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ end;
end;
if gState = STATE_FOLD then
+ begin
e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter);
+ end;
if gState = STATE_INTERCUSTOM then
begin
DrawCustomStat();
if g_ActiveWindow <> nil then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ begin
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ end;
end;
if gState = STATE_INTERSINGLE then
begin
if EndingGameCounter > 0 then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter)
+ begin
+ e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter);
+ end
else
begin
back := 'INTER';
DrawSingleStat();
if g_ActiveWindow <> nil then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ begin
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ end;
end;
end;
e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
if g_ActiveWindow <> nil then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ begin
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ end;
end;
if gState = STATE_SLIST then
if g_Texture_Get('MENU_BACKGROUND', ID) then
begin
e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight);
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
end;
g_Serverlist_Draw(slCurrent);
end;
if g_ActiveWindow <> nil then
begin
if gGameOn then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ begin
+ //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ end;
g_ActiveWindow.Draw();
end;
end;
if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then
- e_TextureFontPrint(gScreenWidth-72, 0,
- Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
- gStdFont);
+ drawTime(gScreenWidth-72, gScreenHeight-16);
if gGameOn then drawProfilers();
end;