diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 833baf5d45d6cd544cf5f3d86af065869779b715..02a46f2c4ab9cb90ae13a484b6b08ca7a590770f 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
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
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
end;
// draw inspector
- g_Holmes_Draw();
+ if (g_holmes_enabled) then g_Holmes_Draw();
g_Console_Draw();
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;
+
+ 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;
+
if (cmd = 'mon_think') then begin binaryFlag(gmon_debug_think, 'monster thinking'); exit; end;
+ if (cmd = 'dbg_holmes') then begin binaryFlag(g_holmes_enabled, 'Holmes'); exit; end;
end;