From dc1f4253539f597d5111ca2934c752eff21bba10 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <aksdb@gmx.de>
Date: Thu, 30 Jul 2009 20:31:29 +0200
Subject: [PATCH] - Added tracking of "Highlighted" state in the screen buffer

---
 Client/ULandscape.pas |  3 ++
 Client/UfrmMain.pas   | 90 ++++++++++++++++++++++++++++++-------------
 2 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/Client/ULandscape.pas b/Client/ULandscape.pas
index ee3ed4b..13f21dc 100644
--- a/Client/ULandscape.pas
+++ b/Client/ULandscape.pas
@@ -163,6 +163,7 @@ type
     LowRes: TMaterial;
     Normals: PNormals;
     State: TScreenState;
+    Highlighted: Boolean;
     Next: PBlockInfo;
   end;
 
@@ -994,6 +995,7 @@ begin
   Result^.LowRes := nil;
   Result^.Normals := nil;
   Result^.State := ssNormal;
+  Result^.Highlighted := False;
   Result^.Next := nil;
 
   if FShortCuts[0] = nil then //First element
@@ -1110,6 +1112,7 @@ begin
   Result^.LowRes := nil;
   Result^.Normals := nil;
   Result^.State := ssNormal;
+  Result^.Highlighted := False;
 
   if (FShortCuts[0] = nil) or (CompareWorldItems(AItem, FShortCuts[0]) > 0) then
   begin
diff --git a/Client/UfrmMain.pas b/Client/UfrmMain.pas
index 2cb8ea5..e801071 100644
--- a/Client/UfrmMain.pas
+++ b/Client/UfrmMain.pas
@@ -314,6 +314,7 @@ type
     procedure SetY(const AValue: Integer);
     procedure UpdateCurrentTile;
     procedure UpdateCurrentTile(AX, AY: Integer);
+    procedure UpdateSelection;
     procedure WriteChatMessage(ASender, AMessage: string);
     { Events }
     procedure OnClientHandlingPacket(ABuffer: TEnhancedMemoryStream);
@@ -1587,6 +1588,8 @@ begin
   FCurrentTile := AValue;
   if FCurrentTile <> nil then
     FCurrentTile.OnDestroy.RegisterEvent(@OnTileRemoved);
+
+  UpdateSelection;
 end;
 
 procedure TfrmMain.SetSelectedTile(const AValue: TWorldItem);
@@ -1596,6 +1599,8 @@ begin
   FSelectedTile := AValue;
   if FSelectedTile <> nil then
     FSelectedTile.OnDestroy.RegisterEvent(@OnTileRemoved);
+
+  UpdateSelection;
 end;
 
 procedure TfrmMain.SetNormalLights;
@@ -1657,7 +1662,7 @@ var
   staticItem: TStaticItem;
   staticTileData: TStaticTileData;
   hue: THue;
-  highlight, singleTarget, multiTarget: Boolean;
+  highlight: Boolean;
   ghostTile: TWorldItem;
   tileRect: TRect;
   virtualTile: TVirtualTile;
@@ -1685,10 +1690,29 @@ begin
 
     item := blockInfo^.Item;
 
-    intensity := 1.0;
-    SetNormalLights;
+    //TODO : implement CanBeEdited handling (dmNetwork.CanWrite.....)
+    if acSelect.Checked or item.CanBeEdited then
+    begin
+      editing := True;
+      intensity := 1.0;
+      SetNormalLights;
+    end else
+    begin
+      editing := False;
+      intensity := 0.5;
+      SetDarkLights;
+    end;
+
     glColor4f(intensity, intensity, intensity, 1.0);
 
+    highlight := item.CanBeEdited and blockInfo^.Highlighted;
+
+    if highlight then
+    begin
+      glEnable(GL_COLOR_LOGIC_OP);
+      glLogicOp(GL_COPY_INVERTED);
+    end;
+
     if item is TMapCell then
     begin
       if blockInfo^.HighRes <> nil then
@@ -1725,28 +1749,11 @@ begin
       glEnd;
     end;
 
+    if highlight then
+      glDisable(GL_COLOR_LOGIC_OP);
+
     {GetDrawOffset(item.X - FX, item.Y - FY, drawX, drawY);
 
-    singleTarget := (CurrentTile <> nil) and
-                    (item.X = CurrentTile.X) and
-                    (item.Y = CurrentTile.Y);
-    multiTarget := (CurrentTile <> nil) and
-                   (SelectedTile <> nil) and
-                   (CurrentTile <> SelectedTile) and
-                   PtInRect(tileRect, Point(item.X, item.Y));
-
-    if acSelect.Checked or item.CanBeEdited then
-    begin
-      editing := True;
-      intensity := 1.0;
-      SetNormalLights;
-    end else
-    begin
-      editing := False;
-      intensity := 0.5;
-      SetDarkLights;
-    end;
-
     {if editing and acDraw.Checked and (singleTarget or multiTarget) then
     begin
       ghostTile := FGhostTile;
@@ -1906,10 +1913,8 @@ begin
 
       if TObject(draw[i]) <> ghostTile then
         FScreenBuffer.Store(Bounds(Trunc(drawX - east), Trunc(drawY + 44 - south - z * 4), mat.RealWidth, Trunc(south)), staticItem, mat);
-    end;
+    end;}
 
-    if highlight then
-      glDisable(GL_COLOR_LOGIC_OP);}
   end;
 
   FOverlayUI.Draw(oglGameWindow);
@@ -2202,6 +2207,39 @@ begin
   end;
 end;
 
+procedure TfrmMain.UpdateSelection;
+var
+  selectedRect: TRect;
+  blockInfo: PBlockInfo;
+begin
+  if acSelect.Checked then
+  begin
+    //no highlighted tiles in "selection" mode
+    blockInfo := nil;
+    while FScreenBuffer.Iterate(blockInfo) do
+      if blockInfo^.State = ssNormal then
+        blockInfo^.Highlighted := False;
+    Exit;
+  end;
+
+  if CurrentTile <> nil then
+  begin
+    blockInfo := nil;
+    if (SelectedTile <> nil) and (CurrentTile <> SelectedTile) then
+    begin
+      selectedRect := GetSelectedRect;
+      while FScreenBuffer.Iterate(blockInfo) do
+        if blockInfo^.State = ssNormal then
+          blockInfo^.Highlighted := PtInRect(selectedRect, Point(blockInfo^.Item.X, blockInfo^.Item.Y));
+    end else
+    begin
+      while FScreenBuffer.Iterate(blockInfo) do
+        if blockInfo^.State = ssNormal then
+          blockInfo^.Highlighted := (blockInfo^.Item = CurrentTile);
+    end;
+  end;
+end;
+
 procedure TfrmMain.OnTileRemoved(ATile: TMulBlock);
 begin
   if ATile = FCurrentTile then