X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Fg_map.pas;h=6c6f191e3e816b20f2a71d2899c6b51403f2a29c;hb=f9041cfd23f3f5eff7e56f2960c7a571bb3c4607;hp=a41406596015a5843a2330124acb8686feb0f42e;hpb=71ee6bf06a4d2c6c3661b982ee3da4ce229e3f74;p=d2df-editor.git

diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas
index a414065..6c6f191 100644
--- a/src/editor/g_map.pas
+++ b/src/editor/g_map.pas
@@ -2682,8 +2682,8 @@ begin
         e_DrawQuad(
           MapOffset.X + gItems[a].X,
           MapOffset.Y + gItems[a].Y,
-          MapOffset.X + gItems[a].X + ItemSize[gItems[a].ItemType, 0],
-          MapOffset.Y + gItems[a].Y + ItemSize[gItems[a].ItemType, 1],
+          MapOffset.X + gItems[a].X + ItemSize[gItems[a].ItemType, 0] - 1,
+          MapOffset.Y + gItems[a].Y + ItemSize[gItems[a].ItemType, 1] - 1,
           0, 255, 255
         );
   if ContourEnabled[LAYER_MONSTERS] and (gMonsters <> nil) then
@@ -2694,16 +2694,16 @@ begin
           MapOffset.Y + gMonsters[a].Y,
           MapOffset.X + gMonsters[a].X + MonsterSize[gMonsters[a].MonsterType].Width - 1,
           MapOffset.Y + gMonsters[a].Y + MonsterSize[gMonsters[a].MonsterType].Height - 1,
-          255, 0, 0
+          200, 0, 0
         );
   if ContourEnabled[LAYER_AREAS] and (gAreas <> nil) then
     for a := 0 to High(gAreas) do
       if gAreas[a].AreaType <> AREA_NONE then
         e_DrawQuad(
-          MapOffset.X + gAreas[a].X + AreaSize[gAreas[a].AreaType].X,
-          MapOffset.Y + gAreas[a].Y + AreaSize[gAreas[a].AreaType].Y,
-          MapOffset.X + gAreas[a].X + AreaSize[gAreas[a].AreaType].Width,
-          MapOffset.Y + gAreas[a].Y + AreaSize[gAreas[a].AreaType].Height,
+          MapOffset.X + gAreas[a].X,
+          MapOffset.Y + gAreas[a].Y,
+          MapOffset.X + gAreas[a].X + AreaSize[gAreas[a].AreaType].Width - 1,
+          MapOffset.Y + gAreas[a].Y + AreaSize[gAreas[a].AreaType].Height - 1,
           0, 255, 255
         );
   if ContourEnabled[LAYER_TRIGGERS] and (gTriggers <> nil) then
@@ -2712,33 +2712,33 @@ begin
         e_DrawQuad(
           MapOffset.X + gTriggers[a].X,
           MapOffset.Y + gTriggers[a].Y,
-          MapOffset.X + gTriggers[a].X + gTriggers[a].Width,
-          MapOffset.Y + gTriggers[a].Y + gTriggers[a].Height,
+          MapOffset.X + gTriggers[a].X + gTriggers[a].Width - 1,
+          MapOffset.Y + gTriggers[a].Y + gTriggers[a].Height - 1,
           255, 255, 0
         );
 
 // Границы карты:
   if PreviewMode = 0 then
   begin
-    e_DrawFillQuad(-32+MapOffset.X,
-                   -32+MapOffset.Y,
-                   gMapInfo.Width+31+MapOffset.X,
-                   -1+MapOffset.Y,
+    e_DrawFillQuad(0,
+                   0,
+                   MainForm.RenderPanel.Width,
+                   -1 + MapOffset.Y,
                    drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Top
-    e_DrawFillQuad(-32+MapOffset.X,
-                   gMapInfo.Height+MapOffset.Y,
-                   gMapInfo.Width+31+MapOffset.X,
-                   gMapInfo.Height+31+MapOffset.Y,
+    e_DrawFillQuad(0,
+                   gMapInfo.Height + MapOffset.Y,
+                   MainForm.RenderPanel.Width,
+                   MainForm.RenderPanel.Height,
                    drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Bottom
-    e_DrawFillQuad(-32+MapOffset.X,
+    e_DrawFillQuad(0,
                    MapOffset.Y,
-                   -1+MapOffset.X,
-                   gMapInfo.Height+MapOffset.Y-1,
+                   -1 + MapOffset.X,
+                   gMapInfo.Height + MapOffset.Y - 1,
                    drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Left
-    e_DrawFillQuad(gMapInfo.Width+MapOffset.X,
+    e_DrawFillQuad(gMapInfo.Width + MapOffset.X,
                    MapOffset.Y,
-                   gMapInfo.Width+31+MapOffset.X,
-                   gMapInfo.Height+MapOffset.Y-1,
+                   MainForm.RenderPanel.Width,
+                   gMapInfo.Height + MapOffset.Y - 1,
                    drEdge[0], drEdge[1], drEdge[2], drEdge[3], B_NONE); // Right
   end;
 end;