X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=c173bd00312e9686a7e4cb9df0165251e0de4ce4;hp=0ded9ee29d23396011831afa7f8bd08f183dfd68;hb=676995a77ad243efc0abee75841f81e86a7262a0;hpb=26290d9816334b8377531cf8b3e58643444f4d04

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 0ded9ee..c173bd0 100644
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -1,9 +1,8 @@
-(* 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +18,7 @@ unit g_holmes;
 interface
 
 uses
-  {$IFDEF USE_MEMPOOL}mempool,{$ENDIF} geom,
+  mempool, geom,
   e_log, e_input,
   g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters,
   g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx,
@@ -32,8 +31,7 @@ uses
 procedure g_Holmes_Draw ();
 procedure g_Holmes_DrawUI ();
 
-procedure g_Holmes_MouseEvent (var ev: THMouseEvent);
-procedure g_Holmes_KeyEvent (var ev: THKeyEvent);
+procedure g_Holmes_OnEvent (var ev: TFUIEvent);
 
 // hooks for player
 procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer);
@@ -42,19 +40,22 @@ procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
 
 
 var
+  g_holmes_imfunctional: Boolean = false;
   g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
 
 
 implementation
 
 uses
-  {rttiobj,} typinfo, e_texture,
-  SysUtils, Classes, GL, SDL2,
+  {$INCLUDE ../nogl/noGLuses.inc}
+  {rttiobj,} typinfo, e_texture, e_res,
+  SysUtils, Classes, SDL2,
   MAPDEF, g_main, g_options,
   utils, hashtable, xparser;
 
 
 var
+  hlmContext: TGxContext = nil;
   //globalInited: Boolean = false;
   msX: Integer = -666;
   msY: Integer = -666;
@@ -199,7 +200,7 @@ procedure createHelpWindow ();
       box.appendChild(stx);
       // span
       span := TUISpan.Create();
-      span.flDefaultSize := TLaySize.Create(4, 1);
+      span.flDefaultSize := TLaySize.Create(12, 1);
       span.flExpand := true;
       box.appendChild(span);
       // text
@@ -329,6 +330,7 @@ begin
   //winHelp.appendChild(llb);
 
   uiLayoutCtl(winHelp);
+  winHelp.escClose := true;
   winHelp.centerInScreen();
 end;
 
@@ -336,7 +338,7 @@ end;
 procedure winLayersClosed (me: TUIControl); begin showLayersWindow := false; end;
 procedure winOutlinesClosed (me: TUIControl); begin showOutlineWindow := false; end;
 
-procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean);
+procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean; const aid: AnsiString='');
 var
   cb: TUICheckBox;
 begin
@@ -344,6 +346,7 @@ begin
   cb.flExpand := true;
   cb.setVar(pvar);
   cb.text := text;
+  cb.id := aid;
   parent.appendChild(cb);
 end;
 
@@ -359,6 +362,12 @@ begin
 end;
 
 
+procedure actionFillWalls (cb: TUIControl);
+begin
+  TUICheckBox(cb).checked := not TUICheckBox(cb).checked;
+  TUICheckBox(cb.topLevel['cbcontour']).enabled := not TUICheckBox(cb).checked;
+end;
+
 procedure createLayersWindow ();
 var
   box: TUIVBox;
@@ -414,10 +423,12 @@ begin
   box := TUIVBox.Create();
   box.hasFrame := true;
   box.caption := 'options';
-    addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls);
-    addCheckBox(box, 'con~tours', @g_ol_nice);
+    addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls, 'cbfill');
+    addCheckBox(box, 'con~tours', @g_ol_nice, 'cbcontour');
   winOutlines.appendChild(box);
 
+  winOutlines.setActionCBFor('cbfill', actionFillWalls);
+
   uiLayoutCtl(winOutlines);
 end;
 
@@ -477,10 +488,15 @@ end;
 
 procedure toggleHelpWindow (arg: Integer=-1);
 begin
-  if (winHelp = nil) then createHelpWindow();
+  if (winHelp = nil) then
+  begin
+    if (arg = 0) then exit;
+    createHelpWindow();
+  end;
        if (arg < 0) then begin if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp); end
   else if (arg = 0) then begin if uiVisibleWindow(winHelp) then uiRemoveWindow(winHelp); end
-  else begin if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp); end
+  else begin if (not uiVisibleWindow(winHelp)) then uiAddWindow(winHelp); end;
+  if (not uiVisibleWindow(winHelp)) then FreeAndNil(winHelp);
 end;
 
 procedure toggleOptionsWindow (arg: Integer=-1);
@@ -532,16 +548,6 @@ function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+
 function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end;
 
 
-procedure plrDebugMouse (var ev: THMouseEvent);
-begin
-  //e_WriteLog(Format('mouse: x=%d; y=%d; but=%d; bstate=%d', [msx, msy, but, bstate]), MSG_NOTIFY);
-  if (gPlayer1 = nil) or not vpSet then exit;
-  //if (ev.kind <> THMouseEvent.Press) then exit;
-  //e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
-  msbindExecute(ev);
-end;
-
-
 {$IFDEF HOLMES_OLD_OUTLINES}
 var
   edgeBmp: array of Byte = nil;
@@ -553,7 +559,7 @@ var
 
   procedure clearEdgeBmp ();
   begin
-    SetLength(edgeBmp, (gWinSizeX+4)*(gWinSizeY+4));
+    SetLength(edgeBmp, (gScreenWidth+4)*(gScreenHeight+4));
     FillChar(edgeBmp[0], Length(edgeBmp)*sizeof(edgeBmp[0]), 0);
   end;
 
@@ -568,19 +574,19 @@ var
     begin
       sx := pan.X-(vpx-1);
       len := pan.Width;
-      if (len > gWinSizeX+4) then len := gWinSizeX+4;
+      if (len > gScreenWidth+4) then len := gScreenWidth+4;
       if (sx < 0) then begin len += sx; sx := 0; end;
-      if (sx+len > gWinSizeX+4) then len := gWinSizeX+4-sx;
+      if (sx+len > gScreenWidth+4) then len := gScreenWidth+4-sx;
       if (len < 1) then exit;
       assert(sx >= 0);
-      assert(sx+len <= gWinSizeX+4);
+      assert(sx+len <= gScreenWidth+4);
       y0 := pan.Y-(vpy-1);
       y1 := y0+pan.Height;
       if (y0 < 0) then y0 := 0;
-      if (y1 > gWinSizeY+4) then y1 := gWinSizeY+4;
+      if (y1 > gScreenHeight+4) then y1 := gScreenHeight+4;
       while (y0 < y1) do
       begin
-        FillChar(edgeBmp[y0*(gWinSizeX+4)+sx], len*sizeof(edgeBmp[0]), 1);
+        FillChar(edgeBmp[y0*(gScreenWidth+4)+sx], len*sizeof(edgeBmp[0]), 1);
         Inc(y0);
       end;
     end
@@ -645,15 +651,15 @@ var
     glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
     for y := 1 to vph do
     begin
-      a := @edgeBmp[y*(gWinSizeX+4)+1];
+      a := @edgeBmp[y*(gScreenWidth+4)+1];
       startLine(y);
       for x := 1 to vpw do
       begin
         if (a[0] <> 0) then
         begin
-          if (a[-1] = 0) or (a[1] = 0) or (a[-(gWinSizeX+4)] = 0) or (a[gWinSizeX+4] = 0) or
-             (a[-(gWinSizeX+4)-1] = 0) or (a[-(gWinSizeX+4)+1] = 0) or
-             (a[gWinSizeX+4-1] = 0) or (a[gWinSizeX+4+1] = 0) then
+          if (a[-1] = 0) or (a[1] = 0) or (a[-(gScreenWidth+4)] = 0) or (a[gScreenWidth+4] = 0) or
+             (a[-(gScreenWidth+4)-1] = 0) or (a[-(gScreenWidth+4)+1] = 0) or
+             (a[gScreenWidth+4-1] = 0) or (a[gScreenWidth+4+1] = 0) then
           begin
             putPixel(x);
           end;
@@ -678,7 +684,7 @@ var
     glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
     for y := 1 to vph do
     begin
-      a := @edgeBmp[y*(gWinSizeX+4)+1];
+      a := @edgeBmp[y*(gScreenWidth+4)+1];
       startLine(y);
       for x := 1 to vpw do
       begin
@@ -849,6 +855,7 @@ var
     g := ag;
     b := ab;
     if g_ol_nice then clearOliner();
+    hlmContext.color := TGxRGBA.Create(r, g, b);
     for f := 0 to High(parr) do
     begin
       pan := parr[f];
@@ -863,11 +870,11 @@ var
       end;
       if g_ol_fill_walls then
       begin
-        fillRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(r, g, b));
+        hlmContext.fillRect(pan.X, pan.Y, pan.Width, pan.Height);
       end
       else if not g_ol_nice then
       begin
-        drawRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(r, g, b));
+        hlmContext.rect(pan.X, pan.Y, pan.Width, pan.Height);
       end;
     end;
     if g_ol_nice then
@@ -896,14 +903,16 @@ procedure plrDebugDraw ();
   var
     x, y: Integer;
   begin
+    hlmContext.color := TGxRGBA.Create(96, 96, 96);
     for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
     begin
-      drawLine(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize, TGxRGBA.Create(96, 96, 96));
+      hlmContext.line(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize);
     end;
 
+    hlmContext.color := TGxRGBA.Create(96, 96, 96);
     for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
     begin
-      drawLine(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight, TGxRGBA.Create(96, 96, 96));
+      hlmContext.line(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight);
     end;
   end;
 
@@ -911,13 +920,14 @@ procedure plrDebugDraw ();
   var
     x, y: Integer;
   begin
+    hlmContext.color := TGxRGBA.Create(128, 0, 128, 64);
     for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
     begin
       for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
       begin
         if awmIsSetHolmes(x*mapGrid.tileSize+mapGrid.gridX0+1, y*mapGrid.tileSize++mapGrid.gridY0+1) then
         begin
-          fillRect(x*mapGrid.tileSize++mapGrid.gridX0, y*mapGrid.tileSize++mapGrid.gridY0, monsGrid.tileSize, monsGrid.tileSize, TGxRGBA.Create(128, 0, 128, 64));
+          hlmContext.fillRect(x*mapGrid.tileSize++mapGrid.gridX0, y*mapGrid.tileSize++mapGrid.gridY0, monsGrid.tileSize, monsGrid.tileSize);
         end;
       end;
     end;
@@ -935,25 +945,42 @@ procedure plrDebugDraw ();
     plr := gPlayers[0];
     if (plr = nil) then exit;
     plr.getMapBox(px, py, pw, ph);
-    drawRect(px, py, pw, ph, TGxRGBA.Create(255, 0, 255, 200));
+    hlmContext.color := TGxRGBA.Create(255, 0, 255, 200);
+    hlmContext.rect(px, py, pw, ph);
     pdx := pmsCurMapX-(px+pw div 2);
     pdy := pmsCurMapY-(py+ph div 2);
-    drawLine(px+pw div 2, py+ph div 2, px+pw div 2+pdx, py+ph div 2+pdy, TGxRGBA.Create(255, 0, 255, 200));
-    pan := mapGrid.traceBox(ex, ey, px, py, pw, ph, pdx, pdy, nil, GridTagObstacle);
+    hlmContext.color := TGxRGBA.Create(255, 0, 255, 200);
+    hlmContext.line(px+pw div 2, py+ph div 2, px+pw div 2+pdx, py+ph div 2+pdy);
+    pan := mapGrid.traceBox(ex, ey, px, py, pw, ph, pdx, pdy, GridTagObstacle);
     if (pan = nil) then
     begin
-      drawRect(px+pdx, py+pdy, pw, ph, TGxRGBA.Create(255, 255, 255, 180));
+      hlmContext.color := TGxRGBA.Create(255, 255, 255, 180);
+      hlmContext.rect(px+pdx, py+pdy, pw, ph);
     end
     else
     begin
-      drawRect(px+pdx, py+pdy, pw, ph, TGxRGBA.Create(255, 255, 0, 180));
+      hlmContext.color := TGxRGBA.Create(255, 255, 0, 180);
+      hlmContext.rect(px+pdx, py+pdy, pw, ph);
     end;
-    drawRect(ex, ey, pw, ph, TGxRGBA.Create(255, 127, 0, 180));
+    hlmContext.color := TGxRGBA.Create(255, 127, 0, 180);
+    hlmContext.rect(ex, ey, pw, ph);
   end;
 
   procedure hilightCell (cx, cy: Integer);
   begin
-    fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, TGxRGBA.Create(0, 128, 0, 64));
+    hlmContext.color := TGxRGBA.Create(0, 128, 0, 64);
+    hlmContext.fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize);
+  end;
+
+  procedure hilightBodyCells (proxyId: Integer);
+  var
+    it: CellCoordIter;
+    pcellxy: PGridCellCoord;
+  begin
+    //monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+    it := monsGrid.forEachBodyCell(proxyId);
+    for pcellxy in it do hilightCell(pcellxy^.x, pcellxy^.y);
+    it.release();
   end;
 
   procedure hilightCell1 (cx, cy: Integer);
@@ -961,7 +988,8 @@ procedure plrDebugDraw ();
     //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
     cx := cx and (not (monsGrid.tileSize-1));
     cy := cy and (not (monsGrid.tileSize-1));
-    fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, TGxRGBA.Create(255, 255, 0, 92));
+    hlmContext.color := TGxRGBA.Create(255, 255, 0, 92);
+    hlmContext.fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize);
   end;
 
   function hilightWallTrc (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
@@ -969,20 +997,24 @@ procedure plrDebugDraw ();
     result := false; // don't stop
     if (pan = nil) then exit; // cell completion, ignore
     //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
-    fillRect(pan.X, pan.Y, pan.Width, pan.Height, TGxRGBA.Create(0, 128, 128, 64));
+    hlmContext.color := TGxRGBA.Create(0, 128, 128, 64);
+    hlmContext.fillRect(pan.X, pan.Y, pan.Width, pan.Height);
   end;
 
-  function monsCollector (mon: TMonster; tag: Integer): Boolean;
+  procedure monsCollector (mon: TMonster);
   var
     ex, ey: Integer;
     mx, my, mw, mh: Integer;
   begin
-    result := false;
     mon.getMapBox(mx, my, mw, mh);
-    e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
+    hlmContext.color := TGxRGBA.Create(255, 255, 0, 160);
+    hlmContext.rect(mx, my, mw, mh);
+    //e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
     if lineAABBIntersects(laserX0, laserY0, laserX1, laserY1, mx, my, mw, mh, ex, ey) then
     begin
-      e_DrawPoint(8, ex, ey, 0, 255, 0);
+      //e_DrawPoint(8, ex, ey, 0, 255, 0);
+      hlmContext.color := TGxRGBA.Create(0, 255, 0, 220);
+      hlmContext.fillRect(ex-2, ey-2, 7, 7);
     end;
   end;
 
@@ -1012,10 +1044,12 @@ procedure plrDebugDraw ();
         exit;
       end;
       mon.getMapBox(mx, my, mw, mh);
-      drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, TGxRGBA.Create(255, 0, 0));
+      hlmContext.color := TGxRGBA.Create(255, 0, 0);
+      hlmContext.line(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2);
       if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
       begin
-        drawLine(mx+mw div 2, my+mh div 2, ex, ey, TGxRGBA.Create(0, 255, 0));
+        hlmContext.color := TGxRGBA.Create(0, 255, 0);
+        hlmContext.line(mx+mw div 2, my+mh div 2, ex, ey);
       end;
     end;
 
@@ -1029,14 +1063,16 @@ procedure plrDebugDraw ();
       if (eplr = nil) then exit;
       eplr.getMapBox(emx, emy, emw, emh);
       mon.getMapBox(mx, my, mw, mh);
-      drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, TGxRGBA.Create(255, 0, 0));
+      hlmContext.color := TGxRGBA.Create(255, 0, 0);
+      hlmContext.line(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2);
       {$IF DEFINED(D2F_DEBUG)}
       mapGrid.dbgRayTraceTileHitCB := hilightCell1;
       {$ENDIF}
       if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
       //if (mapGrid.traceRay(ex, ey, mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, hilightWallTrc, (GridTagWall or GridTagDoor)) <> nil) then
       begin
-        drawLine(mx+mw div 2, my+mh div 2, ex, ey, TGxRGBA.Create(0, 255, 0));
+        hlmContext.color := TGxRGBA.Create(0, 255, 0);
+        hlmContext.line(mx+mw div 2, my+mh div 2, ex, ey);
       end;
       {$IF DEFINED(D2F_DEBUG)}
       mapGrid.dbgRayTraceTileHitCB := nil;
@@ -1048,28 +1084,32 @@ procedure plrDebugDraw ();
     mon.getMapBox(mx, my, mw, mh);
     //mx += mw div 2;
 
-    monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+    //monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+    hilightBodyCells(mon.proxyId);
 
     if showMonsInfo then
     begin
       //fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
-      darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
+      hlmContext.font := 'msx6';
+      hlmContext.color := TGxRGBA.Create(255, 127, 0);
+
+      hlmContext.darkenRect(mx-4, my-7*hlmContext.charWidth(' ')-6, 110, 7*hlmContext.charWidth(' ')+6, 128);
       my -= 8;
       my -= 2;
 
       // type
-      drawText6(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID])); my -= hlmContext.charWidth(' ');
       // beh
-      drawText6(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)])); my -= hlmContext.charWidth(' ');
       // state
-      drawText6(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep])); my -= hlmContext.charWidth(' ');
       // health
-      drawText6(mx, my, Format('Health:%d', [mon.MonsterHealth]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('Health:%d', [mon.MonsterHealth])); my -= hlmContext.charWidth(' ');
       // ammo
-      drawText6(mx, my, Format('Ammo:%d', [mon.MonsterAmmo]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('Ammo:%d', [mon.MonsterAmmo])); my -= hlmContext.charWidth(' ');
       // target
-      drawText6(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID]), TGxRGBA.Create(255, 127, 0)); my -= 8;
-      drawText6(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime]), TGxRGBA.Create(255, 127, 0)); my -= 8;
+      hlmContext.drawText(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID])); my -= hlmContext.charWidth(' ');
+      hlmContext.drawText(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime])); my -= hlmContext.charWidth(' ');
     end;
 
     drawMonsterTargetLine();
@@ -1084,7 +1124,8 @@ procedure plrDebugDraw ();
   function highlightAllMonsterCells (mon: TMonster): Boolean;
   begin
     result := false; // don't stop
-    monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+    //monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+    hilightBodyCells(mon.proxyId);
   end;
 
   procedure drawSelectedPlatformCells ();
@@ -1094,8 +1135,10 @@ procedure plrDebugDraw ();
     if not showGrid then exit;
     pan := g_Map_PanelByGUID(platMarkedGUID);
     if (pan = nil) then exit;
-    mapGrid.forEachBodyCell(pan.proxyId, hilightCell);
-    drawRect(pan.x, pan.y, pan.width, pan.height, TGxRGBA.Create(0, 200, 0, 200));
+    //mapGrid.forEachBodyCell(pan.proxyId, hilightCell);
+    hilightBodyCells(pan.proxyId);
+    hlmContext.color := TGxRGBA.Create(0, 200, 0, 200);
+    hlmContext.rect(pan.x, pan.y, pan.width, pan.height);
   end;
 
   procedure drawTrigger (var trig: TTrigger);
@@ -1106,24 +1149,26 @@ procedure plrDebugDraw ();
     begin
       pan := g_Map_PanelByGUID(pguid);
       if (pan = nil) then exit;
-      drawLine(
-        trig.trigCenter.x, trig.trigCenter.y,
-        pan.x+pan.width div 2, pan.y+pan.height div 2,
-        TGxRGBA.Create(255, 0, 255, 220));
+      hlmContext.color := TGxRGBA.Create(255, 0, 255, 220);
+      hlmContext.line(trig.trigCenter.x, trig.trigCenter.y, pan.x+pan.width div 2, pan.y+pan.height div 2);
     end;
 
   var
     tts: AnsiString;
     tx: Integer;
   begin
-    fillRect(trig.x, trig.y, trig.width, trig.height, TGxRGBA.Create(255, 0, 255, 96));
+    hlmContext.font := 'msx6';
+    hlmContext.color := TGxRGBA.Create(255, 0, 255, 96);
+    hlmContext.fillRect(trig.x, trig.y, trig.width, trig.height);
     tts := trigType2Str(trig.TriggerType);
     tx := trig.x+(trig.width-Length(tts)*6) div 2;
-    darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64);
-    drawText6(tx, trig.y-9, tts, TGxRGBA.Create(255, 127, 0));
+    hlmContext.darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64);
+    hlmContext.color := TGxRGBA.Create(255, 127, 0);
+    hlmContext.drawText(tx, trig.y-9, tts);
     tx := trig.x+(trig.width-Length(trig.mapId)*6) div 2;
-    darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64);
-    drawText6(tx, trig.y-19, trig.mapId, TGxRGBA.Create(255, 255, 0));
+    hlmContext.darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64);
+    hlmContext.color := TGxRGBA.Create(255, 255, 0);
+    hlmContext.drawText(tx, trig.y-19, trig.mapId);
     drawPanelDest(trig.trigPanelGUID);
     case trig.TriggerType of
       TRIGGER_NONE: begin end;
@@ -1144,15 +1189,15 @@ procedure plrDebugDraw ();
         begin
           if (trig.trigDataRec.trigTWidth > 0) and (trig.trigDataRec.trigTHeight > 0) then
           begin
-            fillRect(
+            hlmContext.color := TGxRGBA.Create(0, 255, 255, 42);
+            hlmContext.fillRect(
               trig.trigDataRec.trigTX, trig.trigDataRec.trigTY,
-              trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight,
-              TGxRGBA.Create(0, 255, 255, 42));
-            drawLine(
+              trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight);
+            hlmContext.color := TGxRGBA.Create(255, 0, 255, 220);
+            hlmContext.line(
               trig.trigCenter.x, trig.trigCenter.y,
               trig.trigDataRec.trigTX+trig.trigDataRec.trigTWidth div 2,
-              trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2,
-              TGxRGBA.Create(255, 0, 255, 220));
+              trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2);
           end;
         end;
       TRIGGER_SOUND: begin end;
@@ -1191,33 +1236,49 @@ procedure plrDebugDraw ();
       if gib.alive then
       begin
         gib.getMapBox(px, py, pw, ph);
-        drawRect(px, py, pw, ph, TGxRGBA.Create(255, 0, 255));
+        hlmContext.color := TGxRGBA.Create(255, 0, 255);
+        hlmContext.rect(px, py, pw, ph);
       end;
     end;
   end;
 
 var
-  scisave: TScissorSave;
   mon: TMonster;
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
   mx, my, mw, mh: Integer;
   //pan: TPanel;
   //ex, ey: Integer;
+  s: AnsiString;
+  dx, dy: Integer;
 begin
   if (gPlayer1 = nil) then exit;
 
-  scisave.save(true); // enable scissoring
-  glPushMatrix();
+  if (hlmContext = nil) then hlmContext := TGxContext.Create();
+
+  gxSetContext(hlmContext);
   try
-    //glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
-    glScissor(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
+    //glScissor(0, gScreenHeight-gPlayerScreenSize.Y-1, vpw, vph);
+    //hlmContext.clip := TGxRect.Create(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
 
+    {
     glScalef(g_dbg_scale, g_dbg_scale, 1.0);
     glTranslatef(-vpx, -vpy, 0);
+    }
+    hlmContext.glSetScaleTrans(g_dbg_scale, -vpx, -vpy);
+    glEnable(GL_SCISSOR_TEST);
+    glScissor(0, gScreenHeight-gPlayerScreenSize.Y-1, gPlayerScreenSize.X, gPlayerScreenSize.Y);
 
     if (showGrid) then drawTileGrid();
     drawOutlines();
 
-    if (laserSet) then g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
+    if (laserSet) then
+    begin
+      //g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
+      it := monsGrid.forEachAlongLine(laserX0, laserY0, laserX1, laserY1, -1, true);
+      for mit in it do monsCollector(mit^);
+      it.release();
+    end;
 
     if (monMarkedUID <> -1) then
     begin
@@ -1225,7 +1286,9 @@ begin
       if (mon <> nil) then
       begin
         mon.getMapBox(mx, my, mw, mh);
-        e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
+        //e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
+        hlmContext.color := TGxRGBA.Create(255, 0, 0, 220);
+        hlmContext.rect(mx, my, mw, mh);
         drawMonsterInfo(mon);
       end;
     end;
@@ -1257,43 +1320,33 @@ begin
     *)
 
   finally
-    glPopMatrix();
-    scisave.restore();
+    gxSetContext(nil);
   end;
 
-  if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), TGxRGBA.Create(255, 255, 0));
-end;
-
-
-// ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_MouseEvent (var ev: THMouseEvent);
-var
-  he: THMouseEvent;
-begin
-  if g_Game_IsNet then exit;
-  if not g_holmes_enabled then exit;
-
-  holmesInitCommands();
-  holmesInitBinds();
-  msX := ev.x;
-  msY := ev.y;
-  msB := ev.bstate;
-  kbS := ev.kstate;
-  msB := msB;
-  he := ev;
-  he.x := he.x;
-  he.y := he.y;
-  uiMouseEvent(he);
-  if (not he.eaten) then plrDebugMouse(he);
-  ev.eat();
+  if showMapCurPos then
+  begin
+    s := Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]);
+    gxSetContext(hlmContext);
+    hlmContext.font := 'win8';
+    hlmContext.color := TGxRGBA.Create(0, 0, 0);
+    for dy := -1 to 1 do
+    begin
+      for dx := -1 to 1 do
+      begin
+        if (dx <> 0) or (dy <> 0) then hlmContext.drawText(4+dx, gScreenHeight-10+dy, s);
+      end;
+    end;
+    hlmContext.color := TGxRGBA.Create(255, 255, 0);
+    hlmContext.drawText(4, gScreenHeight-10, s);
+    gxSetContext(nil);
+  end;
 end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_KeyEvent (var ev: THKeyEvent);
-var
-  doeat: Boolean = false;
+procedure onKeyEvent (var ev: TFUIEvent);
 {$IF DEFINED(D2F_DEBUG)}
+var
   pan: TPanel;
   ex, ey: Integer;
   dx, dy: Integer;
@@ -1304,31 +1357,13 @@ var
   end;
 
 begin
-  if g_Game_IsNet then exit;
-  if not g_holmes_enabled then exit;
-
-  holmesInitCommands();
-  holmesInitBinds();
-
-  msB := ev.bstate;
-  kbS := ev.kstate;
-  case ev.scan of
-    SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
-    SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
-    SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
-      doeat := true;
-  end;
-
-  uiKeyEvent(ev);
-  if (ev.eaten) then exit;
-  if keybindExecute(ev) then begin ev.eat(); exit; end;
   // press
   if (ev.press) then
   begin
     {$IF DEFINED(D2F_DEBUG)}
     // C-UP, C-DOWN, C-LEFT, C-RIGHT: trace 10 pixels from cursor in the respective direction
     if ((ev.scan = SDL_SCANCODE_UP) or (ev.scan = SDL_SCANCODE_DOWN) or (ev.scan = SDL_SCANCODE_LEFT) or (ev.scan = SDL_SCANCODE_RIGHT)) and
-       ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
+       ((ev.kstate and TFUIEvent.ModCtrl) <> 0) then
     begin
       ev.eat();
       dx := pmsCurMapX;
@@ -1353,7 +1388,61 @@ begin
     end;
     {$ENDIF}
   end;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure g_Holmes_OnEvent (var ev: TFUIEvent);
+{$IF not DEFINED(HEADLESS)}
+var
+  doeat: Boolean = false;
+{$ENDIF}
+begin
+{$IF not DEFINED(HEADLESS)}
+  if g_Game_IsNet then exit;
+  if not g_holmes_enabled then exit;
+  if g_holmes_imfunctional then exit;
+
+  holmesInitCommands();
+  holmesInitBinds();
+
+  msB := ev.bstate;
+  kbS := ev.kstate;
+
+  if (ev.key) then
+  begin
+    case ev.scan of
+      SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
+      SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
+      SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
+        doeat := true;
+    end;
+  end
+  else if (ev.mouse) then
+  begin
+    msX := ev.x;
+    msY := ev.y;
+    msB := ev.bstate;
+    kbS := ev.kstate;
+    msB := msB;
+  end;
+
+  uiDispatchEvent(ev);
+  if (not ev.alive) then exit;
+
+  if (ev.mouse) then
+  begin
+    if (gPlayer1 <> nil) and (vpSet) then msbindExecute(ev);
+    ev.eat();
+  end
+  else
+  begin
+    if keybindExecute(ev) then ev.eat();
+    if (ev.alive) then onKeyEvent(ev);
+  end;
+
   if (doeat) then ev.eat();
+{$ENDIF}
 end;
 
 
@@ -1361,6 +1450,8 @@ end;
 procedure g_Holmes_Draw ();
 begin
   if g_Game_IsNet then exit;
+  if not g_holmes_enabled then exit;
+  if g_holmes_imfunctional then exit;
 
   {$IF not DEFINED(HEADLESS)}
   holmesInitCommands();
@@ -1383,6 +1474,8 @@ procedure g_Holmes_DrawUI ();
 begin
   if g_Game_IsNet then exit;
   if not g_holmes_enabled then exit;
+  if g_holmes_imfunctional then exit;
+
   {$IF not DEFINED(HEADLESS)}
   gGfxDoClear := false;
   //if assigned(prerenderFrameCB) then prerenderFrameCB();
@@ -1454,7 +1547,7 @@ procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTrace
 procedure dbgToggleHolmesPause (arg: Integer=-1); begin if (arg < 0) then g_Game_HolmesPause(not gPauseHolmes) else g_Game_HolmesPause(arg > 0); end;
 
 procedure cbAtcurSelectMonster ();
-  function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+  function monsAtDump (mon: TMonster{; tag: Integer}): Boolean;
   begin
     result := true; // stop
     e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), TMsgType.Notify);
@@ -1464,6 +1557,8 @@ procedure cbAtcurSelectMonster ();
 var
   plr: TPlayer;
   x, y, w, h: Integer;
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
 begin
   monMarkedUID := -1;
   if (Length(gPlayers) > 0) then
@@ -1479,24 +1574,34 @@ begin
     end;
   end;
   //e_WriteLog('===========================', MSG_NOTIFY);
-  monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
+  it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+  for mit in it do monsAtDump(mit^);
+  it.release();
   //e_WriteLog('---------------------------', MSG_NOTIFY);
 end;
 
 procedure cbAtcurDumpMonsters ();
-  function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+  function monsAtDump (mon: TMonster{; tag: Integer}): Boolean;
   begin
     result := false; // don't stop
     e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), TMsgType.Notify);
   end;
+var
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
 begin
-  e_WriteLog('===========================', TMsgType.Notify);
-  monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
-  e_WriteLog('---------------------------', TMsgType.Notify);
+  it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+  if (it.length > 0) then
+  begin
+    e_WriteLog('===========================', TMsgType.Notify);
+    for mit in it do monsAtDump(mit^);
+    e_WriteLog('---------------------------', TMsgType.Notify);
+  end;
+  it.release();
 end;
 
 procedure cbAtcurDumpWalls ();
-  function wallToggle (pan: TPanel; tag: Integer): Boolean;
+  function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
   begin
     result := false; // don't stop
     if (platMarkedGUID = -1) then platMarkedGUID := pan.guid;
@@ -1507,11 +1612,18 @@ var
   hasTrigs: Boolean = false;
   f: Integer;
   trig: PTrigger;
+  mwit: PPanel;
+  it: TPanelGrid.Iter;
 begin
   platMarkedGUID := -1;
-  e_WriteLog('=== TOGGLE WALL ===', TMsgType.Notify);
-  mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
-  e_WriteLog('--- toggle wall ---', TMsgType.Notify);
+  it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+  if (it.length > 0) then
+  begin
+    e_WriteLog('=== TOGGLE WALL ===', TMsgType.Notify);
+    for mwit in it do wallToggle(mwit^);
+    e_WriteLog('--- toggle wall ---', TMsgType.Notify);
+  end;
+  it.release();
   if showTriggers then
   begin
     for f := 0 to High(gTriggers) do
@@ -1528,16 +1640,21 @@ begin
 end;
 
 procedure cbAtcurToggleWalls ();
-  function wallToggle (pan: TPanel; tag: Integer): Boolean;
+  function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
   begin
     result := false; // don't stop
     //e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
     if pan.Enabled then g_Map_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid);
   end;
+var
+  mwit: PPanel;
+  it: TPanelGrid.Iter;
 begin
   //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
-  mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
   //e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+  it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+  for mwit in it do wallToggle(mwit^);
+  it.release();
 end;
 
 
@@ -1623,7 +1740,7 @@ begin
 
     // load bindings from file
     try
-      st := openDiskFileRO(GameDir+'holmes.rc');
+      st := e_OpenResourceRO(ConfigDirs, 'holmes.rc');
       pr := TFileTextParser.Create(st);
       conwriteln('parsing "holmes.rc"...');
       while (pr.tokType <> pr.TTEOF) do
@@ -1661,22 +1778,13 @@ begin
 end;
 
 
-procedure onMouseEvent (var ev: THMouseEvent);
 begin
-  if not g_holmes_enabled then exit;
-  g_Holmes_MouseEvent(ev);
-end;
-
-procedure onKeyEvent (var ev: THKeyEvent);
-begin
-  if not g_holmes_enabled then exit;
-  g_Holmes_KeyEvent(ev);
-end;
-
+  // shut up, fpc!
+  msB := msB;
+  vpSet := vpSet;
 
-begin
-  evMouseCB := onMouseEvent;
-  evKeyCB := onKeyEvent;
+  fuiEventCB := g_Holmes_OnEvent;
+  //uiContext.font := 'win14';
 
   conRegVar('hlm_ui_scale', @fuiRenderScale, 0.01, 5.0, 'Holmes UI scale', '', false);
 end.