X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=8c4b111d40c6607549ed3c9d29d84dc7d49da04f;hb=5af73370d6483479ea1d7c997878188fa3d47c1c;hp=ae7c7b49e67e8c629b8fa7a2f28772048e3c5339;hpb=e540bbf4ebb46a3c4b3ae2fd69ba64a149189a32;p=d2df-sdl.git diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index ae7c7b4..8c4b111 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -102,7 +102,7 @@ implementation uses SysUtils, Classes, GL, SDL2, - MAPDEF, g_options, utils, hashtable, xparser; + MAPDEF, g_main, g_options, utils, hashtable, xparser; var @@ -927,6 +927,7 @@ begin glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph); glPushMatrix(); + if g_dbg_scale_05 then glScalef(0.5, 0.5, 1.0); glTranslatef(-vpx, -vpy, 0); if (showGrid) then drawTileGrid(); @@ -1034,6 +1035,7 @@ end; // ////////////////////////////////////////////////////////////////////////// // procedure g_Holmes_Draw (); begin + {$IF not DEFINED(HEADLESS)} holmesInitCommands(); holmesInitBinds(); @@ -1047,6 +1049,7 @@ begin begin plrDebugDraw(); end; + {$ENDIF} laserSet := false; end; @@ -1054,8 +1057,10 @@ end; procedure g_Holmes_DrawUI (); begin + {$IF not DEFINED(HEADLESS)} uiDraw(); drawCursor(); + {$ENDIF} end; @@ -1206,7 +1211,7 @@ begin // load bindings from file try - st := openDiskFileRO('holmes.rc'); + st := openDiskFileRO(GameDir+'holmes.rc'); pr := TFileTextParser.Create(st); conwriteln('parsing "holmes.rc"...'); while (pr.tokType <> pr.TTEOF) do