X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=eaccccca74e1523f2ecabebfd34367f9a8f64ef0;hb=313f52c372a4fe70cdfb3fdfaf845b95e05be9d4;hp=97a59594020df6b53b7f4a6371af572becb4e2c5;hpb=8c90efc38cb9e8c9f728280138dd86820a502888;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 97a5959..eaccccc 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -22,7 +22,7 @@ uses SysUtils, Classes, MAPDEF, g_basic, g_player, e_graphics, g_res_downloader, - g_sound, g_gui, wadreader, md5, xprofiler; + g_sound, g_gui, utils, md5, xprofiler; type TGameSettings = record @@ -123,10 +123,10 @@ procedure g_FatalError(Text: String); procedure g_SimpleError(Text: String); function g_Game_IsTestMap(): Boolean; procedure g_Game_DeleteTestMap(); -procedure GameCVars(P: SArray); -procedure GameCommands(P: SArray); -procedure GameCheats(P: SArray); -procedure DebugCommands(P: SArray); +procedure GameCVars(P: SSArray); +procedure GameCommands(P: SSArray); +procedure GameCheats(P: SSArray); +procedure DebugCommands(P: SSArray); procedure g_Game_Process_Params; procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean); procedure g_Game_StepLoading(); @@ -346,7 +346,7 @@ uses g_triggers, g_monsters, e_sound, CONFIG, g_language, g_net, SDL, ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt, - utils, sfs, g_holmes; + sfs, wadreader, g_holmes; // ////////////////////////////////////////////////////////////////////////// // @@ -540,7 +540,7 @@ var EndingGameCounter: Byte = 0; MessageText: String; MessageTime: Word; - MapList: SArray = nil; + MapList: SSArray = nil; MapIndex: Integer = -1; MegaWAD: record info: TMegaWADInfo; @@ -563,7 +563,7 @@ var end; //InterPic: String; InterText: record - lines: SArray; + lines: SSArray; img: String; cur_line: Integer; cur_char: Integer; @@ -2503,13 +2503,60 @@ begin 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; + + procedure drawPBar (cur, total: Integer); + var + rectW, rectH: Integer; + x0, y0: Integer; + wdt: Integer; + begin + if (total < 1) then exit; + if (cur < 1) then exit; // don't blink + if (cur >= total) then exit; // don't blink + //if (cur < 0) then cur := 0; + //if (cur > total) then cur := total; + + 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; + 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); @@ -2517,16 +2564,19 @@ begin 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; + drawPBar(CurValue, MaxValue); + end; + end; end; procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect); @@ -4603,7 +4653,7 @@ var WadName: string; { WAD: TWADFile; - MapList: SArray; + MapList: SSArray; time: Integer; } begin @@ -4656,7 +4706,7 @@ begin if gTempDelete then DeleteFile(WadName); end; -procedure GameCVars(P: SArray); +procedure GameCVars(P: SSArray); var a, b: Integer; stat: TPlayerStatArray; @@ -5203,7 +5253,7 @@ begin e_LogWriteLn ('^=======================^'); end; -procedure DebugCommands(P: SArray); +procedure DebugCommands(P: SSArray); var a, b: Integer; cmd: string; @@ -5339,7 +5389,7 @@ begin end; -procedure GameCheats(P: SArray); +procedure GameCheats(P: SSArray); var cmd: string; f, a: Integer; @@ -5554,7 +5604,7 @@ begin end; end; -procedure GameCommands(P: SArray); +procedure GameCommands(P: SSArray); var a, b: Integer; s, pw: String; @@ -6008,7 +6058,7 @@ begin 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 @@ -6062,7 +6112,7 @@ begin 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 @@ -6096,9 +6146,9 @@ begin 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 // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà @@ -6185,9 +6235,9 @@ 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 // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà