- (Re-)Added drawing of tiles (using the ghost tiles)

- Fixed ghost tiles to be in edit-mode
This commit is contained in:
Andreas Schneider 2009-12-04 02:33:59 +01:00
parent 20747a4e0c
commit b6dfd64d41
1 changed files with 16 additions and 37 deletions

View File

@ -543,6 +543,7 @@ var
targetRect: TRect; targetRect: TRect;
offsetX, offsetY: Integer; offsetX, offsetY: Integer;
tile: TWorldItem; tile: TWorldItem;
tileX, tileY: Word;
targetTiles: TWorldItemList; targetTiles: TWorldItemList;
targetTile: TWorldItem; targetTile: TWorldItem;
begin begin
@ -573,45 +574,22 @@ begin
begin begin
if acDraw.Checked then //***** Drawing Mode *****// if acDraw.Checked then //***** Drawing Mode *****//
begin begin
{if FGhostTile <> nil then for tileX := FSelection.Left to FSelection.Right do
begin for tileY := FSelection.Top to FSelection.Bottom do
for tileX := targetRect.Left to targetRect.Right - 1 do
begin
for tileY := targetRect.Top to targetRect.Bottom - 1 do
begin
tileInfo := nil;
if frmDrawSettings.rbTileList.Checked then
begin
node := vdtTiles.GetFirstSelected;
if node <> nil then
tileInfo := vdtTiles.GetNodeData(node);
end else if frmDrawSettings.rbRandom.Checked then
begin
node := vdtRandom.GetFirst;
for i := 1 to Random(vdtRandom.RootNodeCount) do
node := vdtRandom.GetNext(node);
if node <> nil then
tileInfo := vdtRandom.GetNodeData(node);
end;
if tileInfo^.ID < $4000 then
begin begin
map := FLandscape.MapCell[tileX, tileY]; map := FLandscape.MapCell[tileX, tileY];
if frmDrawSettings.cbForceAltitude.Checked then if map.IsGhost then
map.Altitude := frmDrawSettings.seForceAltitude.Value; dmNetwork.Send(TDrawMapPacket.Create(tileX, tileY, map.Z,
if frmDrawSettings.cbRandomHeight.Checked then map.TileID));
map.Altitude := map.Altitude + Random(frmDrawSettings.seRandomHeight.Value); end;
dmNetwork.Send(TDrawMapPacket.Create(map.X, map.Y, map.Z, tileInfo^.ID));
end else for i := 0 to FVirtualTiles.Count - 1 do
begin begin
dmNetwork.Send(TInsertStaticPacket.Create(tileX, tileY, tile := FVirtualTiles[i];
FGhostTile.Z, tileInfo^.ID - $4000, if tile is TGhostTile then
TStaticItem(FGhostTile).Hue)); dmNetwork.Send(TInsertStaticPacket.Create(tile.X, tile.Y, tile.Z,
tile.TileID, TGhostTile(tile).Hue));
end; end;
end;
end;
end;}
end else if (SelectedTile <> targetTile) or targetTile.CanBeEdited then end else if (SelectedTile <> targetTile) or targetTile.CanBeEdited then
begin begin
if (not acMove.Checked) or (SelectedTile <> targetTile) or if (not acMove.Checked) or (SelectedTile <> targetTile) or
@ -2344,6 +2322,7 @@ procedure TfrmMain.UpdateSelection;
ghostTile.UpdatePriorities(ResMan.Tiledata.StaticTiles[ghostTile.TileID], ghostTile.UpdatePriorities(ResMan.Tiledata.StaticTiles[ghostTile.TileID],
MaxInt); MaxInt);
ghostTile.CanBeEdited := True;
FVirtualTiles.Add(ghostTile); FVirtualTiles.Add(ghostTile);
blockInfo := FScreenBuffer.Insert(ghostTile); blockInfo := FScreenBuffer.Insert(ghostTile);