X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=82f2be14f94a8b48690bc135734901d91b018b48;hb=254041134b399e948e554ae99171174a7087ae40;hp=a1248f00155a5218285e177273ba6ad5d6795595;hpb=1f3c760a3beb696acb34781fa305b10942aee2b1;p=d2df-sdl.git

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index a1248f0..82f2be1 100644
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -21,7 +21,7 @@ interface
 uses
   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_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx,
   xprofiler;
 
 
@@ -122,6 +122,7 @@ var
   showLayersWindow: Boolean = false;
   showOutlineWindow: Boolean = false;
   showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+  showTraceBox: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -908,6 +909,50 @@ procedure plrDebugDraw ();
     end;
   end;
 
+  procedure drawAwakeCells ();
+  var
+    x, y: Integer;
+  begin
+    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, 128, 0, 128, 64);
+        end;
+      end;
+    end;
+  end;
+
+  procedure drawTraceBox ();
+  var
+    plr: TPlayer;
+    px, py, pw, ph: Integer;
+    pdx, pdy: Integer;
+    ex, ey: Integer;
+    pan: TPanel;
+  begin
+    if (Length(gPlayers) < 1) then exit;
+    plr := gPlayers[0];
+    if (plr = nil) then exit;
+    plr.getMapBox(px, py, pw, ph);
+    drawRect(px, py, pw, ph, 255, 0, 255, 200);
+    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, 255, 0, 255, 200);
+    pan := mapGrid.traceBox(ex, ey, px, py, pw, ph, pdx, pdy, nil, GridTagObstacle);
+    if (pan = nil) then
+    begin
+      drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 255, 180);
+    end
+    else
+    begin
+      drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 0, 180);
+    end;
+    drawRect(ex, ey, pw, ph, 255, 127, 0, 180);
+  end;
+
   procedure hilightCell (cx, cy: Integer);
   begin
     fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64);
@@ -1184,6 +1229,10 @@ begin
   if showTriggers then drawTriggers();
   if showGrid then drawSelectedPlatformCells();
 
+  //drawAwakeCells();
+
+  if showTraceBox then drawTraceBox();
+
   //drawGibsBoxes();
 
   glPopMatrix();
@@ -1323,6 +1372,20 @@ procedure bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTr
 procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end;
 procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end;
 
+procedure bcMonsterSpawn (s: AnsiString);
+var
+  mon: TMonster;
+begin
+  if not gGameOn or g_Game_IsClient then
+  begin
+    conwriteln('cannot spawn monster in this mode');
+    exit;
+  end;
+  mon := g_Mons_SpawnAt(s, pmsCurMapX, pmsCurMapY);
+  if (mon = nil) then begin conwritefln('unknown monster id: ''%s''', [s]); exit; end;
+  monMarkedUID := mon.UID;
+end;
+
 procedure bcMonsterWakeup ();
 var
   mon: TMonster;
@@ -1346,6 +1409,8 @@ begin
   end;
 end;
 
+procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end;
+
 procedure cbAtcurSelectMonster ();
   function monsAtDump (mon: TMonster; tag: Integer): Boolean;
   begin
@@ -1393,7 +1458,7 @@ procedure cbAtcurDumpWalls ();
   begin
     result := false; // don't stop
     if (platMarkedGUID = -1) then platMarkedGUID := pan.guid;
-    e_LogWritefln('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]);
+    e_LogWritefln('wall ''%s'' #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.mapId, pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
     dumpPublishedProperties(pan);
   end;
 var
@@ -1447,7 +1512,9 @@ begin
   cmdAdd('mon_info', bcToggleMonsterInfo, 'toggle monster info', 'monster control');
   cmdAdd('mon_los_plr', bcToggleMonsterLOSPlr, 'toggle monster LOS to player', 'monster control');
   cmdAdd('mon_cells', bcToggleMonsterCells, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
-  cmdAdd('mon_wakeup', bcMonsterWakeup, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
+  cmdAdd('mon_wakeup', bcMonsterWakeup, 'wake up selected monster', 'monster control');
+
+  cmdAdd('mon_spawn', bcMonsterSpawn, 'spawn monster', 'monster control');
 
   cmdAdd('mplat_step', bcOneMPlatThinkStep, 'one mplat think step', 'mplat control');
   cmdAdd('mplat_toggle', bcMPlatToggle, 'activate/deactivate moving platforms', 'mplat control');
@@ -1462,6 +1529,8 @@ begin
   cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control');
   cmdAdd('atcur_dump_walls', cbAtcurDumpWalls, 'dump walls in cell', 'wall control');
   cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control');
+
+  cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control');
 end;
 
 
@@ -1492,11 +1561,14 @@ begin
     keybindAdd('M-O', 'mplat_toggle');
 
     keybindAdd('C-T', 'plr_teleport');
+    keybindAdd('M-T', 'dbg_tracebox');
 
     keybindAdd('C-P', 'dbg_curpos');
     keybindAdd('C-G', 'dbg_grid');
     keybindAdd('C-X', 'dbg_triggers');
 
+    keybindAdd('C-1', 'mon_spawn zombie');
+
     // mouse
     msbindAdd('LMB', 'atcur_select_monster');
     msbindAdd('M-LMB', 'atcur_dump_monsters');