X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=cba96c630a3a271f6f533a1a43c916785664fb50;hb=981037c01006b8a8bea65b69a75ba9f7353b295d;hp=c6ea4963f5a52f1bb5c080c11f5322dbeab820bc;hpb=faef8ad22cbb1b4375647136c9ddca6705a8e21f;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index c6ea496..cba96c6 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -124,7 +124,6 @@ procedure GameCVars(P: SArray); procedure GameCommands(P: SArray); procedure GameCheats(P: SArray); procedure DebugCommands(P: SArray); -procedure ProfilerCommands(P: SArray); procedure g_Game_Process_Params; procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean); procedure g_Game_StepLoading(); @@ -316,10 +315,14 @@ var g_profile_los: Boolean = false; g_profile_history_size: Integer = 1000; + procedure g_ResetDynlights (); procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single); procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single); +function conIsCheatsEnabled (): Boolean; + + implementation uses @@ -329,7 +332,17 @@ uses g_triggers, MAPDEF, g_monsters, e_sound, CONFIG, BinEditor, g_language, g_net, SDL, ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt, - utils, sfs; + utils, sfs, g_holmes; + + +// ////////////////////////////////////////////////////////////////////////// // +function conIsCheatsEnabled (): Boolean; +begin + result := false; + if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and + (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then exit; + result := true; +end; // ////////////////////////////////////////////////////////////////////////// // @@ -438,7 +451,8 @@ begin 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 @@ -766,6 +780,11 @@ begin if gPlayer2 <> nil then gPlayer2.GodMode := False; if gPlayer1 <> nil then gPlayer1.NoTarget := False; if gPlayer2 <> nil then gPlayer2.NoTarget := False; + + {$IF DEFINED(D2F_DEBUG)} + if gPlayer1 <> nil then gPlayer1.NoTarget := True; + gAimLine := true; + {$ENDIF} end; procedure g_Game_ExecuteEvent(Name: String); @@ -964,6 +983,17 @@ begin 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; @@ -993,6 +1023,8 @@ begin 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; @@ -2848,8 +2880,19 @@ begin if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X; if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y; - if gMapInfo.Width <= gPlayerScreenSize.X then a := 0; - if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0; + if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0 + else if (gMapInfo.Width < gPlayerScreenSize.X) then + begin + // hcenter + a := (gPlayerScreenSize.X-gMapInfo.Width) div 2; + end; + + if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0 + else if (gMapInfo.Height < gPlayerScreenSize.Y) then + begin + // vcenter + b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2; + end; if p.IncCam <> 0 then begin @@ -2895,6 +2938,16 @@ begin //glTranslatef(a, b+p.IncCam, 0); + p.viewPortX := sX; + p.viewPortY := sY; + p.viewPortW := sWidth; + p.viewPortH := sHeight; + + if (p = gPlayer1) then + begin + g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH); + end; + renderMapInternal(-c, -d, a, b+p.IncCam, true); if p.FSpectator then @@ -3143,7 +3196,8 @@ begin 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), @@ -3161,11 +3215,16 @@ begin 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 @@ -3186,13 +3245,18 @@ 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'; @@ -3205,7 +3269,10 @@ begin 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; @@ -3221,7 +3288,10 @@ begin 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 @@ -3229,7 +3299,8 @@ begin 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; @@ -3238,10 +3309,16 @@ begin 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; + // draw inspector + if (g_holmes_enabled) then g_Holmes_Draw(); + g_Console_Draw(); if g_debug_Sounds and gGameOn then @@ -3258,9 +3335,7 @@ begin 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; @@ -4932,52 +5007,6 @@ begin end; end; -// profiler console commands -procedure ProfilerCommands (P: SArray); -var - cmd: string; - - function getBool (idx: Integer): Integer; - begin - if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end; - result := 0; - if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1; - end; - - procedure binaryFlag (var flag: Boolean; msg: string); - begin - if (Length(p) > 2) then - begin - g_Console_Add('too many arguments to '''+P[0]+''''); - end - else - begin - case getBool(1) of - -1: begin end; - 0: flag := false; - 1: flag := true; - end; - if flag then g_Console_Add(msg+': tan') else g_Console_Add(msg+': ona'); - end; - end; - -begin - //if not gDebugMode then exit; - cmd := LowerCase(P[0]); - - if (cmd = 'pf_draw_frame') then begin binaryFlag(g_profile_frame_draw, 'render profiles'); exit; end; - if (cmd = 'pf_update_frame') then begin binaryFlag(g_profile_frame_update, 'update profiles (not yet)'); exit; end; - if (cmd = 'pf_coldet') then begin binaryFlag(g_profile_collision, 'coldet profiles'); exit; end; - if (cmd = 'pf_los') then begin binaryFlag(g_profile_los, 'monster LOS profiles'); exit; end; - if (cmd = 'r_sq_draw') then begin binaryFlag(gdbg_map_use_accel_render, 'accelerated rendering'); exit; end; - if (cmd = 'cd_sq_enabled') then begin binaryFlag(gdbg_map_use_accel_coldet, 'accelerated map coldet'); exit; end; - if (cmd = 'mon_sq_enabled') then begin binaryFlag(gmon_debug_use_sqaccel, 'accelerated monster coldet'); exit; end; - if (cmd = 'wtrace_sq_enabled') then begin binaryFlag(gwep_debug_fast_trace, 'accelerated weapon hitscan'); exit; end; - if (cmd = 'pr_enabled') then begin binaryFlag(gpart_dbg_enabled, 'particles'); exit; end; - if (cmd = 'pr_phys_enabled') then begin binaryFlag(gpart_dbg_phys_enabled, 'particle physics'); exit; end; - if (cmd = 'los_enabled') then begin binaryFlag(gmon_dbg_los_enabled, 'LOS calculations'); exit; end; -end; - procedure DebugCommands(P: SArray); var @@ -6959,4 +6988,22 @@ begin SetLength(pars, 0); end; +begin + conRegVar('pf_draw_frame', @g_profile_frame_draw, 'draw frame rendering profiles', 'render profiles'); + //conRegVar('pf_update_frame', @g_profile_frame_update, 'draw frame updating profiles', 'update profiles'); + conRegVar('pf_coldet', @g_profile_collision, 'draw collision detection profiles', 'coldet profiles'); + conRegVar('pf_los', @g_profile_los, 'draw monster LOS profiles', 'monster LOS profiles'); + + conRegVar('r_sq_draw', @gdbg_map_use_accel_render, 'accelerated spatial queries in rendering', 'accelerated rendering'); + conRegVar('cd_sq_enabled', @gdbg_map_use_accel_coldet, 'accelerated spatial queries in map coldet', 'accelerated map coldet'); + conRegVar('mon_sq_enabled', @gmon_debug_use_sqaccel, 'accelerated spatial queries for monsters', 'accelerated monster coldet'); + conRegVar('wtrace_sq_enabled', @gwep_debug_fast_trace, 'accelerated spatial queries for weapon hitscan trace', 'accelerated weapon hitscan'); + + conRegVar('pr_enabled', @gpart_dbg_enabled, 'enable/disable particles', 'particles'); + conRegVar('pr_phys_enabled', @gpart_dbg_phys_enabled, 'enable/disable particle physics', 'particle physics'); + + conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true); + conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true); + + conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true); end.