diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index f696accdf385baf3a40b56daa97ac22f6f8e678a..7e20f0962af8e18c463e556ec3a9443ba9d9a668 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
sfs, wadreader, g_holmes;
+var
+ hasPBarGfx: Boolean = false;
+
+
// ////////////////////////////////////////////////////////////////////////// //
function gPause (): Boolean; inline; begin result := gPauseMain or gPauseHolmes; end;
ShowCount: Integer;
Msgs: Array of String;
NextMsg: Word;
+ PBarWasHere: Boolean; // did we draw a progress bar for this message?
end;
TParamStrValue = record
Exit;
end;
-// ×èòàåì êëàâèàòóðó è äæîéñòèê, åñëè îêíî àêòèâíî:
- e_PollInput();
+ // ×èòàåì êëàâèàòóðó è äæîéñòèê, åñëè îêíî àêòèâíî
+ // no need to, as we'll do it in event handler
// Îáíîâëÿåì êîíñîëü (äâèæåíèå è ñîîáùåíèÿ):
g_Console_Update();
end;
procedure g_Game_LoadData();
+var
+ wl, hl: Integer;
+ wr, hr: Integer;
+ wb, hb: Integer;
+ wm, hm: Integer;
begin
if DataLoaded then Exit;
g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDJET', GameWAD+':TEXTURES\JETBAR');
g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDBG', GameWAD+':TEXTURES\HUDBG');
g_Texture_CreateWADEx('TEXTURE_PLAYER_ARMORHUD', GameWAD+':TEXTURES\ARMORHUD');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG', GameWAD+':TEXTURES\FLAGHUD_RB', GameWAD+':TEXTURES\FLAGHUD_R_BASE');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_RS', GameWAD+':TEXTURES\FLAGHUD_R_STOLEN');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_RD', GameWAD+':TEXTURES\FLAGHUD_R_DROP');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_BB', GameWAD+':TEXTURES\FLAGHUD_B_BASE');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_BS', GameWAD+':TEXTURES\FLAGHUD_B_STOLEN');
- g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_BD', GameWAD+':TEXTURES\FLAGHUD_B_DROP');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG', GameWAD+':TEXTURES\FLAGHUD_R_BASE');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_R_STOLEN');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_R_DROP');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_B_BASE');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_B_STOLEN');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_B_DROP');
g_Texture_CreateWADEx('TEXTURE_PLAYER_TALKBUBBLE', GameWAD+':TEXTURES\TALKBUBBLE');
g_Texture_CreateWADEx('TEXTURE_PLAYER_INVULPENTA', GameWAD+':TEXTURES\PENTA');
+
+ hasPBarGfx := true;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_LEFT', GameWAD+':TEXTURES\LLEFT') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_MARKER', GameWAD+':TEXTURES\LMARKER') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_MIDDLE', GameWAD+':TEXTURES\LMIDDLE') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_RIGHT', GameWAD+':TEXTURES\LRIGHT') then hasPBarGfx := false;
+
+ if hasPBarGfx then
+ begin
+ g_Texture_GetSize('UI_GFX_PBAR_LEFT', wl, hl);
+ g_Texture_GetSize('UI_GFX_PBAR_RIGHT', wr, hr);
+ g_Texture_GetSize('UI_GFX_PBAR_MIDDLE', wb, hb);
+ g_Texture_GetSize('UI_GFX_PBAR_MARKER', wm, hm);
+ if (wl > 0) and (hl > 0) and (wr > 0) and (hr = hl) and (wb > 0) and (hb = hl) and (wm > 0) and (hm > 0) and (hm <= hl) then
+ begin
+ // yay!
+ end
+ else
+ begin
+ hasPBarGfx := false;
+ end;
+ end;
+
g_Frames_CreateWAD(nil, 'FRAMES_TELEPORT', GameWAD+':TEXTURES\TELEPORT', 64, 64, 10, False);
g_Sound_CreateWADEx('SOUND_GAME_TELEPORT', GameWAD+':SOUNDS\TELEPORT');
g_Sound_CreateWADEx('SOUND_GAME_NOTELEPORT', GameWAD+':SOUNDS\NOTELEPORT');
begin
e_TextureFontGetSize(gStdFont, ww2, hh2);
- e_PollInput();
+ g_ProcessMessages();
+
if e_KeyPressed(IK_TAB) then
begin
if not gStatsPressed then
end;
procedure DrawLoadingStat();
+ procedure drawRect (x, y, w, h: Integer);
+ begin
+ if (w < 1) or (h < 1) then exit;
+ glBegin(GL_QUADS);
+ glVertex2f(x+0.375, y+0.375);
+ glVertex2f(x+w+0.375, y+0.375);
+ glVertex2f(x+w+0.375, y+h+0.375);
+ glVertex2f(x+0.375, y+h+0.375);
+ glEnd();
+ end;
+
+ function drawPBar (cur, total: Integer; washere: Boolean): Boolean;
+ var
+ rectW, rectH: Integer;
+ x0, y0: Integer;
+ wdt: Integer;
+ wl, hl: Integer;
+ wr, hr: Integer;
+ wb, hb: Integer;
+ wm, hm: Integer;
+ idl, idr, idb, idm: LongWord;
+ f, my: Integer;
+ begin
+ result := false;
+ if (total < 1) then exit;
+ if (cur < 1) then exit; // don't blink
+ if (not washere) and (cur >= total) then exit; // don't blink
+ //if (cur < 0) then cur := 0;
+ //if (cur > total) then cur := total;
+ result := true;
+
+ if (hasPBarGfx) then
+ begin
+ g_Texture_Get('UI_GFX_PBAR_LEFT', idl);
+ g_Texture_GetSize('UI_GFX_PBAR_LEFT', wl, hl);
+ g_Texture_Get('UI_GFX_PBAR_RIGHT', idr);
+ g_Texture_GetSize('UI_GFX_PBAR_RIGHT', wr, hr);
+ g_Texture_Get('UI_GFX_PBAR_MIDDLE', idb);
+ g_Texture_GetSize('UI_GFX_PBAR_MIDDLE', wb, hb);
+ g_Texture_Get('UI_GFX_PBAR_MARKER', idm);
+ g_Texture_GetSize('UI_GFX_PBAR_MARKER', wm, hm);
+
+ rectW := gScreenWidth-64;
+ rectH := hl;
+
+ x0 := (gScreenWidth-rectW) div 2;
+ y0 := gScreenHeight-rectH-64;
+ if (y0 < 2) then y0 := 2;
+
+ glEnable(GL_SCISSOR_TEST);
+
+ // left and right
+ glScissor(x0, gScreenHeight-y0-rectH, rectW, rectH);
+ e_DrawSize(idl, x0, y0, 0, true, false, wl, hl);
+ e_DrawSize(idr, x0+rectW-wr, y0, 0, true, false, wr, hr);
+
+ // body
+ glScissor(x0+wl, gScreenHeight-y0-rectH, rectW-wl-wr, rectH);
+ f := x0+wl;
+ while (f < x0+rectW) do
+ begin
+ e_DrawSize(idb, f, y0, 0, true, false, wb, hb);
+ f += wb;
+ end;
+
+ // filled part
+ wdt := (rectW-wl-wr)*cur div total;
+ if (wdt > rectW-wl-wr) then wdt := rectW-wr-wr;
+ if (wdt > 0) then
+ begin
+ my := y0+(rectH-wm) div 2;
+ glScissor(x0+wl, gScreenHeight-my-rectH, wdt, hm);
+ f := x0+wl;
+ while (wdt > 0) do
+ begin
+ e_DrawSize(idm, f, y0, 0, true, false, wm, hm);
+ f += wm;
+ wdt -= wm;
+ end;
+ end;
+
+ glScissor(0, 0, gScreenWidth, gScreenHeight);
+
+{
+procedure e_DrawSize(ID: DWORD; X, Y: Integer; Alpha: Byte; AlphaChannel: Boolean;
+ Blending: Boolean; Width, Height: Word; Mirror: TMirrorType = TMirrorType.None);
+ if g_Texture_Get('MENU_BACKGROUND', ID) then e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
+ else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+}
+ end
+ else
+ begin
+ rectW := gScreenWidth-64;
+ rectH := 16;
+
+ x0 := (gScreenWidth-rectW) div 2;
+ y0 := gScreenHeight-rectH-64;
+ if (y0 < 2) then y0 := 2;
+
+ glDisable(GL_BLEND);
+ glDisable(GL_TEXTURE_2D);
+
+ //glClearColor(0, 0, 0, 0);
+ //glClear(GL_COLOR_BUFFER_BIT);
+
+ glColor4ub(127, 127, 127, 255);
+ drawRect(x0-2, y0-2, rectW+4, rectH+4);
+
+ glColor4ub(0, 0, 0, 255);
+ drawRect(x0-1, y0-1, rectW+2, rectH+2);
+
+ glColor4ub(127, 127, 127, 255);
+ wdt := rectW*cur div total;
+ if (wdt > rectW) then wdt := rectW;
+ drawRect(x0, y0, wdt, rectH);
+ end;
+ end;
+
var
ww, hh: Word;
xx, yy, i: Integer;
s: String;
begin
- if Length(LoadingStat.Msgs) = 0 then
- Exit;
+ if (Length(LoadingStat.Msgs) = 0) then exit;
e_CharFont_GetSize(gMenuFont, _lc[I_MENU_LOADING], ww, hh);
yy := (gScreenHeight div 3);
xx := (gScreenWidth div 3);
with LoadingStat do
+ begin
for i := 0 to NextMsg-1 do
- begin
- if (i = (NextMsg-1)) and (MaxValue > 0) then
- s := Format('%s: %d/%d', [Msgs[i], CurValue, MaxValue])
- else
- s := Msgs[i];
+ begin
+ if (i = (NextMsg-1)) and (MaxValue > 0) then
+ s := Format('%s: %d/%d', [Msgs[i], CurValue, MaxValue])
+ else
+ s := Msgs[i];
- e_CharFont_PrintEx(gMenuSmallFont, xx, yy, s, _RGB(255, 0, 0));
- yy := yy + LOADING_INTERLINE;
- end;
+ e_CharFont_PrintEx(gMenuSmallFont, xx, yy, s, _RGB(255, 0, 0));
+ yy := yy + LOADING_INTERLINE;
+ PBarWasHere := drawPBar(CurValue, MaxValue, PBarWasHere);
+ end;
+ end;
end;
procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
procedure g_Game_StartSingle(Map: String; TwoPlayers: Boolean; nPlayers: Byte);
var
i, nPl: Integer;
+ tmps: AnsiString;
begin
g_Game_Free();
// Çàãðóçêà è çàïóñê êàðòû:
if not g_Game_StartMap(MAP, True) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + MAP]));
+ if (Pos(':\', Map) > 0) or (Pos(':/', Map) > 0) then tmps := Map else tmps := gGameSettings.WAD + ':\' + MAP;
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [tmps]));
Exit;
end;
enet_packet_destroy(NetEvent.packet);
end
else
+ begin
if (NetEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
begin
State := 0;
OuterLoop := False;
Break;
end;
+ end;
end;
ProcessLoading(true);
- e_PollInput();
-
if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) then
begin
State := 0;
if P[2] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[2])]));
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[2]), P[1]]));
end else
g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
end
if P[4] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[3]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[4])]));
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[4]), P[3]]));
end else
g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]));
end
g_Game_ChangeMap(s);
end else
begin
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
// Òàêîé êàðòû íåò, èùåì WAD ôàéë
P[1] := addWadExtension(P[1]);
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
if FileExists(MapsDir + P[1]) then
begin
// Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
nm := True;
end else
begin
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
// Òàêîé êàðòû íåò, èùåì WAD ôàéë
P[1] := addWadExtension(P[1]);
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
if FileExists(MapsDir + P[1]) then
begin
// Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
CurValue := 0;
MaxValue := Max;
ShowCount := 0;
+ PBarWasHere := false;
end;
g_ActiveWindow := nil;
for len := Low(Msgs) to High(Msgs) do
Msgs[len] := '';
NextMsg := 0;
+ PBarWasHere := false;
end;
end;
if (s <> '') then
gMapOnce := True;
+ // Override map to test:
+ s := LowerCase(Find_Param_Value(pars, '-testmap'));
+ if s <> '' then
+ gTestMap := MapsDir + s;
+
// Delete test map after play:
s := Find_Param_Value(pars, '--testdelete');
if (s <> '') then
// Delete temporary WAD after play:
s := Find_Param_Value(pars, '--tempdelete');
- if (s <> '') then
+ if (s <> '') and (gTestMap <> '') then
begin
- gMapToDelete := MapsDir + map;
+ gMapToDelete := gTestMap;
gTempDelete := True;
end;