diff --git a/Client/ULandscape.pas b/Client/ULandscape.pas
index 71f3975..2c01e80 100644
--- a/Client/ULandscape.pas
+++ b/Client/ULandscape.pas
@@ -1,1784 +1,1786 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2009 Andreas Schneider
- *)
-unit ULandscape;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  SysUtils, Classes, math, matrix, LCLIntf, GL, GLu, ImagingOpenGL, Imaging,
-  ImagingClasses, ImagingTypes, ImagingUtility,
-  UGenericIndex, UMap, UStatics, UArt, UTexture, UTiledata, UHue, UWorldItem,
-  UMulBlock, UAnimData,
-  UEnhancedMemoryStream, UGLFont,
-  UCacheManager;
-
-type
-  TGlVector3f = array[0..2] of GLfloat;
-  PNormals = ^TNormals;
-  TNormals = array[0..3] of TGlVector3f;
-  PRadarBlock = ^TRadarBlock;
-  TRadarBlock = array[0..7, 0..7] of Word;
-  
-  { TMaterial }
-  
-  TMaterial = class(ICacheable)
-    constructor Create;
-    destructor Destroy; override;
-  protected
-    FRefCount: Integer;
-    FWidth: Integer;
-    FHeight: Integer;
-    FRealWidth: Integer;
-    FRealHeight: Integer;
-    FGraphic: TMultiImage;
-    class procedure CalculateTextureDimensions(ACaps: TGLTextureCaps; ARealWidth,
-      ARealHeight: Integer; out AWidth, AHeight: Integer);
-    function GenerateTexture(AImage: TBaseImage): TGLuint;
-    function GetTexture: GLuint; virtual; abstract;
-  public
-    property Width: Integer read FWidth;
-    property Height: Integer read FHeight;
-    property RealWidth: Integer read FRealWidth;
-    property RealHeight: Integer read FRealHeight;
-    property Texture: GLuint read GetTexture;
-
-    procedure AddRef;
-    procedure DelRef;
-    function HitTest(AX, AY: Integer): Boolean;
-
-    {ICacheable}
-    function CanBeRemoved: Boolean;
-    procedure RemoveFromCache;
-  end;
-
-  { TSimpleMaterial }
-
-  TSimpleMaterial = class(TMaterial)
-    constructor Create(AGraphic: TBaseImage);
-    destructor Destroy; override;
-  protected
-    FTexture: TGLuint;
-    function GetTexture: GLuint; override;
-  end;
-
-  { TAnimMaterial }
-
-  TAnimMaterial = class(TMaterial)
-    constructor Create(ABaseID: Word; AAnimData: TAnimData; AHue: THue = nil;
-      APartialHue: Boolean = False);
-    destructor Destroy; override;
-  protected
-    FActiveFrame: Byte;
-    FNextChange: DWord;
-    FAnimData: TAnimData;
-    FTextures: array of TGLuint;
-    function GetTexture: GLuint; override;
-  end;
-
-  TMaterialCache = specialize TCacheManager<TMaterial>;
-  
-  { TLandTextureManager }
-  
-  TLandTextureManager = class
-    constructor Create;
-    destructor Destroy; override;
-  protected
-    FArtCache: TMaterialCache;
-    FTexCache: TMaterialCache;
-    FAnimCache: TMaterialCache;
-    FUseAnims: Boolean;
-  public
-    property UseAnims: Boolean read FUseAnims write FUseAnims;
-    function GetArtMaterial(ATileID: Word): TMaterial; overload;
-    function GetArtMaterial(ATileID: Word; AHue: THue;
-      APartialHue: Boolean): TMaterial; overload;
-    function GetStaticMaterial(AStaticItem: TStaticItem;
-      AOverrideHue: Integer = -1): TMaterial;
-    function GetTexMaterial(ATileID: Word): TMaterial;
-  end;
-
- { TSeperatedStaticBlock }
-
-  TSeperatedStaticBlock = class(TStaticBlock)
-    constructor Create(AData: TStream; AIndex: TGenericIndex; AX, AY: Word); overload;
-    constructor Create(AData: TStream; AIndex: TGenericIndex); overload;
-    destructor Destroy; override;
-  public
-    Cells: array[0..63] of TStaticItemList;
-    { Methods }
-    function Clone: TSeperatedStaticBlock; override;
-    function GetSize: Integer; override;
-    procedure RebuildList;
-  end;
-
-  TLandscape = class;
-  
-  { TBlock }
-
-  TBlock = class
-    constructor Create(AMap: TMapBlock; AStatics: TStaticBlock);
-    destructor Destroy; override;
-  protected
-    { Fields }
-    FMapBlock: TMapBlock;
-    FStaticBlock: TStaticBlock;
-  public
-    { Fields }
-    property Map: TMapBlock read FMapBlock;
-    property Static: TStaticBlock read FStaticBlock;
-    { Methods }
-    procedure UpdateBlockAcess(ALandscape: TLandscape);
-  end;
-  
-  TLandscapeChangeEvent = procedure of object;
-  TMapChangedEvent = procedure(AMapCell: TMapCell) of object;
-  TNewBlockEvent = procedure(ABlock: TBlock) of object;
-  TStaticChangedEvent = procedure(AStaticItem: TStaticItem) of object;
-
-  TScreenBuffer = class;
-  TBlockCache = specialize TCacheManager<TBlock>;
-
-  { TLandscape }
-
-  TLandscape = class
-    constructor Create(AWidth, AHeight: Word);
-    destructor Destroy; override;
-  protected
-    { Members }
-    FWidth: Word;
-    FHeight: Word;
-    FCellWidth: Word;
-    FCellHeight: Word;
-    FBlockCache: TBlockCache;
-    FOnChange: TLandscapeChangeEvent;
-    FOnMapChanged: TMapChangedEvent;
-    FOnNewBlock: TNewBlockEvent;
-    FOnStaticInserted: TStaticChangedEvent;
-    FOnStaticDeleted: TStaticChangedEvent;
-    FOnStaticElevated: TStaticChangedEvent;
-    FOnStaticHued: TStaticChangedEvent;
-    FOpenRequests: TBits;
-    FWriteMap: TBits;
-    FDrawMap: TBits;
-    FMaxStaticID: Cardinal;
-    { Methods }
-    function GetMapBlock(AX, AY: Word): TMapBlock;
-    function GetMapCell(AX, AY: Word): TMapCell;
-    function GetNormals(AX, AY: Word): TNormals;
-    function GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
-    function GetStaticList(AX, AY: Word): TStaticItemList;
-    { Events }
-    procedure OnRemoveCachedObject(ABlock: TBlock);
-    procedure OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnDrawMapPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnInsertStaticPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnDeleteStaticPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnElevateStaticPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
-    procedure OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
-  public
-    { Fields }
-    property Width: Word read FWidth;
-    property Height: Word read FHeight;
-    property CellWidth: Word read FCellWidth;
-    property CellHeight: Word read FCellHeight;
-    property MapCell[X, Y: Word]: TMapCell read GetMapCell;
-    property StaticList[X, Y: Word]: TStaticItemList read GetStaticList;
-    property Normals[X, Y: Word]: TNormals read GetNormals;
-    property MaxStaticID: Cardinal read FMaxStaticID;
-    property OnChange: TLandscapeChangeEvent read FOnChange write FOnChange;
-    property OnMapChanged: TMapChangedEvent read FOnMapChanged write FOnMapChanged;
-    property OnNewBlock: TNewBlockEvent read FOnNewBlock write FOnNewBlock;
-    property OnStaticInserted: TStaticChangedEvent read FOnStaticInserted
-      write FOnStaticInserted;
-    property OnStaticDeleted: TStaticChangedEvent read FOnStaticDeleted
-      write FOnStaticDeleted;
-    property OnStaticElevated: TStaticChangedEvent read FOnStaticElevated
-      write FOnStaticElevated;
-    property OnStaticHued: TStaticChangedEvent read FOnStaticHued
-      write FOnStaticHued;
-    { Methods }
-    function CanWrite(AX, AY: Word): Boolean;
-    procedure FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
-      AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
-      AAdditionalTiles: TWorldItemList = nil);
-    function GetEffectiveAltitude(ATile: TMapCell): ShortInt;
-    function GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
-    procedure GetNormals(AX, AY: Word; var ANormals: TNormals);
-    procedure LoadNoDrawMap(AFileName: String);
-    procedure MoveStatic(AStatic: TStaticItem; AX, AY: Word);
-    procedure PrepareBlocks(AX1, AY1, AX2, AY2: Word);
-    procedure UpdateBlockAccess;
-    procedure UpdateWriteMap(AStream: TEnhancedMemoryStream);
-  end;
-
-  { TGLText }
-
-  TGLText = class
-    constructor Create(AFont: TGLFont; AText: String);
-  protected
-    FFont: TGLFont;
-    FText: String;
-    FWidth: Integer;
-    FHeight: Integer;
-  public
-    procedure Render(AScreenRect: TRect);
-  end;
-
-  TScreenState = (ssNormal, ssFiltered, ssGhost);
-
-  PBlockInfo = ^TBlockInfo;
-  TBlockInfo = record
-    ScreenRect: TRect;
-    DrawQuad: array[0..3,0..1] of TGLint;
-    RealQuad: array[0..3,0..1] of TGLint;
-    Item: TWorldItem;
-    HighRes: TMaterial;
-    LowRes: TMaterial;
-    Normals: PNormals;
-    State: TScreenState;
-    Highlighted: Boolean;
-    HueOverride: Boolean;
-    CheckRealQuad: Boolean;
-    Translucent: Boolean;
-    Text: TGLText;
-    Next: PBlockInfo;
-  end;
-
-  { TScreenBuffer }
-
-  TScreenBuffer = class
-    constructor Create; virtual;
-    destructor Destroy; override;
-  protected
-    { Members }
-    FCount: Cardinal;
-    FShortCuts: array[-1..10] of PBlockInfo; //-1 = last, 0 = first, 1..10 = other shortcuts
-    FShortCutsValid: Boolean;
-    FSerial: Cardinal;
-  public
-    { Methods }
-    function Add(AItem: TWorldItem): PBlockInfo;
-    procedure Clear;
-    procedure Delete(AItem: TWorldItem);
-    function Find(AScreenPosition: TPoint): PBlockInfo;
-    function GetSerial: Cardinal;
-    function Insert(AItem: TWorldItem): PBlockInfo;
-    function Iterate(var ABlockInfo: PBlockInfo): Boolean;
-    procedure UpdateShortcuts;
-    function UpdateSortOrder(AItem: TWorldItem): PBlockInfo;
-    { Events }
-    procedure OnTileRemoved(ATile: TMulBlock);
-  end;
-  
-  TStaticInfo = packed record
-    X: Word;
-    Y: Word;
-    Z: ShortInt;
-    TileID: Word;
-    Hue: Word;
-  end;
-
-implementation
-
-uses
-  UGameResources, UdmNetwork, UPackets, UPacketHandlers, Logging;
-
-function GetID(AX, AY: Word): Integer; inline;
-begin
-  Result := (AX shl 16) or AY;
-end;
-
-operator := (AVector: Tvector3_single) GLVector: TGlVector3f;
-begin
-  GLVector[0] := AVector.data[0];
-  GLVector[1] := AVector.data[1];
-  GLVector[2] := AVector.data[2];
-end;
-
-{ TLandTextureManager }
-
-constructor TLandTextureManager.Create;
-begin
-  inherited Create;
-  FArtCache := TMaterialCache.Create(1024);
-  FTexCache := TMaterialCache.Create(128);
-  FAnimCache := TMaterialCache.Create(128);
-  FUseAnims := True;
-end;
-
-destructor TLandTextureManager.Destroy;
-begin
-  FreeAndNil(FArtCache);
-  FreeAndNil(FTexCache);
-  FreeAndNil(FAnimCache);
-  inherited Destroy;
-end;
-
-function TLandTextureManager.GetArtMaterial(ATileID: Word): TMaterial;
-var
-  artEntry: TArt;
-  animData: TAnimData;
-begin
-  Result := nil;
-
-  if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
-      ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
-  begin
-    animData := ResMan.Animdata.AnimData[ATileID - $4000];
-    if (animData.FrameCount > 0) and not FAnimCache.QueryID(ATileID, Result) then
-    begin
-      Result := TAnimMaterial.Create(ATileID, animData);
-      FAnimCache.StoreID(ATileID, Result);
-    end;
-  end;
-
-  if (Result = nil) and not FArtCache.QueryID(ATileID, Result) then
-  begin
-    artEntry := TArt(ResMan.Art.Block[ATileID]);
-
-    Result := TSimpleMaterial.Create(artEntry.Graphic);
-    FArtCache.StoreID(ATileID, Result);
-
-    artEntry.Free;
-  end;
-
-  Result.AddRef;
-end;
-
-function TLandTextureManager.GetArtMaterial(ATileID: Word; AHue: THue;
-  APartialHue: Boolean): TMaterial;
-var
-  artEntry: TArt;
-  animData: TAnimData;
-  id: Integer;
-begin
-  if AHue = nil then
-  begin
-    Result := GetArtMaterial(ATileID);
-  end else
-  begin
-    Result := nil;
-    id := ATileID or (((AHue.ID + 1) and $3FFF) shl 16) or (Byte(APartialHue) shl 30);
-
-    if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
-      ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
-    begin
-      animData := ResMan.Animdata.AnimData[ATileID - $4000];
-      if (animData.FrameCount > 0) and not FAnimCache.QueryID(id, Result) then
-      begin
-        Result := TAnimMaterial.Create(ATileID, animData, AHue, APartialHue);
-        FAnimCache.StoreID(id, Result);
-      end;
-    end;
-
-    if (Result = nil) and not FArtCache.QueryID(id, Result) then
-    begin
-      artEntry := ResMan.Art.GetArt(ATileID, 0, AHue, APartialHue);
-
-      Result := TSimpleMaterial.Create(artEntry.Graphic);
-      FArtCache.StoreID(id, Result);
-
-      artEntry.Free;
-    end;
-    Result.AddRef;
-  end;
-end;
-
-function TLandTextureManager.GetStaticMaterial(AStaticItem: TStaticItem;
-  AOverrideHue: Integer = -1): TMaterial;
-var
-  staticTiledata: TStaticTiledata;
-  hue: THue;
-begin
-  staticTiledata := ResMan.Tiledata.StaticTiles[AStaticItem.TileID];
-  if AOverrideHue < 0 then
-    AOverrideHue := AStaticItem.Hue;
-
-  if AOverrideHue > 0 then
-    hue := ResMan.Hue.Hues[AOverrideHue - 1]
-  else
-    hue := nil;
-
-  Result := GetArtMaterial($4000 + AStaticItem.TileID, hue,
-    tdfPartialHue in staticTiledata.Flags);
-end;
-
-function TLandTextureManager.GetTexMaterial(ATileID: Word): TMaterial;
-var
-  texEntry: TTexture;
-  texID: Integer;
-begin
-  if not FTexCache.QueryID(ATileID, Result) then
-  begin
-    texID := ResMan.Tiledata.LandTiles[ATileID].TextureID;
-    if texID > 0 then
-    begin
-      texEntry := TTexture(ResMan.Texmaps.Block[texID]);
-
-      Result := TSimpleMaterial.Create(texEntry.Graphic);
-      FTexCache.StoreID(ATileID, Result);
-
-      texEntry.Free;
-    end else
-      Result := nil;
-  end;
-
-  if Result <> nil then
-    Result.AddRef;
-end;
-
-{ TSeperatedStaticBlock }
-
-constructor TSeperatedStaticBlock.Create(AData: TStream; AIndex: TGenericIndex;
-  AX, AY: Word);
-var
-  i: Integer;
-  item: TStaticItem;
-  block: TMemoryStream;
-begin
-  inherited Create;
-  FItems := TStaticItemList.Create(False);
-
-  FX := AX;
-  FY := AY;
-
-  for i := 0 to 63 do
-    Cells[i] := TStaticItemList.Create;
-
-  if (AData <> nil) and (AIndex.Lookup > 0) and (AIndex.Size > 0) then
-  begin
-    AData.Position := AIndex.Lookup;
-    block := TMemoryStream.Create;
-    block.CopyFrom(AData, AIndex.Size);
-    block.Position := 0;
-    for i := 1 to (AIndex.Size div 7) do
-    begin
-      item := TStaticItem.Create(Self, block, AX, AY);
-      Cells[(item.Y mod 8) * 8 + (item.X mod 8)].Add(item);
-    end;
-    block.Free;
-  end;
-end;
-
-constructor TSeperatedStaticBlock.Create(AData: TStream; AIndex: TGenericIndex);
-begin
-  Create(AData, AIndex, 0, 0);
-end;
-
-destructor TSeperatedStaticBlock.Destroy;
-var
-  i: Integer;
-begin
-  FreeAndNil(FItems);
-
-  for i := 0 to 63 do
-  begin
-    if Cells[i] <> nil then
-      FreeAndNil(Cells[i]);
-  end;
-
-  inherited Destroy;
-end;
-
-function TSeperatedStaticBlock.Clone: TSeperatedStaticBlock;
-begin
-  raise Exception.Create('TSeperatedStaticBlock.Clone is not implemented (yet).');
-  Result := nil;
-end;
-
-function TSeperatedStaticBlock.GetSize: Integer;
-begin
-  RebuildList;
-  Result := inherited GetSize;
-end;
-
-procedure TSeperatedStaticBlock.RebuildList;
-var
-  i, j, solver: Integer;
-begin
-  FItems.Clear;
-  solver := 0;
-  for i := 0 to 63 do
-  begin
-    if Cells[i] <> nil then
-    begin
-      for j := 0 to Cells[i].Count - 1 do
-      begin
-        FItems.Add(Cells[i].Items[j]);
-        TStaticItem(Cells[i].Items[j]).UpdatePriorities(
-          ResMan.Tiledata.StaticTiles[TStaticItem(Cells[i].Items[j]).TileID],
-          solver);
-        Inc(solver);
-      end;
-    end;
-  end;
-  Sort;
-end;
-
-{ TBlock }
-
-constructor TBlock.Create(AMap: TMapBlock; AStatics: TStaticBlock);
-begin
-  inherited Create;
-  FMapBlock := AMap;
-  FStaticBlock := AStatics;
-end;
-
-destructor TBlock.Destroy;
-begin
-  if FMapBlock <> nil then FreeAndNil(FMapBlock);
-  if FStaticBlock <> nil then FreeAndNil(FStaticBlock);
-  inherited Destroy;
-end;
-
-procedure TBlock.UpdateBlockAcess(ALandscape: TLandscape);
-var
-  staticItem: TStaticItem;
-  i: Integer;
-begin
-  for i := Low(FMapBlock.Cells) to High(FMapBlock.Cells) do
-  begin
-    FMapBlock.Cells[i].CanBeEdited := ALandscape.CanWrite(FMapBlock.Cells[i].X,
-      FMapBlock.Cells[i].Y);
-  end;
-
-  if FStaticBlock is TSeperatedStaticBlock then
-    TSeperatedStaticBlock(FStaticBlock).RebuildList; //fill items
-
-  for i := 0 to FStaticBlock.Items.Count - 1 do
-  begin
-    staticItem := FStaticBlock.Items[i];
-    staticItem.CanBeEdited := ALandscape.CanWrite(staticItem.X,
-      staticItem.Y);
-  end;
-end;
-
-{ TLandscape }
-
-constructor TLandscape.Create(AWidth, AHeight: Word);
-var
-  i: Integer;
-begin
-  inherited Create;
-  FWidth := AWidth;
-  FHeight := AHeight;
-  FCellWidth := FWidth * 8;
-  FCellHeight := FHeight * 8;
-  FBlockCache := TBlockCache.Create(256);
-  FBlockCache.OnRemoveObject := @OnRemoveCachedObject;
-
-  FOnChange := nil;
-  FOnNewBlock := nil;
-  FOnStaticDeleted := nil;
-  FOnStaticElevated := nil;
-  FOnStaticHued := nil;
-  FOnStaticInserted := nil;
-
-  FOpenRequests := TBits.Create(FWidth * FHeight);
-  FOpenRequests.Clearall; //set all to 0
-  FWriteMap := TBits.Create(FCellWidth * FCellHeight);
-  for i := 0 to FWriteMap.Size - 1 do
-    FWriteMap[i] := True;
-
-  FMaxStaticID := Min(Min(ResMan.Animdata.AnimCount, ResMan.Tiledata.StaticCount),
-    ResMan.Art.EntryCount - $4000);
-  Logger.Send([lcClient, lcInfo], 'Landscape recognizes $%x StaticTile IDs.',
-    [FMaxStaticId]);
-
-  FDrawMap := TBits.Create($4000 + FMaxStaticID);
-  for i := 0 to FDrawMap.Size - 1 do
-    FDrawMap[i] := True;
-
-  RegisterPacketHandler($04, TPacketHandler.Create(0, @OnBlocksPacket));
-  RegisterPacketHandler($06, TPacketHandler.Create(8, @OnDrawMapPacket));
-  RegisterPacketHandler($07, TPacketHandler.Create(10, @OnInsertStaticPacket));
-  RegisterPacketHandler($08, TPacketHandler.Create(10, @OnDeleteStaticPacket));
-  RegisterPacketHandler($09, TPacketHandler.Create(11, @OnElevateStaticPacket));
-  RegisterPacketHandler($0A, TPacketHandler.Create(14, @OnMoveStaticPacket));
-  RegisterPacketHandler($0B, TPacketHandler.Create(12, @OnHueStaticPacket));
-end;
-
-destructor TLandscape.Destroy;
-begin
-  if FBlockCache <> nil then
-  begin
-    FBlockCache.OnRemoveObject := nil;
-    FreeAndNil(FBlockCache);
-  end;
-
-  FreeAndNil(FOpenRequests);
-  FreeAndNil(FWriteMap);
-  FreeAndNil(FDrawMap);
-  
-  RegisterPacketHandler($04, nil);
-  RegisterPacketHandler($06, nil);
-  RegisterPacketHandler($07, nil);
-  RegisterPacketHandler($08, nil);
-  RegisterPacketHandler($09, nil);
-  RegisterPacketHandler($0A, nil);
-  RegisterPacketHandler($0B, nil);
-  
-  inherited Destroy;
-end;
-
-function TLandscape.GetMapBlock(AX, AY: Word): TMapBlock;
-var
-  block: TBlock;
-begin
-  Result := nil;
-  if (AX >= 0) and (AX < FWidth) and (AY >= 0) and (AY < FHeight) then
-  begin
-    if FBlockCache.QueryID(GetID(AX, AY), block) then
-      Result := block.Map;
-  end;
-end;
-
-function TLandscape.GetMapCell(AX, AY: Word): TMapCell;
-var
-  block: TMapBlock;
-begin
-  Result := nil;
-  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
-  begin
-    block := GetMapBlock(AX div 8, AY div 8);
-    if block <> nil then
-      Result := block.Cells[(AY mod 8) * 8 + AX mod 8];
-  end;
-end;
-
-function TLandscape.GetNormals(AX, AY: Word): TNormals;
-begin
-  GetNormals(AX, AY, Result);
-end;
-
-function TLandscape.GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
-var
-  block: TBlock;
-begin
-  Result := nil;
-  if (AX >= 0) and (AX < FWidth) and (AY >= 0) and (AY < FHeight) then
-  begin
-    if FBlockCache.QueryID(GetID(AX, AY), block) then
-      Result := TSeperatedStaticBlock(block.Static);
-  end;
-end;
-
-function TLandscape.GetStaticList(AX, AY: Word): TStaticItemList;
-var
-  block: TSeperatedStaticBlock;
-begin
-  Result := nil;
-  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
-  begin
-    block := GetStaticBlock(AX div 8, AY div 8);
-    if block <> nil then
-      Result := block.Cells[(AY mod 8) * 8 + AX mod 8];
-  end;
-end;
-
-procedure TLandscape.OnRemoveCachedObject(ABlock: TBlock);
-begin
-  if ABlock <> nil then
-    dmNetwork.Send(TFreeBlockPacket.Create(ABlock.Map.X, ABlock.Map.Y));
-end;
-
-procedure TLandscape.OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
-var
-  index: TGenericIndex;
-  map: TMapBlock;
-  statics: TStaticBlock;
-  coords: TBlockCoords;
-  count: Word;
-  id: Integer;
-  block: TBlock;
-begin
-  index := TGenericIndex.Create(nil);
-  while ABuffer.Position < ABuffer.Size do
-  begin
-    ABuffer.Read(coords, SizeOf(TBlockCoords));
-    id := GetID(coords.X, coords.Y);
-
-    map := TMapBlock.Create(ABuffer, coords.X, coords.Y);
-    count := ABuffer.ReadWord;
-    if count > 0 then
-      index.Lookup := ABuffer.Position
-    else
-      index.Lookup := -1;
-    index.Size := count * 7;
-    statics := TSeperatedStaticBlock.Create(ABuffer, index, coords.X, coords.Y);
-
-    FBlockCache.RemoveID(id);
-    block := TBlock.Create(map, statics);
-    block.UpdateBlockAcess(Self);
-    FBlockCache.StoreID(id, block);
-
-    FOpenRequests[coords.Y * FWidth + coords.X] := False;
-
-    if Assigned(FOnNewBlock) then FOnNewBlock(block);
-  end;
-  index.Free;
-end;
-
-procedure TLandscape.OnDrawMapPacket(ABuffer: TEnhancedMemoryStream);
-var
-  x, y: Word;
-  cell: TMapCell;
-begin
-  x := ABuffer.ReadWord;
-  y := ABuffer.ReadWord;
-  cell := GetMapCell(x, y);
-  if cell <> nil then
-  begin
-    cell.Altitude := ABuffer.ReadShortInt;
-    cell.TileID := ABuffer.ReadWord;
-    if Assigned(FOnMapChanged) then FOnMapChanged(cell);
-  end;
-end;
-
-procedure TLandscape.OnInsertStaticPacket(ABuffer: TEnhancedMemoryStream);
-var
-  x, y: Word;
-  block: TSeperatedStaticBlock;
-  staticItem: TStaticItem;
-  targetStaticList: TStaticItemList;
-  i: Integer;
-begin
-  x := ABuffer.ReadWord;
-  y := ABuffer.ReadWord;
-  block := GetStaticBlock(x div 8, y div 8);
-  if block <> nil then
-  begin
-    staticItem := TStaticItem.Create(nil, nil, 0, 0);
-    staticItem.X := x;
-    staticItem.Y := y;
-    staticItem.Z := ABuffer.ReadShortInt;
-    staticItem.TileID := ABuffer.ReadWord;
-    staticItem.Hue := ABuffer.ReadWord;
-    targetStaticList := block.Cells[(y mod 8) * 8 + x mod 8];
-    targetStaticList.Add(staticItem);
-    for i := 0 to targetStaticList.Count - 1 do
-      targetStaticList.Items[i].UpdatePriorities(
-        ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
-        i);
-    targetStaticList.Sort(@CompareStaticItems);
-    staticItem.Owner := block;
-    staticItem.CanBeEdited := CanWrite(x, y);
-
-    if Assigned(FOnStaticInserted) then FOnStaticInserted(staticItem);
-  end;
-end;
-
-procedure TLandscape.OnDeleteStaticPacket(ABuffer: TEnhancedMemoryStream);
-var
-  block: TSeperatedStaticBlock;
-  i: Integer;
-  statics: TStaticItemList;
-  staticInfo: TStaticInfo;
-  staticItem: TStaticItem;
-begin
-  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
-  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
-  if block <> nil then
-  begin
-    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
-    for i := 0 to statics.Count - 1 do
-    begin
-      staticItem := statics.Items[i];
-      if (staticItem.Z = staticInfo.Z) and
-         (staticItem.TileID = staticInfo.TileID) and
-         (staticItem.Hue = staticInfo.Hue) then
-      begin
-        if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
-        staticItem.Delete;
-        statics.Delete(i);
-
-        Break;
-      end;
-    end;
-  end;
-end;
-
-procedure TLandscape.OnElevateStaticPacket(ABuffer: TEnhancedMemoryStream);
-var
-  block: TSeperatedStaticBlock;
-  i,j : Integer;
-  statics: TStaticItemList;
-  staticInfo: TStaticInfo;
-  staticItem: TStaticItem;
-begin
-  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
-  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
-  if block <> nil then
-  begin
-    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
-    for i := 0 to statics.Count - 1 do
-    begin
-      staticItem := statics.Items[i];
-      if (staticItem.Z = staticInfo.Z) and
-         (staticItem.TileID = staticInfo.TileID) and
-         (staticItem.Hue = staticInfo.Hue) then
-      begin
-        staticItem.Z := ABuffer.ReadShortInt;
-        for j := 0 to statics.Count - 1 do
-          statics.Items[j].UpdatePriorities(
-            ResMan.Tiledata.StaticTiles[statics.Items[j].TileID],
-            j);
-        statics.Sort(@CompareStaticItems);
-
-        if Assigned(FOnStaticElevated) then FOnStaticElevated(staticItem);
-
-        Break;
-      end;
-    end;
-  end;
-end;
-
-procedure TLandscape.OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
-var
-  sourceBlock, targetBlock: TSeperatedStaticBlock;
-  i: Integer;
-  statics: TStaticItemList;
-  staticInfo: TStaticInfo;
-  staticItem: TStaticItem;
-  newX, newY: Word;
-begin
-  staticItem := nil;
-  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
-  newX := EnsureRange(ABuffer.ReadWord, 0, FCellWidth - 1);
-  newY := EnsureRange(ABuffer.ReadWord, 0, FCellHeight - 1);
-
-  sourceBlock := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
-  targetBlock := GetStaticBlock(newX div 8, newY div 8);
-  if sourceBlock <> nil then
-  begin
-    statics := sourceBlock.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
-    i := 0;
-    while (i < statics.Count) and (staticItem = nil) do
-    begin
-      staticItem := statics.Items[i];
-      if (staticItem.Z <> staticInfo.Z) or
-         (staticItem.TileID <> staticInfo.TileID) or
-         (staticItem.Hue <> staticInfo.Hue) then
-      begin
-        staticItem := nil;
-      end;
-      Inc(i);
-    end;
-
-    if staticItem <> nil then
-    begin
-      if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
-      staticItem.Delete;
-      statics.Remove(staticItem);
-    end;
-  end;
-
-  if targetBlock <> nil then
-  begin
-    staticItem := TStaticItem.Create(nil, nil, 0, 0);
-    staticItem.X := newX;
-    staticItem.Y := newY;
-    staticItem.Z := staticInfo.Z;
-    staticItem.TileID := staticInfo.TileID;
-    staticItem.Hue := staticInfo.Hue;
-    statics := targetBlock.Cells[(newY mod 8) * 8 + newX mod 8];
-    statics.Add(staticItem);
-    for i := 0 to statics.Count - 1 do
-      TStaticItem(statics.Items[i]).UpdatePriorities(
-        ResMan.Tiledata.StaticTiles[TStaticItem(statics.Items[i]).TileID],
-        i);
-    statics.Sort(@CompareStaticItems);
-    staticItem.Owner := targetBlock;
-    staticItem.CanBeEdited := CanWrite(newX, newY);
-
-    if Assigned(FOnStaticInserted) then FOnStaticInserted(staticItem);
-  end;
-end;
-
-procedure TLandscape.OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
-var
-  block: TSeperatedStaticBlock;
-  i : Integer;
-  statics: TStaticItemList;
-  staticInfo: TStaticInfo;
-  staticItem: TStaticItem;
-begin
-  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
-  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
-  if block <> nil then
-  begin
-    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
-    for i := 0 to statics.Count - 1 do
-    begin
-      staticItem := statics.Items[i];
-      if (staticItem.Z = staticInfo.Z) and
-         (staticItem.TileID = staticInfo.TileID) and
-         (staticItem.Hue = staticInfo.Hue) then
-      begin
-        staticItem.Hue := ABuffer.ReadWord;
-        if Assigned(FOnStaticHued) then FOnStaticHued(staticItem);
-        Break;
-      end;
-    end;
-  end;
-end;
-
-function TLandscape.CanWrite(AX, AY: Word): Boolean;
-begin
-  Result := FWriteMap[AX * FCellHeight + AY];
-end;
-
-procedure TLandscape.FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
-  AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
-  AAdditionalTiles: TWorldItemList = nil);
-var
-  drawMapCell: TMapCell;
-  drawStatics: TStaticItemList;
-  i, x, y: Integer;
-  tempDrawList: TWorldItemList;
-  staticTileData: TStaticTiledata;
-begin
-  ADrawList.Clear;
-  tempDrawList := TWorldItemList.Create(False);;
-  for x := AX to AX + AWidth do
-  begin
-    for y := AY to AY + AWidth do
-    begin
-      if AMap then
-      begin
-        drawMapCell := GetMapCell(x, y);
-        if (drawMapCell <> nil) and (ANoDraw or FDrawMap[drawMapCell.TileID]) then
-        begin
-          drawMapCell.Priority := GetEffectiveAltitude(drawMapCell);
-          drawMapCell.PriorityBonus := 0;
-          drawMapCell.PrioritySolver := 0;
-          tempDrawList.Add(drawMapCell);
-        end;
-      end;
-
-      if AStatics then
-      begin
-        drawStatics := GetStaticList(x, y);
-        if drawStatics <> nil then
-          for i := 0 to drawStatics.Count - 1 do
-          begin
-            staticTileData := ResMan.Tiledata.StaticTiles[drawStatics[i].TileID];
-            if ANoDraw or FDrawMap[drawStatics[i].TileID + $4000] then
-            begin
-              drawStatics[i].UpdatePriorities(staticTileData,
-                ADrawList.GetSerial);
-              tempDrawList.Add(drawStatics[i]);
-            end;
-          end;
-      end;
-    end;
-  end;
-
-  for i := 0 to AAdditionalTiles.Count - 1 do
-    tempDrawList.Add(AAdditionalTiles[i]);
-
-  tempDrawList.Sort(@CompareWorldItems);
-  for i := 0 to tempDrawList.Count - 1 do
-    ADrawList.Add(TWorldItem(tempDrawList[i]));
-  tempDrawList.Free;
-end;
-
-function TLandscape.GetEffectiveAltitude(ATile: TMapCell): ShortInt;
-var
-  north, west, south, east: ShortInt;
-begin
-  north := ATile.Altitude;
-  west := GetLandAlt(ATile.X, ATile.Y + 1, north);
-  south := GetLandAlt(ATile.X + 1, ATile.Y + 1, north);
-  east := GetLandAlt(ATile.X + 1, ATile.Y, north);
-
-  if Abs(north - south) >= Abs(west - east) then
-    Result := Min(north, south) + Abs(west - east) div 2
-  else
-    Result := Min(north, south) + Abs(north - south) div 2;
-end;
-
-function TLandscape.GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
-var
-  cell: TMapCell;
-begin
-  cell := MapCell[AX, AY];
-  if cell <> nil then
-    Result := cell.Altitude
-  else
-    Result := ADefault;
-end;
-
-procedure TLandscape.GetNormals(AX, AY: Word; var ANormals: TNormals);
-type
-  _Normals = array[0..3] of Tvector3_single;
-var
-  cells: array[0..2, 0..2] of _Normals;
-  north, west, south, east: Tvector3_single;
-  i, j: Integer;
-
-  function Normalize(const AVector: Tvector3_single): Tvector3_single; inline;
-  begin
-    Result := AVector / AVector.length;
-  end;
-
-  function GetPlainNormals(X, Y: SmallInt): _Normals;
-  var
-    cell: TMapCell;
-    north, west, south, east: ShortInt;
-    u, v: Tvector3_single;
-  begin
-    cell := GetMapCell(X, Y);
-    if cell <> nil then
-    begin
-      north := cell.Altitude;
-      west := GetLandAlt(cell.X, cell.Y + 1, north);
-      south := GetLandAlt(cell.X + 1, cell.Y + 1, north);
-      east := GetLandAlt(cell.X + 1, cell.Y, north);
-    end else
-    begin
-      north := 0;
-      west := 0;
-      east := 0;
-      south := 0;
-    end;
-
-    if (north = west) and (west = east) and (north = south) then
-    begin
-      Result[0].init(0, 0, 1);
-      Result[1].init(0, 0, 1);
-      Result[2].init(0, 0, 1);
-      Result[3].init(0, 0, 1);
-    end else
-    begin
-      u.init(-22, 22, (north - east) * 4);
-      v.init(-22, -22, (west - north) * 4);
-      Result[0] := Normalize(u >< v);
-
-      u.init(22, 22, (east - south) * 4);
-      v.init(-22, 22, (north - east) * 4);
-      Result[1] := Normalize(u >< v);
-
-      u.init(22, -22, (south - west) * 4);
-      v.init(22, 22, (east - south) * 4);
-      Result[2] := Normalize(u >< v);
-
-      u.init(-22, -22, (west - north) * 4);
-      v.init(22, -22, (south - west) * 4);
-      Result[3] := Normalize(u >< v);
-    end;
-  end;
-begin
-  for i := 0 to 2 do
-    for j := 0 to 2 do
-      cells[i, j] := GetPlainNormals(AX - 1 + i, AY - 1 + j);
-
-  north := cells[0, 0][2];
-  west := cells[0, 1][1];
-  east := cells[1, 0][3];
-  south := cells[1, 1][0];
-  ANormals[0] := Normalize(north + west + east + south);
-
-  north := cells[1, 0][2];
-  west := cells[1, 1][1];
-  east := cells[2, 0][3];
-  south := cells[2, 1][0];
-  ANormals[1] := Normalize(north + west + east + south);
-
-  north := cells[1, 1][2];
-  west := cells[1, 2][1];
-  east := cells[2, 1][3];
-  south := cells[2, 2][0];
-  ANormals[2] := Normalize(north + west + east + south);
-
-  north := cells[0, 1][2];
-  west := cells[0, 2][1];
-  east := cells[1, 1][3];
-  south := cells[1, 2][0];
-  ANormals[3] := Normalize(north + west + east + south);
-end;
-
-procedure TLandscape.LoadNoDrawMap(AFileName: String);
-var
-  noDrawFile: TextFile;
-  line, ids1, ids2: String;
-  i, id1, id2, splitPos: Integer;
-begin
-  AssignFile(noDrawFile, AFileName);
-  Reset(noDrawFile);
-  while not EOF(noDrawFile) do
-  begin
-    ReadLn(noDrawFile, line);
-    if (Length(line) > 0) and (line[1] in ['S', 'T']) then
-    begin
-      splitPos := Pos('-', line);
-      if splitPos > 1 then
-      begin
-        ids1 := Copy(line, 2, splitPos - 2);
-        ids2 := Copy(line, splitPos + 1, Length(line));
-        if TryStrToInt(ids1, id1) and TryStrToInt(ids2, id2) then
-        begin
-          if line[1] = 'S' then
-          begin
-            Inc(id1, $4000);
-            Inc(id2, $4000);
-          end;
-
-          for i := id1 to id2 do
-            if i < FDrawMap.Size then
-              FDrawMap[i] := False;
-        end;
-      end else
-      begin
-        ids1 := Copy(line, 2, Length(line));
-        if TryStrToInt(ids1, id1) then
-        begin
-          if line[1] = 'S' then
-            Inc(id1, $4000);
-          if id1 < FDrawMap.Size then
-            FDrawMap[id1] := False;
-        end;
-      end;
-    end;
-  end;
-  CloseFile(noDrawFile);
-end;
-
-procedure TLandscape.MoveStatic(AStatic: TStaticItem; AX, AY: Word);
-var
-  sourceBlock, targetBlock: TSeperatedStaticBlock;
-  targetStaticList: TStaticItemList;
-  i: Integer;
-begin
-  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
-  begin
-    sourceBlock := AStatic.Owner as TSeperatedStaticBlock;
-    targetBlock := GetStaticBlock(AX div 8, AY div 8);
-    if (sourceBlock <> nil) and (targetBlock <> nil) then
-    begin
-      sourceBlock.Cells[(AStatic.Y mod 8) * 8 + AStatic.X mod 8].Remove(AStatic);
-      targetStaticList := targetBlock.Cells[(AY mod 8) * 8 + AX mod 8];
-      targetStaticList.Add(AStatic);
-      for i := 0 to targetStaticList.Count - 1 do
-        targetStaticList.Items[i].UpdatePriorities(
-          ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
-          i);
-      targetStaticList.Sort(@CompareStaticItems);
-      AStatic.UpdatePos(AX, AY, AStatic.Z);
-      AStatic.Owner := targetBlock;
-    end;
-  end;
-end;
-
-procedure TLandscape.PrepareBlocks(AX1, AY1, AX2, AY2: Word);
-var
-  x, y, i: Integer;
-  coords: TBlockCoordsArray;
-  block: TBlock;
-begin
-  AX1 := EnsureRange(AX1, 0, FWidth - 1);
-  AY1 := EnsureRange(AY1, 0, FHeight - 1);
-  AX2 := EnsureRange(AX2, 0, FWidth - 1);
-  AY2 := EnsureRange(AY2, 0, FHeight - 1);
-
-  SetLength(coords, 0);
-  for x := AX1 to AX2 do
-  begin
-    for y := AY1 to AY2 do
-    begin
-      if (not FOpenRequests[y * FWidth + x]) and
-         (not FBlockCache.QueryID(GetID(x, y), block)) then
-      begin
-        SetLength(coords, Length(coords) + 1);
-        i := High(coords);
-        coords[i].X := x;
-        coords[i].Y := y;
-        FOpenRequests[y * FWidth + x] := True;
-      end;
-    end;
-  end;
-  if Length(coords) > 0 then
-    dmNetwork.Send(TRequestBlocksPacket.Create(coords));
-end;
-
-procedure TLandscape.UpdateBlockAccess;
-var
-  cacheEntry: TBlockCache.PCacheEntry;
-begin
-  cacheEntry := nil;
-  while FBlockCache.Iterate(cacheEntry) do
-    if cacheEntry^.Obj <> nil then
-      cacheEntry^.Obj.UpdateBlockAcess(Self);
-end;
-
-procedure TLandscape.UpdateWriteMap(AStream: TEnhancedMemoryStream);
-var
-  x1, y1, x2, y2: Word;
-  i, areaCount, cellX, cellY: Integer;
-begin
-  Logger.EnterMethod([lcLandscape, lcDebug], 'TLandscape.UpdateWriteMap');
-
-  areaCount := AStream.ReadWord;
-  Logger.Send([lcLandscape, lcDebug], 'AreaCount', areaCount);
-
-  if areaCount > 0 then
-  begin
-    FWriteMap.Clearall;
-    for i := 0 to areaCount - 1 do
-    begin
-      x1 := AStream.ReadWord;
-      y1 := AStream.ReadWord;
-      x2 := AStream.ReadWord;
-      y2 := AStream.ReadWord;
-      for cellX := x1 to x2 do
-        for cellY := y1 to y2 do
-          FWriteMap[cellX * FCellHeight + cellY] := True;
-    end;
-  end else
-    for i := 0 to FWriteMap.Size - 1 do
-      FWriteMap[i] := True;
-
-  Logger.Send([lcLandscape, lcDebug], 'WriteMap @ 0,0', FWriteMap[0]);
-
-  UpdateBlockAccess;
-  Logger.ExitMethod([lcLandscape, lcDebug], 'TLandscape.UpdateWriteMap');
-end;
-
-{ TMaterial }
-
-constructor TMaterial.Create;
-begin
-  FRefCount := 1;
-end;
-
-destructor TMaterial.Destroy;
-begin
-  FreeAndNil(FGraphic);
-  inherited Destroy;
-end;
-
-class procedure TMaterial.CalculateTextureDimensions(ACaps: TGLTextureCaps;
-  ARealWidth, ARealHeight: Integer; out AWidth, AHeight: Integer);
-begin
-  if ACaps.NonPowerOfTwo then
-  begin
-    AWidth := ARealWidth;
-    AHeight := ARealHeight;
-  end else
-  begin
-    if IsPow2(ARealWidth) then
-      AWidth := ARealWidth
-    else
-      AWidth := NextPow2(ARealWidth);
-
-    if IsPow2(ARealHeight) then
-      AHeight := ARealHeight
-    else
-      AHeight := NextPow2(ARealHeight);
-  end;
-end;
-
-function TMaterial.GenerateTexture(AImage: TBaseImage): TGLuint;
-begin
-  Result := CreateGLTextureFromImage(AImage.ImageDataPointer^);
-  glBindTexture(GL_TEXTURE_2D, Result);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-end;
-
-procedure TMaterial.AddRef;
-begin
-  Inc(FRefCount);
-end;
-
-procedure TMaterial.DelRef;
-begin
-  Dec(FRefCount);
-  if FRefCount < 1 then
-    Free;
-end;
-
-function TMaterial.HitTest(AX, AY: Integer): Boolean;
-var
-  pixel: TColor32Rec;
-begin
-  Result := False;
-  if InRange(AX, 0, FGraphic.Width - 1) and
-     InRange(AY, 0, FGraphic.Height - 1) then
-  begin
-    pixel := GetPixel32(FGraphic.ImageDataPointer^, AX, AY);
-    if pixel.A > 0 then
-      Result := True;
-  end;
-end;
-
-function TMaterial.CanBeRemoved: Boolean;
-begin
-  Result := FRefCount <= 1;
-end;
-
-procedure TMaterial.RemoveFromCache;
-begin
-  DelRef;
-end;
-
-{ TScreenBuffer }
-
-constructor TScreenBuffer.Create;
-begin
-  inherited Create;
-  FCount := 0;
-  FSerial := 0;
-  UpdateShortcuts;
-end;
-
-destructor TScreenBuffer.Destroy;
-begin
-  Clear;
-  inherited Destroy;
-end;
-
-function TScreenBuffer.Add(AItem: TWorldItem): PBlockInfo;
-begin
-  New(Result);
-  AItem.Locked := True;
-  AItem.OnDestroy.RegisterEvent(@OnTileRemoved);
-  Result^.Item := AItem;
-  Result^.HighRes := nil;
-  Result^.LowRes := nil;
-  Result^.Normals := nil;
-  Result^.State := ssNormal;
-  Result^.Highlighted := False;
-  Result^.Translucent := False;
-  Result^.Text := nil;
-  Result^.Next := nil;
-
-  if FShortCuts[0] = nil then //First element
-  begin
-    FShortCuts[0] := Result;
-    FShortCuts[-1] := Result; //Last element
-  end else
-  begin
-    FShortCuts[-1]^.Next := Result;
-    FShortCuts[-1] := Result;
-  end;
-
-  Inc(FCount);
-end;
-
-procedure TScreenBuffer.Clear;
-var
-  current, next: PBlockInfo;
-begin
-  current := FShortCuts[0];
-  while current <> nil do
-  begin
-    next := current^.Next;
-    current^.Item.Locked := False;
-    current^.Item.OnDestroy.UnregisterEvent(@OnTileRemoved);
-    if current^.Normals <> nil then Dispose(current^.Normals);
-    if current^.HighRes <> nil then current^.HighRes.DelRef;
-    if current^.LowRes <> nil then current^.LowRes.DelRef;
-    current^.Text.Free;
-    Dispose(current);
-    current := next;
-  end;
-  FShortCuts[0] := nil;
-  FShortCuts[-1] := nil;
-
-  FCount := 0;
-  FSerial := 0;
-
-  UpdateShortcuts;
-end;
-
-procedure TScreenBuffer.Delete(AItem: TWorldItem);
-var
-  current, last, next: PBlockInfo;
-begin
-  last := nil;
-  current := FShortCuts[0];
-  while current <> nil do
-  begin
-    if current^.Item = AItem then
-    begin
-      if FShortCuts[-1] = current then FShortCuts[-1] := last;
-      if FShortCuts[0] = current then FShortCuts[0] := current^.Next;
-      if last <> nil then last^.Next := current^.Next;
-
-      if current^.Normals <> nil then Dispose(current^.Normals);
-      if current^.HighRes <> nil then current^.HighRes.DelRef;
-      if current^.LowRes <> nil then current^.LowRes.DelRef;
-      current^.Text.Free;
-
-      Dispose(current);
-      Dec(FCount);
-      FShortCutsValid := False;
-      next := nil;
-    end else
-      next := current^.Next;
-
-    last := current;
-    current := next;
-  end;
-end;
-
-function TScreenBuffer.Find(AScreenPosition: TPoint): PBlockInfo;
-var
-  current: PBlockInfo;
-  buff: array[0..3] of GLuint;
-begin
-  Result := nil;
-  current := FShortCuts[0];
-  while current <> nil do //search the last matching tile
-  begin
-    if (current^.State = ssNormal) and
-       PtInRect(current^.ScreenRect, AScreenPosition)then
-    begin
-      if current^.CheckRealQuad then
-      begin
-        //OpenGL hit test
-        //We use the "real quad" here to prevent the draw-preview from
-        //intercepting with our actual tiles (which are "hidden" then).
-        glSelectBuffer(4, @buff[0]);
-        glViewport(current^.ScreenRect.Left, current^.ScreenRect.Top,
-          current^.ScreenRect.Right, current^.ScreenRect.Bottom);
-        glRenderMode(GL_SELECT);
-        glInitNames;
-        glPushName(0);
-
-        glPushMatrix;
-          glMatrixMode(GL_PROJECTION);
-          glLoadIdentity;
-          gluOrtho2D(AScreenPosition.x, AScreenPosition.x + 1,
-            AScreenPosition.y + 1, AScreenPosition.y);
-          glMatrixMode(GL_MODELVIEW);
-          glLoadIdentity;
-
-          glBegin(GL_QUADS);
-            glVertex2iv(@current^.RealQuad[0]);
-            glVertex2iv(@current^.RealQuad[3]);
-            glVertex2iv(@current^.RealQuad[2]);
-            glVertex2iv(@current^.RealQuad[1]);
-          glEnd;
-        glPopMatrix;
-        glFlush;
-
-        if glRenderMode(GL_RENDER) > 0 then //glRenderMode now returns the number of hits
-          Result := current;
-      end else
-      if current^.LowRes.HitTest(AScreenPosition.x - current^.ScreenRect.Left,
-         AScreenPosition.y - current^.ScreenRect.Top) then
-        Result := current;
-    end;
-    current := current^.Next;
-  end;
-end;
-
-function TScreenBuffer.GetSerial: Cardinal;
-begin
-  Result := FSerial;
-  Inc(FSerial);
-end;
-
-function TScreenBuffer.Insert(AItem: TWorldItem): PBlockInfo;
-var
-  current: PBlockInfo;
-  shortcut: Integer;
-begin
-  if not FShortCutsValid then
-    UpdateShortcuts;
-
-  New(Result);
-  AItem.Locked := True;
-  AItem.OnDestroy.RegisterEvent(@OnTileRemoved);
-  Result^.Item := AItem;
-  Result^.HighRes := nil;
-  Result^.LowRes := nil;
-  Result^.Normals := nil;
-  Result^.State := ssNormal;
-  Result^.Highlighted := False;
-  Result^.Translucent := False;
-  Result^.Text := nil;
-
-  if (FShortCuts[0] = nil) or (CompareWorldItems(AItem, FShortCuts[0]^.Item) < 0) then
-  begin
-    if FShortCuts[0] = nil then
-      FShortCuts[-1] := Result;  //Update last item
-
-    Result^.Next := FShortCuts[0];
-    FShortCuts[0] := Result;
-  end else
-  begin
-    //find best entry point
-    shortcut := 0;
-    while (shortcut <= 10) and (FShortCuts[shortcut] <> nil) and
-      (CompareWorldItems(AItem, FShortCuts[shortcut]^.Item) >= 0) do
-    begin
-      current := FShortCuts[shortcut];
-      Inc(shortcut);
-    end;
-
-    //now find the real match
-    while (current^.Next <> nil) and
-          (CompareWorldItems(AItem, current^.Next^.Item) > 0) do
-    begin
-      current := current^.Next;
-    end;
-
-    if FShortCuts[-1] = current^.Next then
-      FShortCuts[-1] := Result;  //Update last item
-
-    Result^.Next := current^.Next;
-    current^.Next := Result;
-  end;
-
-  Inc(FCount);
-end;
-
-function TScreenBuffer.Iterate(var ABlockInfo: PBlockInfo): Boolean;
-begin
-  if ABlockInfo = nil then
-    ABlockInfo := FShortCuts[0]
-  else
-    ABlockInfo := ABlockInfo^.Next;
-  Result := ABlockInfo <> nil;
-end;
-
-procedure TScreenBuffer.UpdateShortcuts;
-var
-  shortcut, step, nextStep, stepSize: Integer;
-  blockInfo: PBlockInfo;
-begin
-  if FCount < 10 then
-  begin
-    for shortcut := 1 to 10 do
-      FShortCuts[shortcut] := nil;
-  end
-  else if FShortCuts[0] <> nil then
-  begin
-    stepSize := FCount div 10;
-    nextStep := stepSize;
-    step := 0;
-    shortcut := 1;
-    blockInfo := FShortCuts[0];
-    repeat
-      if step = nextStep then
-      begin
-        FShortCuts[shortcut] := blockInfo;
-        Inc(shortcut);
-        Inc(nextStep, stepSize);
-      end;
-
-      Inc(step);
-
-      FShortCuts[-1] := blockInfo; //update last known item
-      blockInfo := blockInfo^.Next;
-    until (blockInfo = nil);
-  end;
-  FShortCutsValid := True;
-end;
-
-function TScreenBuffer.UpdateSortOrder(AItem: TWorldItem): PBlockInfo;
-var
-  newNodePosition, oldNode, oldNodePrev, current: PBlockInfo;
-begin
-  newNodePosition := nil;
-  oldNode := nil;
-  oldNodePrev := nil;
-  current := FShortCuts[0];
-
-  while (current <> nil) and ((oldNode = nil) or (newNodePosition = nil)) do
-  begin
-    if current^.Item = AItem then
-      oldNode := current
-    else if oldNode = nil then
-      oldNodePrev := current;
-
-    if newNodePosition = nil then
-    begin
-      if (current^.Next = nil) or (CompareWorldItems(AItem, current^.Next^.Item) < 0) then
-        newNodePosition := current;
-    end;
-
-    current := current^.Next;
-  end;
-
-  //oldNode = nil, if the change happend out-of-screen
-  if (oldNode <> nil ) and (oldNode <> newNodePosition) then
-  begin
-    if oldNodePrev <> oldNode then
-    begin
-      if oldNodePrev = nil then
-        FShortCuts[0] := oldNode^.Next
-      else
-        oldNodePrev^.Next := oldNode^.Next;
-    end;
-
-    if (newNodePosition = FShortCuts[0]) and (CompareWorldItems(AItem, FShortCuts[0]^.Item) < 0) then
-    begin
-      oldNode^.Next := FShortCuts[0];
-      FShortCuts[0] := oldNode;
-    end else
-    begin
-      oldNode^.Next := newNodePosition^.Next;
-      newNodePosition^.Next := oldNode;
-    end;
-  end;
-
-  Result := oldNode;
-end;
-
-procedure TScreenBuffer.OnTileRemoved(ATile: TMulBlock);
-begin
-  Delete(TWorldItem(ATile));
-end;
-
-{ TGLText }
-
-constructor TGLText.Create(AFont: TGLFont; AText: String);
-begin
-  FFont := AFont;
-  FText := AText;
-  FWidth := FFont.GetTextWidth(AText);
-  FHeight := FFont.GetTextHeight('A');
-end;
-
-procedure TGLText.Render(AScreenRect: TRect);
-var
-  x, y: Integer;
-begin
-  y := AScreenRect.Top + (AScreenRect.Bottom - AScreenRect.Top - FHeight) div 2;
-  x := AScreenRect.Left + (AScreenRect.Right - AScreenRect.Left - FWidth) div 2;
-  FFont.DrawText(x, y, FText);
-end;
-
-{ TSimpleMaterial }
-
-constructor TSimpleMaterial.Create(AGraphic: TBaseImage);
-var
-  caps: TGLTextureCaps;
-begin
-  inherited Create;
-  FRealWidth := AGraphic.Width;
-  FRealHeight := AGraphic.Height;
-
-  GetGLTextureCaps(caps);
-  CalculateTextureDimensions(caps, FRealWidth, FRealHeight, FWidth, FHeight);
-  FGraphic := TMultiImage.CreateFromParams(FWidth, FHeight, ifA8R8G8B8, 1);
-  AGraphic.CopyTo(0, 0, FRealWidth, FRealHeight, FGraphic, 0, 0);
-  FTexture := GenerateTexture(FGraphic);
-end;
-
-destructor TSimpleMaterial.Destroy;
-begin
-  if FTexture <> 0 then glDeleteTextures(1, @FTexture);
-  inherited Destroy;
-end;
-
-function TSimpleMaterial.GetTexture: GLuint;
-begin
-  Result := FTexture;
-end;
-
-{ TAnimMaterial }
-
-constructor TAnimMaterial.Create(ABaseID: Word; AAnimData: TAnimData;
-  AHue: THue = nil; APartialHue: Boolean = False);
-var
-  i: Integer;
-  art: array of TArt;
-  caps: TGLTextureCaps;
-begin
-  inherited Create;
-
-  FAnimData := AAnimData;
-
-  FRealWidth := 0;
-  FRealHeight := 0;
-
-  SetLength(FTextures, AAnimData.FrameCount);
-  SetLength(art, AAnimData.FrameCount);
-
-  for i := 0 to AAnimData.FrameCount - 1 do
-  begin
-    art[i] := ResMan.Art.GetArt(ABaseID + AAnimData.FrameData[i], 0, AHue,
-      APartialHue);
-
-    if art[i].Graphic.Width > FRealWidth then
-      FRealWidth := art[i].Graphic.Width;
-    if art[i].Graphic.Height > FRealHeight then
-      FRealHeight := art[i].Graphic.Height;
-  end;
-
-  GetGLTextureCaps(caps);
-  CalculateTextureDimensions(caps, FRealWidth, FRealHeight, FWidth, FHeight);
-  FGraphic := TMultiImage.CreateFromParams(FWidth, FHeight, ifA8R8G8B8,
-    AAnimData.FrameCount);
-
-  for i := 0 to AAnimData.FrameCount - 1 do
-  begin
-    FGraphic.ActiveImage := i;
-    art[i].Graphic.CopyTo(0, 0, art[i].Graphic.Width, art[i].Graphic.Height,
-      FGraphic, 0, 0);
-    FTextures[i] := GenerateTexture(FGraphic);
-    art[i].Free;
-  end;
-
-  FGraphic.ActiveImage := 0;
-  FActiveFrame := 0;
-  FNextChange := GetTickCount + AAnimData.FrameStart * 100;
-end;
-
-destructor TAnimMaterial.Destroy;
-begin
-  glDeleteTextures(Length(FTextures), @FTextures[0]);
-  inherited Destroy;
-end;
-
-function TAnimMaterial.GetTexture: GLuint;
-begin
-  if FNextChange <= GetTickCount then
-  begin
-    FActiveFrame := (FActiveFrame + 1) mod FAnimData.FrameCount;
-    FGraphic.ActiveImage := FActiveFrame;
-
-    if FActiveFrame = 0 then
-      FNextChange := GetTickCount + FAnimData.FrameStart * 100
-    else
-      FNextChange:= GetTickCount + FAnimData.FrameInterval * 100;
-  end;
-
-  Result := FTextures[FActiveFrame];
-end;
-
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2009 Andreas Schneider
+ *)
+unit ULandscape;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  SysUtils, Classes, math, matrix, LCLIntf, GL, GLu, ImagingOpenGL, Imaging,
+  ImagingClasses, ImagingTypes, ImagingUtility,
+  UGenericIndex, UMap, UStatics, UArt, UTexture, UTiledata, UHue, UWorldItem,
+  UMulBlock, UAnimData,
+  UEnhancedMemoryStream, UGLFont,
+  UCacheManager;
+
+type
+  TGlVector3f = array[0..2] of GLfloat;
+  PNormals = ^TNormals;
+  TNormals = array[0..3] of TGlVector3f;
+  PRadarBlock = ^TRadarBlock;
+  TRadarBlock = array[0..7, 0..7] of Word;
+  
+  { TMaterial }
+  
+  TMaterial = class(ICacheable)
+    constructor Create;
+    destructor Destroy; override;
+  protected
+    FRefCount: Integer;
+    FWidth: Integer;
+    FHeight: Integer;
+    FRealWidth: Integer;
+    FRealHeight: Integer;
+    FGraphic: TMultiImage;
+    class procedure CalculateTextureDimensions(ACaps: TGLTextureCaps; ARealWidth,
+      ARealHeight: Integer; out AWidth, AHeight: Integer);
+    function GenerateTexture(AImage: TBaseImage): TGLuint;
+    function GetTexture: GLuint; virtual; abstract;
+  public
+    property Width: Integer read FWidth;
+    property Height: Integer read FHeight;
+    property RealWidth: Integer read FRealWidth;
+    property RealHeight: Integer read FRealHeight;
+    property Texture: GLuint read GetTexture;
+
+    procedure AddRef;
+    procedure DelRef;
+    function HitTest(AX, AY: Integer): Boolean;
+
+    {ICacheable}
+    function CanBeRemoved: Boolean;
+    procedure RemoveFromCache;
+  end;
+
+  { TSimpleMaterial }
+
+  TSimpleMaterial = class(TMaterial)
+    constructor Create(AGraphic: TBaseImage);
+    destructor Destroy; override;
+  protected
+    FTexture: TGLuint;
+    function GetTexture: GLuint; override;
+  end;
+
+  { TAnimMaterial }
+
+  TAnimMaterial = class(TMaterial)
+    constructor Create(ABaseID: Word; AAnimData: TAnimData; AHue: THue = nil;
+      APartialHue: Boolean = False);
+    destructor Destroy; override;
+  protected
+    FActiveFrame: Byte;
+    FNextChange: DWord;
+    FAnimData: TAnimData;
+    FTextures: array of TGLuint;
+    function GetTexture: GLuint; override;
+  end;
+
+  TMaterialCache = specialize TCacheManager<TMaterial>;
+  
+  { TLandTextureManager }
+  
+  TLandTextureManager = class
+    constructor Create;
+    destructor Destroy; override;
+  protected
+    FArtCache: TMaterialCache;
+    FTexCache: TMaterialCache;
+    FAnimCache: TMaterialCache;
+    FUseAnims: Boolean;
+  public
+    property UseAnims: Boolean read FUseAnims write FUseAnims;
+    function GetArtMaterial(ATileID: Word): TMaterial; overload;
+    function GetArtMaterial(ATileID: Word; AHue: THue;
+      APartialHue: Boolean): TMaterial; overload;
+    function GetStaticMaterial(AStaticItem: TStaticItem;
+      AOverrideHue: Integer = -1): TMaterial;
+    function GetTexMaterial(ATileID: Word): TMaterial;
+  end;
+
+ { TSeperatedStaticBlock }
+
+  TSeperatedStaticBlock = class(TStaticBlock)
+    constructor Create(AData: TStream; AIndex: TGenericIndex; AX, AY: Word); overload;
+    constructor Create(AData: TStream; AIndex: TGenericIndex); overload;
+    destructor Destroy; override;
+  public
+    Cells: array[0..63] of TStaticItemList;
+    { Methods }
+    function Clone: TSeperatedStaticBlock; override;
+    function GetSize: Integer; override;
+    procedure RebuildList;
+  end;
+
+  TLandscape = class;
+  
+  { TBlock }
+
+  TBlock = class
+    constructor Create(AMap: TMapBlock; AStatics: TStaticBlock);
+    destructor Destroy; override;
+  protected
+    { Fields }
+    FMapBlock: TMapBlock;
+    FStaticBlock: TStaticBlock;
+  public
+    { Fields }
+    property Map: TMapBlock read FMapBlock;
+    property Static: TStaticBlock read FStaticBlock;
+    { Methods }
+    procedure UpdateBlockAcess(ALandscape: TLandscape);
+  end;
+  
+  TLandscapeChangeEvent = procedure of object;
+  TMapChangedEvent = procedure(AMapCell: TMapCell) of object;
+  TNewBlockEvent = procedure(ABlock: TBlock) of object;
+  TStaticChangedEvent = procedure(AStaticItem: TStaticItem) of object;
+
+  TScreenBuffer = class;
+  TBlockCache = specialize TCacheManager<TBlock>;
+
+  { TLandscape }
+
+  TLandscape = class
+    constructor Create(AWidth, AHeight: Word);
+    destructor Destroy; override;
+  protected
+    { Members }
+    FWidth: Word;
+    FHeight: Word;
+    FCellWidth: Word;
+    FCellHeight: Word;
+    FBlockCache: TBlockCache;
+    FOnChange: TLandscapeChangeEvent;
+    FOnMapChanged: TMapChangedEvent;
+    FOnNewBlock: TNewBlockEvent;
+    FOnStaticInserted: TStaticChangedEvent;
+    FOnStaticDeleted: TStaticChangedEvent;
+    FOnStaticElevated: TStaticChangedEvent;
+    FOnStaticHued: TStaticChangedEvent;
+    FOpenRequests: TBits;
+    FWriteMap: TBits;
+    FDrawMap: TBits;
+    FMaxStaticID: Cardinal;
+    { Methods }
+    function GetMapBlock(AX, AY: Word): TMapBlock;
+    function GetMapCell(AX, AY: Word): TMapCell;
+    function GetNormals(AX, AY: Word): TNormals;
+    function GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
+    function GetStaticList(AX, AY: Word): TStaticItemList;
+    { Events }
+    procedure OnRemoveCachedObject(ABlock: TBlock);
+    procedure OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnDrawMapPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnInsertStaticPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnDeleteStaticPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnElevateStaticPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
+    procedure OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
+  public
+    { Fields }
+    property Width: Word read FWidth;
+    property Height: Word read FHeight;
+    property CellWidth: Word read FCellWidth;
+    property CellHeight: Word read FCellHeight;
+    property MapCell[X, Y: Word]: TMapCell read GetMapCell;
+    property StaticList[X, Y: Word]: TStaticItemList read GetStaticList;
+    property Normals[X, Y: Word]: TNormals read GetNormals;
+    property MaxStaticID: Cardinal read FMaxStaticID;
+    property OnChange: TLandscapeChangeEvent read FOnChange write FOnChange;
+    property OnMapChanged: TMapChangedEvent read FOnMapChanged write FOnMapChanged;
+    property OnNewBlock: TNewBlockEvent read FOnNewBlock write FOnNewBlock;
+    property OnStaticInserted: TStaticChangedEvent read FOnStaticInserted
+      write FOnStaticInserted;
+    property OnStaticDeleted: TStaticChangedEvent read FOnStaticDeleted
+      write FOnStaticDeleted;
+    property OnStaticElevated: TStaticChangedEvent read FOnStaticElevated
+      write FOnStaticElevated;
+    property OnStaticHued: TStaticChangedEvent read FOnStaticHued
+      write FOnStaticHued;
+    { Methods }
+    function CanWrite(AX, AY: Word): Boolean;
+    procedure FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
+      AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
+      AAdditionalTiles: TWorldItemList = nil);
+    function GetEffectiveAltitude(ATile: TMapCell): ShortInt;
+    function GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
+    procedure GetNormals(AX, AY: Word; var ANormals: TNormals);
+    procedure LoadNoDrawMap(AFileName: String);
+    procedure MoveStatic(AStatic: TStaticItem; AX, AY: Word);
+    procedure PrepareBlocks(AX1, AY1, AX2, AY2: Word);
+    procedure UpdateBlockAccess;
+    procedure UpdateWriteMap(AStream: TEnhancedMemoryStream);
+  end;
+
+  { TGLText }
+
+  TGLText = class
+    constructor Create(AFont: TGLFont; AText: String);
+  protected
+    FFont: TGLFont;
+    FText: String;
+    FWidth: Integer;
+    FHeight: Integer;
+  public
+    procedure Render(AScreenRect: TRect);
+  end;
+
+  TScreenState = (ssNormal, ssFiltered, ssGhost);
+  TWalkRestriction = (wrNone, wrCanWalk, wrCannotWalk);
+
+  PBlockInfo = ^TBlockInfo;
+  TBlockInfo = record
+    ScreenRect: TRect;
+    DrawQuad: array[0..3,0..1] of TGLint;
+    RealQuad: array[0..3,0..1] of TGLint;
+    Item: TWorldItem;
+    HighRes: TMaterial;
+    LowRes: TMaterial;
+    Normals: PNormals;
+    State: TScreenState;
+    Highlighted: Boolean;
+    HueOverride: Boolean;
+    CheckRealQuad: Boolean;
+    Translucent: Boolean;
+    WalkRestriction: TWalkRestriction;
+    Text: TGLText;
+    Next: PBlockInfo;
+  end;
+
+  { TScreenBuffer }
+
+  TScreenBuffer = class
+    constructor Create; virtual;
+    destructor Destroy; override;
+  protected
+    { Members }
+    FCount: Cardinal;
+    FShortCuts: array[-1..10] of PBlockInfo; //-1 = last, 0 = first, 1..10 = other shortcuts
+    FShortCutsValid: Boolean;
+    FSerial: Cardinal;
+  public
+    { Methods }
+    function Add(AItem: TWorldItem): PBlockInfo;
+    procedure Clear;
+    procedure Delete(AItem: TWorldItem);
+    function Find(AScreenPosition: TPoint): PBlockInfo;
+    function GetSerial: Cardinal;
+    function Insert(AItem: TWorldItem): PBlockInfo;
+    function Iterate(var ABlockInfo: PBlockInfo): Boolean;
+    procedure UpdateShortcuts;
+    function UpdateSortOrder(AItem: TWorldItem): PBlockInfo;
+    { Events }
+    procedure OnTileRemoved(ATile: TMulBlock);
+  end;
+  
+  TStaticInfo = packed record
+    X: Word;
+    Y: Word;
+    Z: ShortInt;
+    TileID: Word;
+    Hue: Word;
+  end;
+
+implementation
+
+uses
+  UGameResources, UdmNetwork, UPackets, UPacketHandlers, Logging;
+
+function GetID(AX, AY: Word): Integer; inline;
+begin
+  Result := (AX shl 16) or AY;
+end;
+
+operator := (AVector: Tvector3_single) GLVector: TGlVector3f;
+begin
+  GLVector[0] := AVector.data[0];
+  GLVector[1] := AVector.data[1];
+  GLVector[2] := AVector.data[2];
+end;
+
+{ TLandTextureManager }
+
+constructor TLandTextureManager.Create;
+begin
+  inherited Create;
+  FArtCache := TMaterialCache.Create(1024);
+  FTexCache := TMaterialCache.Create(128);
+  FAnimCache := TMaterialCache.Create(128);
+  FUseAnims := True;
+end;
+
+destructor TLandTextureManager.Destroy;
+begin
+  FreeAndNil(FArtCache);
+  FreeAndNil(FTexCache);
+  FreeAndNil(FAnimCache);
+  inherited Destroy;
+end;
+
+function TLandTextureManager.GetArtMaterial(ATileID: Word): TMaterial;
+var
+  artEntry: TArt;
+  animData: TAnimData;
+begin
+  Result := nil;
+
+  if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
+      ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
+  begin
+    animData := ResMan.Animdata.AnimData[ATileID - $4000];
+    if (animData.FrameCount > 0) and not FAnimCache.QueryID(ATileID, Result) then
+    begin
+      Result := TAnimMaterial.Create(ATileID, animData);
+      FAnimCache.StoreID(ATileID, Result);
+    end;
+  end;
+
+  if (Result = nil) and not FArtCache.QueryID(ATileID, Result) then
+  begin
+    artEntry := TArt(ResMan.Art.Block[ATileID]);
+
+    Result := TSimpleMaterial.Create(artEntry.Graphic);
+    FArtCache.StoreID(ATileID, Result);
+
+    artEntry.Free;
+  end;
+
+  Result.AddRef;
+end;
+
+function TLandTextureManager.GetArtMaterial(ATileID: Word; AHue: THue;
+  APartialHue: Boolean): TMaterial;
+var
+  artEntry: TArt;
+  animData: TAnimData;
+  id: Integer;
+begin
+  if AHue = nil then
+  begin
+    Result := GetArtMaterial(ATileID);
+  end else
+  begin
+    Result := nil;
+    id := ATileID or (((AHue.ID + 1) and $3FFF) shl 16) or (Byte(APartialHue) shl 30);
+
+    if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
+      ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
+    begin
+      animData := ResMan.Animdata.AnimData[ATileID - $4000];
+      if (animData.FrameCount > 0) and not FAnimCache.QueryID(id, Result) then
+      begin
+        Result := TAnimMaterial.Create(ATileID, animData, AHue, APartialHue);
+        FAnimCache.StoreID(id, Result);
+      end;
+    end;
+
+    if (Result = nil) and not FArtCache.QueryID(id, Result) then
+    begin
+      artEntry := ResMan.Art.GetArt(ATileID, 0, AHue, APartialHue);
+
+      Result := TSimpleMaterial.Create(artEntry.Graphic);
+      FArtCache.StoreID(id, Result);
+
+      artEntry.Free;
+    end;
+    Result.AddRef;
+  end;
+end;
+
+function TLandTextureManager.GetStaticMaterial(AStaticItem: TStaticItem;
+  AOverrideHue: Integer = -1): TMaterial;
+var
+  staticTiledata: TStaticTiledata;
+  hue: THue;
+begin
+  staticTiledata := ResMan.Tiledata.StaticTiles[AStaticItem.TileID];
+  if AOverrideHue < 0 then
+    AOverrideHue := AStaticItem.Hue;
+
+  if AOverrideHue > 0 then
+    hue := ResMan.Hue.Hues[AOverrideHue - 1]
+  else
+    hue := nil;
+
+  Result := GetArtMaterial($4000 + AStaticItem.TileID, hue,
+    tdfPartialHue in staticTiledata.Flags);
+end;
+
+function TLandTextureManager.GetTexMaterial(ATileID: Word): TMaterial;
+var
+  texEntry: TTexture;
+  texID: Integer;
+begin
+  if not FTexCache.QueryID(ATileID, Result) then
+  begin
+    texID := ResMan.Tiledata.LandTiles[ATileID].TextureID;
+    if texID > 0 then
+    begin
+      texEntry := TTexture(ResMan.Texmaps.Block[texID]);
+
+      Result := TSimpleMaterial.Create(texEntry.Graphic);
+      FTexCache.StoreID(ATileID, Result);
+
+      texEntry.Free;
+    end else
+      Result := nil;
+  end;
+
+  if Result <> nil then
+    Result.AddRef;
+end;
+
+{ TSeperatedStaticBlock }
+
+constructor TSeperatedStaticBlock.Create(AData: TStream; AIndex: TGenericIndex;
+  AX, AY: Word);
+var
+  i: Integer;
+  item: TStaticItem;
+  block: TMemoryStream;
+begin
+  inherited Create;
+  FItems := TStaticItemList.Create(False);
+
+  FX := AX;
+  FY := AY;
+
+  for i := 0 to 63 do
+    Cells[i] := TStaticItemList.Create;
+
+  if (AData <> nil) and (AIndex.Lookup > 0) and (AIndex.Size > 0) then
+  begin
+    AData.Position := AIndex.Lookup;
+    block := TMemoryStream.Create;
+    block.CopyFrom(AData, AIndex.Size);
+    block.Position := 0;
+    for i := 1 to (AIndex.Size div 7) do
+    begin
+      item := TStaticItem.Create(Self, block, AX, AY);
+      Cells[(item.Y mod 8) * 8 + (item.X mod 8)].Add(item);
+    end;
+    block.Free;
+  end;
+end;
+
+constructor TSeperatedStaticBlock.Create(AData: TStream; AIndex: TGenericIndex);
+begin
+  Create(AData, AIndex, 0, 0);
+end;
+
+destructor TSeperatedStaticBlock.Destroy;
+var
+  i: Integer;
+begin
+  FreeAndNil(FItems);
+
+  for i := 0 to 63 do
+  begin
+    if Cells[i] <> nil then
+      FreeAndNil(Cells[i]);
+  end;
+
+  inherited Destroy;
+end;
+
+function TSeperatedStaticBlock.Clone: TSeperatedStaticBlock;
+begin
+  raise Exception.Create('TSeperatedStaticBlock.Clone is not implemented (yet).');
+  Result := nil;
+end;
+
+function TSeperatedStaticBlock.GetSize: Integer;
+begin
+  RebuildList;
+  Result := inherited GetSize;
+end;
+
+procedure TSeperatedStaticBlock.RebuildList;
+var
+  i, j, solver: Integer;
+begin
+  FItems.Clear;
+  solver := 0;
+  for i := 0 to 63 do
+  begin
+    if Cells[i] <> nil then
+    begin
+      for j := 0 to Cells[i].Count - 1 do
+      begin
+        FItems.Add(Cells[i].Items[j]);
+        TStaticItem(Cells[i].Items[j]).UpdatePriorities(
+          ResMan.Tiledata.StaticTiles[TStaticItem(Cells[i].Items[j]).TileID],
+          solver);
+        Inc(solver);
+      end;
+    end;
+  end;
+  Sort;
+end;
+
+{ TBlock }
+
+constructor TBlock.Create(AMap: TMapBlock; AStatics: TStaticBlock);
+begin
+  inherited Create;
+  FMapBlock := AMap;
+  FStaticBlock := AStatics;
+end;
+
+destructor TBlock.Destroy;
+begin
+  if FMapBlock <> nil then FreeAndNil(FMapBlock);
+  if FStaticBlock <> nil then FreeAndNil(FStaticBlock);
+  inherited Destroy;
+end;
+
+procedure TBlock.UpdateBlockAcess(ALandscape: TLandscape);
+var
+  staticItem: TStaticItem;
+  i: Integer;
+begin
+  for i := Low(FMapBlock.Cells) to High(FMapBlock.Cells) do
+  begin
+    FMapBlock.Cells[i].CanBeEdited := ALandscape.CanWrite(FMapBlock.Cells[i].X,
+      FMapBlock.Cells[i].Y);
+  end;
+
+  if FStaticBlock is TSeperatedStaticBlock then
+    TSeperatedStaticBlock(FStaticBlock).RebuildList; //fill items
+
+  for i := 0 to FStaticBlock.Items.Count - 1 do
+  begin
+    staticItem := FStaticBlock.Items[i];
+    staticItem.CanBeEdited := ALandscape.CanWrite(staticItem.X,
+      staticItem.Y);
+  end;
+end;
+
+{ TLandscape }
+
+constructor TLandscape.Create(AWidth, AHeight: Word);
+var
+  i: Integer;
+begin
+  inherited Create;
+  FWidth := AWidth;
+  FHeight := AHeight;
+  FCellWidth := FWidth * 8;
+  FCellHeight := FHeight * 8;
+  FBlockCache := TBlockCache.Create(256);
+  FBlockCache.OnRemoveObject := @OnRemoveCachedObject;
+
+  FOnChange := nil;
+  FOnNewBlock := nil;
+  FOnStaticDeleted := nil;
+  FOnStaticElevated := nil;
+  FOnStaticHued := nil;
+  FOnStaticInserted := nil;
+
+  FOpenRequests := TBits.Create(FWidth * FHeight);
+  FOpenRequests.Clearall; //set all to 0
+  FWriteMap := TBits.Create(FCellWidth * FCellHeight);
+  for i := 0 to FWriteMap.Size - 1 do
+    FWriteMap[i] := True;
+
+  FMaxStaticID := Min(Min(ResMan.Animdata.AnimCount, ResMan.Tiledata.StaticCount),
+    ResMan.Art.EntryCount - $4000);
+  Logger.Send([lcClient, lcInfo], 'Landscape recognizes $%x StaticTile IDs.',
+    [FMaxStaticId]);
+
+  FDrawMap := TBits.Create($4000 + FMaxStaticID);
+  for i := 0 to FDrawMap.Size - 1 do
+    FDrawMap[i] := True;
+
+  RegisterPacketHandler($04, TPacketHandler.Create(0, @OnBlocksPacket));
+  RegisterPacketHandler($06, TPacketHandler.Create(8, @OnDrawMapPacket));
+  RegisterPacketHandler($07, TPacketHandler.Create(10, @OnInsertStaticPacket));
+  RegisterPacketHandler($08, TPacketHandler.Create(10, @OnDeleteStaticPacket));
+  RegisterPacketHandler($09, TPacketHandler.Create(11, @OnElevateStaticPacket));
+  RegisterPacketHandler($0A, TPacketHandler.Create(14, @OnMoveStaticPacket));
+  RegisterPacketHandler($0B, TPacketHandler.Create(12, @OnHueStaticPacket));
+end;
+
+destructor TLandscape.Destroy;
+begin
+  if FBlockCache <> nil then
+  begin
+    FBlockCache.OnRemoveObject := nil;
+    FreeAndNil(FBlockCache);
+  end;
+
+  FreeAndNil(FOpenRequests);
+  FreeAndNil(FWriteMap);
+  FreeAndNil(FDrawMap);
+  
+  RegisterPacketHandler($04, nil);
+  RegisterPacketHandler($06, nil);
+  RegisterPacketHandler($07, nil);
+  RegisterPacketHandler($08, nil);
+  RegisterPacketHandler($09, nil);
+  RegisterPacketHandler($0A, nil);
+  RegisterPacketHandler($0B, nil);
+  
+  inherited Destroy;
+end;
+
+function TLandscape.GetMapBlock(AX, AY: Word): TMapBlock;
+var
+  block: TBlock;
+begin
+  Result := nil;
+  if (AX >= 0) and (AX < FWidth) and (AY >= 0) and (AY < FHeight) then
+  begin
+    if FBlockCache.QueryID(GetID(AX, AY), block) then
+      Result := block.Map;
+  end;
+end;
+
+function TLandscape.GetMapCell(AX, AY: Word): TMapCell;
+var
+  block: TMapBlock;
+begin
+  Result := nil;
+  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
+  begin
+    block := GetMapBlock(AX div 8, AY div 8);
+    if block <> nil then
+      Result := block.Cells[(AY mod 8) * 8 + AX mod 8];
+  end;
+end;
+
+function TLandscape.GetNormals(AX, AY: Word): TNormals;
+begin
+  GetNormals(AX, AY, Result);
+end;
+
+function TLandscape.GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
+var
+  block: TBlock;
+begin
+  Result := nil;
+  if (AX >= 0) and (AX < FWidth) and (AY >= 0) and (AY < FHeight) then
+  begin
+    if FBlockCache.QueryID(GetID(AX, AY), block) then
+      Result := TSeperatedStaticBlock(block.Static);
+  end;
+end;
+
+function TLandscape.GetStaticList(AX, AY: Word): TStaticItemList;
+var
+  block: TSeperatedStaticBlock;
+begin
+  Result := nil;
+  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
+  begin
+    block := GetStaticBlock(AX div 8, AY div 8);
+    if block <> nil then
+      Result := block.Cells[(AY mod 8) * 8 + AX mod 8];
+  end;
+end;
+
+procedure TLandscape.OnRemoveCachedObject(ABlock: TBlock);
+begin
+  if ABlock <> nil then
+    dmNetwork.Send(TFreeBlockPacket.Create(ABlock.Map.X, ABlock.Map.Y));
+end;
+
+procedure TLandscape.OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
+var
+  index: TGenericIndex;
+  map: TMapBlock;
+  statics: TStaticBlock;
+  coords: TBlockCoords;
+  count: Word;
+  id: Integer;
+  block: TBlock;
+begin
+  index := TGenericIndex.Create(nil);
+  while ABuffer.Position < ABuffer.Size do
+  begin
+    ABuffer.Read(coords, SizeOf(TBlockCoords));
+    id := GetID(coords.X, coords.Y);
+
+    map := TMapBlock.Create(ABuffer, coords.X, coords.Y);
+    count := ABuffer.ReadWord;
+    if count > 0 then
+      index.Lookup := ABuffer.Position
+    else
+      index.Lookup := -1;
+    index.Size := count * 7;
+    statics := TSeperatedStaticBlock.Create(ABuffer, index, coords.X, coords.Y);
+
+    FBlockCache.RemoveID(id);
+    block := TBlock.Create(map, statics);
+    block.UpdateBlockAcess(Self);
+    FBlockCache.StoreID(id, block);
+
+    FOpenRequests[coords.Y * FWidth + coords.X] := False;
+
+    if Assigned(FOnNewBlock) then FOnNewBlock(block);
+  end;
+  index.Free;
+end;
+
+procedure TLandscape.OnDrawMapPacket(ABuffer: TEnhancedMemoryStream);
+var
+  x, y: Word;
+  cell: TMapCell;
+begin
+  x := ABuffer.ReadWord;
+  y := ABuffer.ReadWord;
+  cell := GetMapCell(x, y);
+  if cell <> nil then
+  begin
+    cell.Altitude := ABuffer.ReadShortInt;
+    cell.TileID := ABuffer.ReadWord;
+    if Assigned(FOnMapChanged) then FOnMapChanged(cell);
+  end;
+end;
+
+procedure TLandscape.OnInsertStaticPacket(ABuffer: TEnhancedMemoryStream);
+var
+  x, y: Word;
+  block: TSeperatedStaticBlock;
+  staticItem: TStaticItem;
+  targetStaticList: TStaticItemList;
+  i: Integer;
+begin
+  x := ABuffer.ReadWord;
+  y := ABuffer.ReadWord;
+  block := GetStaticBlock(x div 8, y div 8);
+  if block <> nil then
+  begin
+    staticItem := TStaticItem.Create(nil, nil, 0, 0);
+    staticItem.X := x;
+    staticItem.Y := y;
+    staticItem.Z := ABuffer.ReadShortInt;
+    staticItem.TileID := ABuffer.ReadWord;
+    staticItem.Hue := ABuffer.ReadWord;
+    targetStaticList := block.Cells[(y mod 8) * 8 + x mod 8];
+    targetStaticList.Add(staticItem);
+    for i := 0 to targetStaticList.Count - 1 do
+      targetStaticList.Items[i].UpdatePriorities(
+        ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
+        i);
+    targetStaticList.Sort(@CompareStaticItems);
+    staticItem.Owner := block;
+    staticItem.CanBeEdited := CanWrite(x, y);
+
+    if Assigned(FOnStaticInserted) then FOnStaticInserted(staticItem);
+  end;
+end;
+
+procedure TLandscape.OnDeleteStaticPacket(ABuffer: TEnhancedMemoryStream);
+var
+  block: TSeperatedStaticBlock;
+  i: Integer;
+  statics: TStaticItemList;
+  staticInfo: TStaticInfo;
+  staticItem: TStaticItem;
+begin
+  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
+  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
+  if block <> nil then
+  begin
+    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
+    for i := 0 to statics.Count - 1 do
+    begin
+      staticItem := statics.Items[i];
+      if (staticItem.Z = staticInfo.Z) and
+         (staticItem.TileID = staticInfo.TileID) and
+         (staticItem.Hue = staticInfo.Hue) then
+      begin
+        if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
+        staticItem.Delete;
+        statics.Delete(i);
+
+        Break;
+      end;
+    end;
+  end;
+end;
+
+procedure TLandscape.OnElevateStaticPacket(ABuffer: TEnhancedMemoryStream);
+var
+  block: TSeperatedStaticBlock;
+  i,j : Integer;
+  statics: TStaticItemList;
+  staticInfo: TStaticInfo;
+  staticItem: TStaticItem;
+begin
+  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
+  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
+  if block <> nil then
+  begin
+    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
+    for i := 0 to statics.Count - 1 do
+    begin
+      staticItem := statics.Items[i];
+      if (staticItem.Z = staticInfo.Z) and
+         (staticItem.TileID = staticInfo.TileID) and
+         (staticItem.Hue = staticInfo.Hue) then
+      begin
+        staticItem.Z := ABuffer.ReadShortInt;
+        for j := 0 to statics.Count - 1 do
+          statics.Items[j].UpdatePriorities(
+            ResMan.Tiledata.StaticTiles[statics.Items[j].TileID],
+            j);
+        statics.Sort(@CompareStaticItems);
+
+        if Assigned(FOnStaticElevated) then FOnStaticElevated(staticItem);
+
+        Break;
+      end;
+    end;
+  end;
+end;
+
+procedure TLandscape.OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
+var
+  sourceBlock, targetBlock: TSeperatedStaticBlock;
+  i: Integer;
+  statics: TStaticItemList;
+  staticInfo: TStaticInfo;
+  staticItem: TStaticItem;
+  newX, newY: Word;
+begin
+  staticItem := nil;
+  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
+  newX := EnsureRange(ABuffer.ReadWord, 0, FCellWidth - 1);
+  newY := EnsureRange(ABuffer.ReadWord, 0, FCellHeight - 1);
+
+  sourceBlock := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
+  targetBlock := GetStaticBlock(newX div 8, newY div 8);
+  if sourceBlock <> nil then
+  begin
+    statics := sourceBlock.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
+    i := 0;
+    while (i < statics.Count) and (staticItem = nil) do
+    begin
+      staticItem := statics.Items[i];
+      if (staticItem.Z <> staticInfo.Z) or
+         (staticItem.TileID <> staticInfo.TileID) or
+         (staticItem.Hue <> staticInfo.Hue) then
+      begin
+        staticItem := nil;
+      end;
+      Inc(i);
+    end;
+
+    if staticItem <> nil then
+    begin
+      if Assigned(FOnStaticDeleted) then FOnStaticDeleted(staticItem);
+      staticItem.Delete;
+      statics.Remove(staticItem);
+    end;
+  end;
+
+  if targetBlock <> nil then
+  begin
+    staticItem := TStaticItem.Create(nil, nil, 0, 0);
+    staticItem.X := newX;
+    staticItem.Y := newY;
+    staticItem.Z := staticInfo.Z;
+    staticItem.TileID := staticInfo.TileID;
+    staticItem.Hue := staticInfo.Hue;
+    statics := targetBlock.Cells[(newY mod 8) * 8 + newX mod 8];
+    statics.Add(staticItem);
+    for i := 0 to statics.Count - 1 do
+      TStaticItem(statics.Items[i]).UpdatePriorities(
+        ResMan.Tiledata.StaticTiles[TStaticItem(statics.Items[i]).TileID],
+        i);
+    statics.Sort(@CompareStaticItems);
+    staticItem.Owner := targetBlock;
+    staticItem.CanBeEdited := CanWrite(newX, newY);
+
+    if Assigned(FOnStaticInserted) then FOnStaticInserted(staticItem);
+  end;
+end;
+
+procedure TLandscape.OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
+var
+  block: TSeperatedStaticBlock;
+  i : Integer;
+  statics: TStaticItemList;
+  staticInfo: TStaticInfo;
+  staticItem: TStaticItem;
+begin
+  ABuffer.Read(staticInfo, SizeOf(TStaticInfo));
+  block := GetStaticBlock(staticInfo.X div 8, staticInfo.Y div 8);
+  if block <> nil then
+  begin
+    statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
+    for i := 0 to statics.Count - 1 do
+    begin
+      staticItem := statics.Items[i];
+      if (staticItem.Z = staticInfo.Z) and
+         (staticItem.TileID = staticInfo.TileID) and
+         (staticItem.Hue = staticInfo.Hue) then
+      begin
+        staticItem.Hue := ABuffer.ReadWord;
+        if Assigned(FOnStaticHued) then FOnStaticHued(staticItem);
+        Break;
+      end;
+    end;
+  end;
+end;
+
+function TLandscape.CanWrite(AX, AY: Word): Boolean;
+begin
+  Result := FWriteMap[AX * FCellHeight + AY];
+end;
+
+procedure TLandscape.FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
+  AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
+  AAdditionalTiles: TWorldItemList = nil);
+var
+  drawMapCell: TMapCell;
+  drawStatics: TStaticItemList;
+  i, x, y: Integer;
+  tempDrawList: TWorldItemList;
+  staticTileData: TStaticTiledata;
+begin
+  ADrawList.Clear;
+  tempDrawList := TWorldItemList.Create(False);;
+  for x := AX to AX + AWidth do
+  begin
+    for y := AY to AY + AWidth do
+    begin
+      if AMap then
+      begin
+        drawMapCell := GetMapCell(x, y);
+        if (drawMapCell <> nil) and (ANoDraw or FDrawMap[drawMapCell.TileID]) then
+        begin
+          drawMapCell.Priority := GetEffectiveAltitude(drawMapCell);
+          drawMapCell.PriorityBonus := 0;
+          drawMapCell.PrioritySolver := 0;
+          tempDrawList.Add(drawMapCell);
+        end;
+      end;
+
+      if AStatics then
+      begin
+        drawStatics := GetStaticList(x, y);
+        if drawStatics <> nil then
+          for i := 0 to drawStatics.Count - 1 do
+          begin
+            staticTileData := ResMan.Tiledata.StaticTiles[drawStatics[i].TileID];
+            if ANoDraw or FDrawMap[drawStatics[i].TileID + $4000] then
+            begin
+              drawStatics[i].UpdatePriorities(staticTileData,
+                ADrawList.GetSerial);
+              tempDrawList.Add(drawStatics[i]);
+            end;
+          end;
+      end;
+    end;
+  end;
+
+  for i := 0 to AAdditionalTiles.Count - 1 do
+    tempDrawList.Add(AAdditionalTiles[i]);
+
+  tempDrawList.Sort(@CompareWorldItems);
+  for i := 0 to tempDrawList.Count - 1 do
+    ADrawList.Add(TWorldItem(tempDrawList[i]));
+  tempDrawList.Free;
+end;
+
+function TLandscape.GetEffectiveAltitude(ATile: TMapCell): ShortInt;
+var
+  north, west, south, east: ShortInt;
+begin
+  north := ATile.Altitude;
+  west := GetLandAlt(ATile.X, ATile.Y + 1, north);
+  south := GetLandAlt(ATile.X + 1, ATile.Y + 1, north);
+  east := GetLandAlt(ATile.X + 1, ATile.Y, north);
+
+  if Abs(north - south) >= Abs(west - east) then
+    Result := Min(north, south) + Abs(west - east) div 2
+  else
+    Result := Min(north, south) + Abs(north - south) div 2;
+end;
+
+function TLandscape.GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
+var
+  cell: TMapCell;
+begin
+  cell := MapCell[AX, AY];
+  if cell <> nil then
+    Result := cell.Altitude
+  else
+    Result := ADefault;
+end;
+
+procedure TLandscape.GetNormals(AX, AY: Word; var ANormals: TNormals);
+type
+  _Normals = array[0..3] of Tvector3_single;
+var
+  cells: array[0..2, 0..2] of _Normals;
+  north, west, south, east: Tvector3_single;
+  i, j: Integer;
+
+  function Normalize(const AVector: Tvector3_single): Tvector3_single; inline;
+  begin
+    Result := AVector / AVector.length;
+  end;
+
+  function GetPlainNormals(X, Y: SmallInt): _Normals;
+  var
+    cell: TMapCell;
+    north, west, south, east: ShortInt;
+    u, v: Tvector3_single;
+  begin
+    cell := GetMapCell(X, Y);
+    if cell <> nil then
+    begin
+      north := cell.Altitude;
+      west := GetLandAlt(cell.X, cell.Y + 1, north);
+      south := GetLandAlt(cell.X + 1, cell.Y + 1, north);
+      east := GetLandAlt(cell.X + 1, cell.Y, north);
+    end else
+    begin
+      north := 0;
+      west := 0;
+      east := 0;
+      south := 0;
+    end;
+
+    if (north = west) and (west = east) and (north = south) then
+    begin
+      Result[0].init(0, 0, 1);
+      Result[1].init(0, 0, 1);
+      Result[2].init(0, 0, 1);
+      Result[3].init(0, 0, 1);
+    end else
+    begin
+      u.init(-22, 22, (north - east) * 4);
+      v.init(-22, -22, (west - north) * 4);
+      Result[0] := Normalize(u >< v);
+
+      u.init(22, 22, (east - south) * 4);
+      v.init(-22, 22, (north - east) * 4);
+      Result[1] := Normalize(u >< v);
+
+      u.init(22, -22, (south - west) * 4);
+      v.init(22, 22, (east - south) * 4);
+      Result[2] := Normalize(u >< v);
+
+      u.init(-22, -22, (west - north) * 4);
+      v.init(22, -22, (south - west) * 4);
+      Result[3] := Normalize(u >< v);
+    end;
+  end;
+begin
+  for i := 0 to 2 do
+    for j := 0 to 2 do
+      cells[i, j] := GetPlainNormals(AX - 1 + i, AY - 1 + j);
+
+  north := cells[0, 0][2];
+  west := cells[0, 1][1];
+  east := cells[1, 0][3];
+  south := cells[1, 1][0];
+  ANormals[0] := Normalize(north + west + east + south);
+
+  north := cells[1, 0][2];
+  west := cells[1, 1][1];
+  east := cells[2, 0][3];
+  south := cells[2, 1][0];
+  ANormals[1] := Normalize(north + west + east + south);
+
+  north := cells[1, 1][2];
+  west := cells[1, 2][1];
+  east := cells[2, 1][3];
+  south := cells[2, 2][0];
+  ANormals[2] := Normalize(north + west + east + south);
+
+  north := cells[0, 1][2];
+  west := cells[0, 2][1];
+  east := cells[1, 1][3];
+  south := cells[1, 2][0];
+  ANormals[3] := Normalize(north + west + east + south);
+end;
+
+procedure TLandscape.LoadNoDrawMap(AFileName: String);
+var
+  noDrawFile: TextFile;
+  line, ids1, ids2: String;
+  i, id1, id2, splitPos: Integer;
+begin
+  AssignFile(noDrawFile, AFileName);
+  Reset(noDrawFile);
+  while not EOF(noDrawFile) do
+  begin
+    ReadLn(noDrawFile, line);
+    if (Length(line) > 0) and (line[1] in ['S', 'T']) then
+    begin
+      splitPos := Pos('-', line);
+      if splitPos > 1 then
+      begin
+        ids1 := Copy(line, 2, splitPos - 2);
+        ids2 := Copy(line, splitPos + 1, Length(line));
+        if TryStrToInt(ids1, id1) and TryStrToInt(ids2, id2) then
+        begin
+          if line[1] = 'S' then
+          begin
+            Inc(id1, $4000);
+            Inc(id2, $4000);
+          end;
+
+          for i := id1 to id2 do
+            if i < FDrawMap.Size then
+              FDrawMap[i] := False;
+        end;
+      end else
+      begin
+        ids1 := Copy(line, 2, Length(line));
+        if TryStrToInt(ids1, id1) then
+        begin
+          if line[1] = 'S' then
+            Inc(id1, $4000);
+          if id1 < FDrawMap.Size then
+            FDrawMap[id1] := False;
+        end;
+      end;
+    end;
+  end;
+  CloseFile(noDrawFile);
+end;
+
+procedure TLandscape.MoveStatic(AStatic: TStaticItem; AX, AY: Word);
+var
+  sourceBlock, targetBlock: TSeperatedStaticBlock;
+  targetStaticList: TStaticItemList;
+  i: Integer;
+begin
+  if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
+  begin
+    sourceBlock := AStatic.Owner as TSeperatedStaticBlock;
+    targetBlock := GetStaticBlock(AX div 8, AY div 8);
+    if (sourceBlock <> nil) and (targetBlock <> nil) then
+    begin
+      sourceBlock.Cells[(AStatic.Y mod 8) * 8 + AStatic.X mod 8].Remove(AStatic);
+      targetStaticList := targetBlock.Cells[(AY mod 8) * 8 + AX mod 8];
+      targetStaticList.Add(AStatic);
+      for i := 0 to targetStaticList.Count - 1 do
+        targetStaticList.Items[i].UpdatePriorities(
+          ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
+          i);
+      targetStaticList.Sort(@CompareStaticItems);
+      AStatic.UpdatePos(AX, AY, AStatic.Z);
+      AStatic.Owner := targetBlock;
+    end;
+  end;
+end;
+
+procedure TLandscape.PrepareBlocks(AX1, AY1, AX2, AY2: Word);
+var
+  x, y, i: Integer;
+  coords: TBlockCoordsArray;
+  block: TBlock;
+begin
+  AX1 := EnsureRange(AX1, 0, FWidth - 1);
+  AY1 := EnsureRange(AY1, 0, FHeight - 1);
+  AX2 := EnsureRange(AX2, 0, FWidth - 1);
+  AY2 := EnsureRange(AY2, 0, FHeight - 1);
+
+  SetLength(coords, 0);
+  for x := AX1 to AX2 do
+  begin
+    for y := AY1 to AY2 do
+    begin
+      if (not FOpenRequests[y * FWidth + x]) and
+         (not FBlockCache.QueryID(GetID(x, y), block)) then
+      begin
+        SetLength(coords, Length(coords) + 1);
+        i := High(coords);
+        coords[i].X := x;
+        coords[i].Y := y;
+        FOpenRequests[y * FWidth + x] := True;
+      end;
+    end;
+  end;
+  if Length(coords) > 0 then
+    dmNetwork.Send(TRequestBlocksPacket.Create(coords));
+end;
+
+procedure TLandscape.UpdateBlockAccess;
+var
+  cacheEntry: TBlockCache.PCacheEntry;
+begin
+  cacheEntry := nil;
+  while FBlockCache.Iterate(cacheEntry) do
+    if cacheEntry^.Obj <> nil then
+      cacheEntry^.Obj.UpdateBlockAcess(Self);
+end;
+
+procedure TLandscape.UpdateWriteMap(AStream: TEnhancedMemoryStream);
+var
+  x1, y1, x2, y2: Word;
+  i, areaCount, cellX, cellY: Integer;
+begin
+  Logger.EnterMethod([lcLandscape, lcDebug], 'TLandscape.UpdateWriteMap');
+
+  areaCount := AStream.ReadWord;
+  Logger.Send([lcLandscape, lcDebug], 'AreaCount', areaCount);
+
+  if areaCount > 0 then
+  begin
+    FWriteMap.Clearall;
+    for i := 0 to areaCount - 1 do
+    begin
+      x1 := AStream.ReadWord;
+      y1 := AStream.ReadWord;
+      x2 := AStream.ReadWord;
+      y2 := AStream.ReadWord;
+      for cellX := x1 to x2 do
+        for cellY := y1 to y2 do
+          FWriteMap[cellX * FCellHeight + cellY] := True;
+    end;
+  end else
+    for i := 0 to FWriteMap.Size - 1 do
+      FWriteMap[i] := True;
+
+  Logger.Send([lcLandscape, lcDebug], 'WriteMap @ 0,0', FWriteMap[0]);
+
+  UpdateBlockAccess;
+  Logger.ExitMethod([lcLandscape, lcDebug], 'TLandscape.UpdateWriteMap');
+end;
+
+{ TMaterial }
+
+constructor TMaterial.Create;
+begin
+  FRefCount := 1;
+end;
+
+destructor TMaterial.Destroy;
+begin
+  FreeAndNil(FGraphic);
+  inherited Destroy;
+end;
+
+class procedure TMaterial.CalculateTextureDimensions(ACaps: TGLTextureCaps;
+  ARealWidth, ARealHeight: Integer; out AWidth, AHeight: Integer);
+begin
+  if ACaps.NonPowerOfTwo then
+  begin
+    AWidth := ARealWidth;
+    AHeight := ARealHeight;
+  end else
+  begin
+    if IsPow2(ARealWidth) then
+      AWidth := ARealWidth
+    else
+      AWidth := NextPow2(ARealWidth);
+
+    if IsPow2(ARealHeight) then
+      AHeight := ARealHeight
+    else
+      AHeight := NextPow2(ARealHeight);
+  end;
+end;
+
+function TMaterial.GenerateTexture(AImage: TBaseImage): TGLuint;
+begin
+  Result := CreateGLTextureFromImage(AImage.ImageDataPointer^);
+  glBindTexture(GL_TEXTURE_2D, Result);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+end;
+
+procedure TMaterial.AddRef;
+begin
+  Inc(FRefCount);
+end;
+
+procedure TMaterial.DelRef;
+begin
+  Dec(FRefCount);
+  if FRefCount < 1 then
+    Free;
+end;
+
+function TMaterial.HitTest(AX, AY: Integer): Boolean;
+var
+  pixel: TColor32Rec;
+begin
+  Result := False;
+  if InRange(AX, 0, FGraphic.Width - 1) and
+     InRange(AY, 0, FGraphic.Height - 1) then
+  begin
+    pixel := GetPixel32(FGraphic.ImageDataPointer^, AX, AY);
+    if pixel.A > 0 then
+      Result := True;
+  end;
+end;
+
+function TMaterial.CanBeRemoved: Boolean;
+begin
+  Result := FRefCount <= 1;
+end;
+
+procedure TMaterial.RemoveFromCache;
+begin
+  DelRef;
+end;
+
+{ TScreenBuffer }
+
+constructor TScreenBuffer.Create;
+begin
+  inherited Create;
+  FCount := 0;
+  FSerial := 0;
+  UpdateShortcuts;
+end;
+
+destructor TScreenBuffer.Destroy;
+begin
+  Clear;
+  inherited Destroy;
+end;
+
+function TScreenBuffer.Add(AItem: TWorldItem): PBlockInfo;
+begin
+  New(Result);
+  AItem.Locked := True;
+  AItem.OnDestroy.RegisterEvent(@OnTileRemoved);
+  Result^.Item := AItem;
+  Result^.HighRes := nil;
+  Result^.LowRes := nil;
+  Result^.Normals := nil;
+  Result^.State := ssNormal;
+  Result^.Highlighted := False;
+  Result^.Translucent := False;
+  Result^.Text := nil;
+  Result^.Next := nil;
+
+  if FShortCuts[0] = nil then //First element
+  begin
+    FShortCuts[0] := Result;
+    FShortCuts[-1] := Result; //Last element
+  end else
+  begin
+    FShortCuts[-1]^.Next := Result;
+    FShortCuts[-1] := Result;
+  end;
+
+  Inc(FCount);
+end;
+
+procedure TScreenBuffer.Clear;
+var
+  current, next: PBlockInfo;
+begin
+  current := FShortCuts[0];
+  while current <> nil do
+  begin
+    next := current^.Next;
+    current^.Item.Locked := False;
+    current^.Item.OnDestroy.UnregisterEvent(@OnTileRemoved);
+    if current^.Normals <> nil then Dispose(current^.Normals);
+    if current^.HighRes <> nil then current^.HighRes.DelRef;
+    if current^.LowRes <> nil then current^.LowRes.DelRef;
+    current^.Text.Free;
+    Dispose(current);
+    current := next;
+  end;
+  FShortCuts[0] := nil;
+  FShortCuts[-1] := nil;
+
+  FCount := 0;
+  FSerial := 0;
+
+  UpdateShortcuts;
+end;
+
+procedure TScreenBuffer.Delete(AItem: TWorldItem);
+var
+  current, last, next: PBlockInfo;
+begin
+  last := nil;
+  current := FShortCuts[0];
+  while current <> nil do
+  begin
+    if current^.Item = AItem then
+    begin
+      if FShortCuts[-1] = current then FShortCuts[-1] := last;
+      if FShortCuts[0] = current then FShortCuts[0] := current^.Next;
+      if last <> nil then last^.Next := current^.Next;
+
+      if current^.Normals <> nil then Dispose(current^.Normals);
+      if current^.HighRes <> nil then current^.HighRes.DelRef;
+      if current^.LowRes <> nil then current^.LowRes.DelRef;
+      current^.Text.Free;
+
+      Dispose(current);
+      Dec(FCount);
+      FShortCutsValid := False;
+      next := nil;
+    end else
+      next := current^.Next;
+
+    last := current;
+    current := next;
+  end;
+end;
+
+function TScreenBuffer.Find(AScreenPosition: TPoint): PBlockInfo;
+var
+  current: PBlockInfo;
+  buff: array[0..3] of GLuint;
+begin
+  Result := nil;
+  current := FShortCuts[0];
+  while current <> nil do //search the last matching tile
+  begin
+    if (current^.State = ssNormal) and
+       PtInRect(current^.ScreenRect, AScreenPosition)then
+    begin
+      if current^.CheckRealQuad then
+      begin
+        //OpenGL hit test
+        //We use the "real quad" here to prevent the draw-preview from
+        //intercepting with our actual tiles (which are "hidden" then).
+        glSelectBuffer(4, @buff[0]);
+        glViewport(current^.ScreenRect.Left, current^.ScreenRect.Top,
+          current^.ScreenRect.Right, current^.ScreenRect.Bottom);
+        glRenderMode(GL_SELECT);
+        glInitNames;
+        glPushName(0);
+
+        glPushMatrix;
+          glMatrixMode(GL_PROJECTION);
+          glLoadIdentity;
+          gluOrtho2D(AScreenPosition.x, AScreenPosition.x + 1,
+            AScreenPosition.y + 1, AScreenPosition.y);
+          glMatrixMode(GL_MODELVIEW);
+          glLoadIdentity;
+
+          glBegin(GL_QUADS);
+            glVertex2iv(@current^.RealQuad[0]);
+            glVertex2iv(@current^.RealQuad[3]);
+            glVertex2iv(@current^.RealQuad[2]);
+            glVertex2iv(@current^.RealQuad[1]);
+          glEnd;
+        glPopMatrix;
+        glFlush;
+
+        if glRenderMode(GL_RENDER) > 0 then //glRenderMode now returns the number of hits
+          Result := current;
+      end else
+      if current^.LowRes.HitTest(AScreenPosition.x - current^.ScreenRect.Left,
+         AScreenPosition.y - current^.ScreenRect.Top) then
+        Result := current;
+    end;
+    current := current^.Next;
+  end;
+end;
+
+function TScreenBuffer.GetSerial: Cardinal;
+begin
+  Result := FSerial;
+  Inc(FSerial);
+end;
+
+function TScreenBuffer.Insert(AItem: TWorldItem): PBlockInfo;
+var
+  current: PBlockInfo;
+  shortcut: Integer;
+begin
+  if not FShortCutsValid then
+    UpdateShortcuts;
+
+  New(Result);
+  AItem.Locked := True;
+  AItem.OnDestroy.RegisterEvent(@OnTileRemoved);
+  Result^.Item := AItem;
+  Result^.HighRes := nil;
+  Result^.LowRes := nil;
+  Result^.Normals := nil;
+  Result^.State := ssNormal;
+  Result^.Highlighted := False;
+  Result^.Translucent := False;
+  Result^.Text := nil;
+
+  if (FShortCuts[0] = nil) or (CompareWorldItems(AItem, FShortCuts[0]^.Item) < 0) then
+  begin
+    if FShortCuts[0] = nil then
+      FShortCuts[-1] := Result;  //Update last item
+
+    Result^.Next := FShortCuts[0];
+    FShortCuts[0] := Result;
+  end else
+  begin
+    //find best entry point
+    shortcut := 0;
+    while (shortcut <= 10) and (FShortCuts[shortcut] <> nil) and
+      (CompareWorldItems(AItem, FShortCuts[shortcut]^.Item) >= 0) do
+    begin
+      current := FShortCuts[shortcut];
+      Inc(shortcut);
+    end;
+
+    //now find the real match
+    while (current^.Next <> nil) and
+          (CompareWorldItems(AItem, current^.Next^.Item) > 0) do
+    begin
+      current := current^.Next;
+    end;
+
+    if FShortCuts[-1] = current^.Next then
+      FShortCuts[-1] := Result;  //Update last item
+
+    Result^.Next := current^.Next;
+    current^.Next := Result;
+  end;
+
+  Inc(FCount);
+end;
+
+function TScreenBuffer.Iterate(var ABlockInfo: PBlockInfo): Boolean;
+begin
+  if ABlockInfo = nil then
+    ABlockInfo := FShortCuts[0]
+  else
+    ABlockInfo := ABlockInfo^.Next;
+  Result := ABlockInfo <> nil;
+end;
+
+procedure TScreenBuffer.UpdateShortcuts;
+var
+  shortcut, step, nextStep, stepSize: Integer;
+  blockInfo: PBlockInfo;
+begin
+  if FCount < 10 then
+  begin
+    for shortcut := 1 to 10 do
+      FShortCuts[shortcut] := nil;
+  end
+  else if FShortCuts[0] <> nil then
+  begin
+    stepSize := FCount div 10;
+    nextStep := stepSize;
+    step := 0;
+    shortcut := 1;
+    blockInfo := FShortCuts[0];
+    repeat
+      if step = nextStep then
+      begin
+        FShortCuts[shortcut] := blockInfo;
+        Inc(shortcut);
+        Inc(nextStep, stepSize);
+      end;
+
+      Inc(step);
+
+      FShortCuts[-1] := blockInfo; //update last known item
+      blockInfo := blockInfo^.Next;
+    until (blockInfo = nil);
+  end;
+  FShortCutsValid := True;
+end;
+
+function TScreenBuffer.UpdateSortOrder(AItem: TWorldItem): PBlockInfo;
+var
+  newNodePosition, oldNode, oldNodePrev, current: PBlockInfo;
+begin
+  newNodePosition := nil;
+  oldNode := nil;
+  oldNodePrev := nil;
+  current := FShortCuts[0];
+
+  while (current <> nil) and ((oldNode = nil) or (newNodePosition = nil)) do
+  begin
+    if current^.Item = AItem then
+      oldNode := current
+    else if oldNode = nil then
+      oldNodePrev := current;
+
+    if newNodePosition = nil then
+    begin
+      if (current^.Next = nil) or (CompareWorldItems(AItem, current^.Next^.Item) < 0) then
+        newNodePosition := current;
+    end;
+
+    current := current^.Next;
+  end;
+
+  //oldNode = nil, if the change happend out-of-screen
+  if (oldNode <> nil ) and (oldNode <> newNodePosition) then
+  begin
+    if oldNodePrev <> oldNode then
+    begin
+      if oldNodePrev = nil then
+        FShortCuts[0] := oldNode^.Next
+      else
+        oldNodePrev^.Next := oldNode^.Next;
+    end;
+
+    if (newNodePosition = FShortCuts[0]) and (CompareWorldItems(AItem, FShortCuts[0]^.Item) < 0) then
+    begin
+      oldNode^.Next := FShortCuts[0];
+      FShortCuts[0] := oldNode;
+    end else
+    begin
+      oldNode^.Next := newNodePosition^.Next;
+      newNodePosition^.Next := oldNode;
+    end;
+  end;
+
+  Result := oldNode;
+end;
+
+procedure TScreenBuffer.OnTileRemoved(ATile: TMulBlock);
+begin
+  Delete(TWorldItem(ATile));
+end;
+
+{ TGLText }
+
+constructor TGLText.Create(AFont: TGLFont; AText: String);
+begin
+  FFont := AFont;
+  FText := AText;
+  FWidth := FFont.GetTextWidth(AText);
+  FHeight := FFont.GetTextHeight('A');
+end;
+
+procedure TGLText.Render(AScreenRect: TRect);
+var
+  x, y: Integer;
+begin
+  y := AScreenRect.Top + (AScreenRect.Bottom - AScreenRect.Top - FHeight) div 2;
+  x := AScreenRect.Left + (AScreenRect.Right - AScreenRect.Left - FWidth) div 2;
+  FFont.DrawText(x, y, FText);
+end;
+
+{ TSimpleMaterial }
+
+constructor TSimpleMaterial.Create(AGraphic: TBaseImage);
+var
+  caps: TGLTextureCaps;
+begin
+  inherited Create;
+  FRealWidth := AGraphic.Width;
+  FRealHeight := AGraphic.Height;
+
+  GetGLTextureCaps(caps);
+  CalculateTextureDimensions(caps, FRealWidth, FRealHeight, FWidth, FHeight);
+  FGraphic := TMultiImage.CreateFromParams(FWidth, FHeight, ifA8R8G8B8, 1);
+  AGraphic.CopyTo(0, 0, FRealWidth, FRealHeight, FGraphic, 0, 0);
+  FTexture := GenerateTexture(FGraphic);
+end;
+
+destructor TSimpleMaterial.Destroy;
+begin
+  if FTexture <> 0 then glDeleteTextures(1, @FTexture);
+  inherited Destroy;
+end;
+
+function TSimpleMaterial.GetTexture: GLuint;
+begin
+  Result := FTexture;
+end;
+
+{ TAnimMaterial }
+
+constructor TAnimMaterial.Create(ABaseID: Word; AAnimData: TAnimData;
+  AHue: THue = nil; APartialHue: Boolean = False);
+var
+  i: Integer;
+  art: array of TArt;
+  caps: TGLTextureCaps;
+begin
+  inherited Create;
+
+  FAnimData := AAnimData;
+
+  FRealWidth := 0;
+  FRealHeight := 0;
+
+  SetLength(FTextures, AAnimData.FrameCount);
+  SetLength(art, AAnimData.FrameCount);
+
+  for i := 0 to AAnimData.FrameCount - 1 do
+  begin
+    art[i] := ResMan.Art.GetArt(ABaseID + AAnimData.FrameData[i], 0, AHue,
+      APartialHue);
+
+    if art[i].Graphic.Width > FRealWidth then
+      FRealWidth := art[i].Graphic.Width;
+    if art[i].Graphic.Height > FRealHeight then
+      FRealHeight := art[i].Graphic.Height;
+  end;
+
+  GetGLTextureCaps(caps);
+  CalculateTextureDimensions(caps, FRealWidth, FRealHeight, FWidth, FHeight);
+  FGraphic := TMultiImage.CreateFromParams(FWidth, FHeight, ifA8R8G8B8,
+    AAnimData.FrameCount);
+
+  for i := 0 to AAnimData.FrameCount - 1 do
+  begin
+    FGraphic.ActiveImage := i;
+    art[i].Graphic.CopyTo(0, 0, art[i].Graphic.Width, art[i].Graphic.Height,
+      FGraphic, 0, 0);
+    FTextures[i] := GenerateTexture(FGraphic);
+    art[i].Free;
+  end;
+
+  FGraphic.ActiveImage := 0;
+  FActiveFrame := 0;
+  FNextChange := GetTickCount + AAnimData.FrameStart * 100;
+end;
+
+destructor TAnimMaterial.Destroy;
+begin
+  glDeleteTextures(Length(FTextures), @FTextures[0]);
+  inherited Destroy;
+end;
+
+function TAnimMaterial.GetTexture: GLuint;
+begin
+  if FNextChange <= GetTickCount then
+  begin
+    FActiveFrame := (FActiveFrame + 1) mod FAnimData.FrameCount;
+    FGraphic.ActiveImage := FActiveFrame;
+
+    if FActiveFrame = 0 then
+      FNextChange := GetTickCount + FAnimData.FrameStart * 100
+    else
+      FNextChange:= GetTickCount + FAnimData.FrameInterval * 100;
+  end;
+
+  Result := FTextures[FActiveFrame];
+end;
+
+end.
+
diff --git a/Client/ULightManager.pas b/Client/ULightManager.pas
index 4c84537..2a5d953 100644
--- a/Client/ULightManager.pas
+++ b/Client/ULightManager.pas
@@ -1,376 +1,378 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2009 Andreas Schneider
- *)
-unit ULightManager;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes, SysUtils, Imaging, ImagingTypes, ImagingClasses, ImagingCanvases,
-  ImagingOpenGL, GL, GLu, GLext, fgl, ULandscape, UWorldItem, UCacheManager;
-
-type
-
-  TCalculateOffset = procedure(AX, AY: Integer; out DrawX, DrawY: Integer) of object;
-
-  { TLightMaterial }
-
-  TLightMaterial = class(TSimpleMaterial)
-    constructor Create(AGraphic: TBaseImage);
-    destructor Destroy; override;
-  protected
-    FCanvas: TFastARGB32Canvas;
-  public
-    property Canvas: TFastARGB32Canvas read FCanvas;
-  end;
-
-  TLightCache = specialize TCacheManager<TLightMaterial>;
-
-  TLightManager = class;
-
-  { TLightSource }
-
-  TLightSource = class
-    constructor Create(AManager: TLightManager; AWorldItem: TWorldItem);
-    destructor Destroy; override;
-  protected
-    FX: Integer;
-    FY: Integer;
-    FZ: SmallInt;
-    FMaterial: TLightMaterial;
-  public
-    property X: Integer read FX;
-    property Y: Integer read FY;
-    property Z: SmallInt read FZ;
-    property Material: TLightMaterial read FMaterial;
-  end;
-
-  TLightSources = specialize TFPGObjectList<TLightSource>;
-
-  { TLightManager }
-
-  TLightManager = class
-    constructor Create(ACalculateOffset: TCalculateOffset);
-    destructor Destroy; override;
-  protected
-    FLightSources: TLightSources;
-    FOverlay: TSingleImage;
-    FOverlayTexture: GLuint;
-    FLightLevel: Byte;
-    FValid: Boolean;
-    FCalculateOffset: TCalculateOffset;
-    FLightCache: TLightCache;
-    FUseFBO: Boolean;
-    FInitialized: Boolean;
-    function GetLight(AID: Integer): TLightMaterial;
-    procedure SetLightLevel(AValue: Byte);
-    procedure UpdateOverlay(AScreenRect: TRect);
-  public
-    property LightLevel: Byte read FLightLevel write SetLightLevel;
-    procedure InitGL;
-    procedure UpdateLightMap(ALeft, AWidth, ATop, AHeight: Integer;
-      AScreenBuffer: TScreenBuffer);
-    procedure Draw(AScreenRect: TRect);
-  end;
-
-implementation
-
-uses
-  UGameResources, UTiledata, UStatics, UMap, ULight, Logging;
-
-{ TLightManager }
-
-constructor TLightManager.Create(ACalculateOffset: TCalculateOffset);
-begin
-  FCalculateOffset := ACalculateOffset;
-  FLightSources := TLightSources.Create(True);
-  FLightLevel := 0;
-  FLightCache := TLightCache.Create(32);
-  FInitialized := False;
-end;
-
-destructor TLightManager.Destroy;
-begin
-  FreeAndNil(FLightSources);
-  FreeAndNil(FOverlay);
-  FreeAndNil(FLightCache);
-  glDeleteTextures(1, @FOverlayTexture);
-  inherited Destroy;
-end;
-
-function TLightManager.GetLight(AID: Integer): TLightMaterial;
-var
-  light: TLight;
-begin
-  Result := nil;
-  if not FLightCache.QueryID(AID, Result) then
-  begin
-    if ResMan.Lights.Exists(AID) then
-    begin
-      light := ResMan.Lights.GetLight(AID);
-      Result := TLightMaterial.Create(light.Graphic);
-      FLightCache.StoreID(AID, Result);
-      light.Free;
-    end;
-  end;
-end;
-
-procedure TLightManager.SetLightLevel(AValue: Byte);
-begin
-  FLightLevel := AValue;
-  FValid := False;
-end;
-
-procedure TLightManager.UpdateOverlay(AScreenRect: TRect);
-var
-  canvas: TFastARGB32Canvas;
-  color: TColor32Rec;
-  i: Integer;
-  lightMaterial: TLightMaterial;
-  colorGL: GLclampf;
-  fbo: GLuint;
-begin
-  glDeleteTextures(1, @FOverlayTexture);
-  if FUseFBO then
-  begin
-    glGenTextures(1, @FOverlayTexture);
-    glBindTexture(GL_TEXTURE_2D, FOverlayTexture);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, AScreenRect.Right,
-      AScreenRect.Bottom, 0, GL_RGBA, GL_UNSIGNED_BYTE, nil);
-    glBindTexture(GL_TEXTURE_2D, 0);
-
-    glGenFramebuffersEXT(1, @fbo);
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
-    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-      GL_TEXTURE_2D, FOverlayTexture, 0);
-
-    colorGL :=(32 - lightLevel) / 32;
-    glClearColor(colorGL, colorGL, colorGL, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-
-    glBlendFunc(GL_ONE, GL_ONE);
-    for i := 0 to FLightSources.Count - 1 do
-      begin
-        lightMaterial := FLightSources[i].Material;
-        if lightMaterial <> nil then
-        begin
-          glBindTexture(GL_TEXTURE_2D, lightMaterial.Texture);
-          glBegin(GL_QUADS);
-            glTexCoord2i(0, 0);
-            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2,
-              FLightSources[i].FY - lightMaterial.RealHeight div 2);
-            glTexCoord2i(0, 1);
-            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2,
-              FLightSources[i].FY - lightMaterial.RealHeight div 2 +
-              lightMaterial.Height);
-            glTexCoord2i(1, 1);
-            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2 +
-              lightMaterial.Width, FLightSources[i].FY -
-              lightMaterial.RealHeight div 2 + lightMaterial.Height);
-            glTexCoord2i(1, 0);
-            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2 +
-              lightMaterial.Width,
-              FLightSources[i].FY - lightMaterial.RealHeight div 2);
-          glEnd;
-        end;
-      end;
-
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-    glDeleteFramebuffersEXT(1, @fbo);
-  end else
-  begin
-    FOverlay.Free;
-
-    color.A := $FF;
-    color.R := ((32 - FLightLevel) * 255) div 32;
-    color.G := color.R;
-    color.B := color.R;
-
-    FOverlay := TSingleImage.CreateFromParams(AScreenRect.Right,
-      AScreenRect.Bottom, ifA8R8G8B8);
-    canvas := TFastARGB32Canvas.CreateForImage(FOverlay);
-    try
-      canvas.FillColor32 := color.Color;
-      canvas.FillRect(AScreenRect);
-
-      for i := 0 to FLightSources.Count - 1 do
-      begin
-        lightMaterial := FLightSources[i].Material;
-        if lightMaterial <> nil then
-        begin
-          lightMaterial.Canvas.DrawAdd(lightMaterial.Canvas.ClipRect, canvas,
-            FLightSources[i].FX - lightMaterial.RealWidth div 2,
-            FLightSources[i].FY - lightMaterial.RealHeight div 2);
-        end;
-      end;
-    finally
-      canvas.Free;
-    end;
-
-    FOverlayTexture := CreateGLTextureFromImage(FOverlay.ImageDataPointer^);
-  end;
-
-  FValid := True;
-end;
-
-procedure TLightManager.InitGL;
-begin
-  FUseFBO := Load_GL_EXT_framebuffer_object;
-end;
-
-procedure TLightManager.UpdateLightMap(ALeft, AWidth, ATop, AHeight: Integer;
-  AScreenBuffer: TScreenBuffer);
-var
-  blockInfo: PBlockInfo;
-  lights: TWorldItemList;
-  i, x, y, tileID: Integer;
-  tileData: TTiledata;
-  tileMap: array of array of TWorldItem;
-begin
-  //Logger.EnterMethod([lcClient, lcDebug], 'UpdateLightMap');
-  FLightSources.Clear;
-  {Logger.Send([lcClient, lcDebug], 'AWidth', AWidth);
-  Logger.Send([lcClient, lcDebug], 'AHeight', AHeight);}
-  lights := TWorldItemList.Create(False);
-  SetLength(tileMap, AWidth, AHeight);
-  for x := 0 to AWidth - 1 do
-    for y := 0 to AHeight - 1 do
-      tileMap[x,y] := nil;
-
-  blockInfo := nil;
-  while AScreenBuffer.Iterate(blockInfo) do
-  begin
-    if blockInfo^.State = ssNormal then
-    begin
-      if blockInfo^.Item is TStaticItem then
-        tileID := blockInfo^.Item.TileID + $4000
-      else
-        tileID := blockInfo^.Item.TileID;
-      tileData := ResMan.Tiledata.TileData[tileID];
-
-      if tdfLightSource in tileData.Flags then
-        lights.Add(blockInfo^.Item)
-      else
-        tileMap[blockInfo^.Item.X - ALeft, blockInfo^.Item.Y - ATop] :=
-          blockInfo^.Item;
-    end;
-  end;
-
-  for i := 0 to lights.Count - 1 do
-  begin
-    x := lights[i].X + 1 - ALeft;
-    y := lights[i].Y + 1 - ATop;
-    if (x = AWidth) or (y = AHeight) or (tileMap[x,y] = nil) or
-      (tileMap[x,y].Z < lights[i].Z + 5) then
-      FLightSources.Add(TLightSource.Create(Self, lights[i]));
-  end;
-
-  lights.Free;
-
-  FValid := False;
-  //Logger.ExitMethod([lcClient, lcDebug], 'UpdateLightMap');
-end;
-
-procedure TLightManager.Draw(AScreenRect: TRect);
-begin
-  if not FInitialized then
-    InitGL;
-
-  if not FValid then
-    UpdateOverlay(AScreenRect);
-
-  glBindTexture(GL_TEXTURE_2D, FOverlayTexture);
-  glBlendFunc(GL_ZERO, GL_SRC_COLOR);
-  glBegin(GL_QUADS);
-  if FUseFBO then
-  begin
-    glTexCoord2i(0, 1);
-    glVertex2i(AScreenRect.Left, AScreenRect.Top);
-    glTexCoord2i(0, 0);
-    glVertex2i(AScreenRect.Left, AScreenRect.Bottom);
-    glTexCoord2i(1, 0);
-    glVertex2i(AScreenRect.Right, AScreenRect.Bottom);
-    glTexCoord2i(1, 1);
-    glVertex2i(AScreenRect.Right, AScreenRect.Top);
-  end else
-  begin
-    glTexCoord2i(0, 0);
-    glVertex2i(AScreenRect.Left, AScreenRect.Top);
-    glTexCoord2i(0, 1);
-    glVertex2i(AScreenRect.Left, AScreenRect.Bottom);
-    glTexCoord2i(1, 1);
-    glVertex2i(AScreenRect.Right, AScreenRect.Bottom);
-    glTexCoord2i(1, 0);
-    glVertex2i(AScreenRect.Right, AScreenRect.Top);
-  end;
-  glEnd;
-end;
-
-{ TLightSource }
-
-constructor TLightSource.Create(AManager: TLightManager; AWorldItem: TWorldItem);
-var
-  lightID: Byte;
-begin
-  lightID := ResMan.Tiledata.StaticTiles[AWorldItem.TileID].Quality;
-  FMaterial := AManager.GetLight(lightID);
-  if FMaterial <> nil then
-  begin
-    AManager.FCalculateOffset(AWorldItem.X, AWorldItem.Y, FX, FY);
-    FZ := AWorldItem.Z * 4;
-    FY := FY + 22 - FZ;
-    FMaterial.AddRef;
-  end;
-end;
-
-destructor TLightSource.Destroy;
-begin
-  if FMaterial <> nil then
-    FMaterial.DelRef;
-  inherited Destroy;
-end;
-
-{ TLightMaterial }
-
-constructor TLightMaterial.Create(AGraphic: TBaseImage);
-begin
-  inherited Create(AGraphic);
-  FCanvas := TFastARGB32Canvas.CreateForImage(FGraphic);
-end;
-
-destructor TLightMaterial.Destroy;
-begin
-  FreeAndNil(FCanvas);
-  inherited Destroy;
-end;
-
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2009 Andreas Schneider
+ *)
+unit ULightManager;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, Imaging, ImagingTypes, ImagingClasses, ImagingCanvases,
+  ImagingOpenGL, GL, GLu, GLext, fgl, ULandscape, UWorldItem, UCacheManager;
+
+type
+
+  TCalculateOffset = procedure(AX, AY: Integer; out DrawX, DrawY: Integer) of object;
+
+  { TLightMaterial }
+
+  TLightMaterial = class(TSimpleMaterial)
+    constructor Create(AGraphic: TBaseImage);
+    destructor Destroy; override;
+  protected
+    FCanvas: TFastARGB32Canvas;
+  public
+    property Canvas: TFastARGB32Canvas read FCanvas;
+  end;
+
+  TLightCache = specialize TCacheManager<TLightMaterial>;
+
+  TLightManager = class;
+
+  { TLightSource }
+
+  TLightSource = class
+    constructor Create(AManager: TLightManager; AWorldItem: TWorldItem);
+    destructor Destroy; override;
+  protected
+    FX: Integer;
+    FY: Integer;
+    FZ: SmallInt;
+    FMaterial: TLightMaterial;
+  public
+    property X: Integer read FX;
+    property Y: Integer read FY;
+    property Z: SmallInt read FZ;
+    property Material: TLightMaterial read FMaterial;
+  end;
+
+  TLightSources = specialize TFPGObjectList<TLightSource>;
+
+  { TLightManager }
+
+  TLightManager = class
+    constructor Create(ACalculateOffset: TCalculateOffset);
+    destructor Destroy; override;
+  protected
+    FLightSources: TLightSources;
+    FOverlay: TSingleImage;
+    FOverlayTexture: GLuint;
+    FLightLevel: Byte;
+    FValid: Boolean;
+    FCalculateOffset: TCalculateOffset;
+    FLightCache: TLightCache;
+    FUseFBO: Boolean;
+    FInitialized: Boolean;
+    function GetLight(AID: Integer): TLightMaterial;
+    procedure SetLightLevel(AValue: Byte);
+    procedure UpdateOverlay(AScreenRect: TRect);
+  public
+    property LightLevel: Byte read FLightLevel write SetLightLevel;
+    procedure InitGL;
+    procedure UpdateLightMap(ALeft, AWidth, ATop, AHeight: Integer;
+      AScreenBuffer: TScreenBuffer);
+    procedure Draw(AScreenRect: TRect);
+  end;
+
+implementation
+
+uses
+  UGameResources, UTiledata, UStatics, UMap, ULight, Logging;
+
+{ TLightManager }
+
+constructor TLightManager.Create(ACalculateOffset: TCalculateOffset);
+begin
+  FCalculateOffset := ACalculateOffset;
+  FLightSources := TLightSources.Create(True);
+  FLightLevel := 0;
+  FLightCache := TLightCache.Create(32);
+  FInitialized := False;
+end;
+
+destructor TLightManager.Destroy;
+begin
+  FreeAndNil(FLightSources);
+  FreeAndNil(FOverlay);
+  FreeAndNil(FLightCache);
+  glDeleteTextures(1, @FOverlayTexture);
+  inherited Destroy;
+end;
+
+function TLightManager.GetLight(AID: Integer): TLightMaterial;
+var
+  light: TLight;
+begin
+  Result := nil;
+  if not FLightCache.QueryID(AID, Result) then
+  begin
+    if ResMan.Lights.Exists(AID) then
+    begin
+      light := ResMan.Lights.GetLight(AID);
+      Result := TLightMaterial.Create(light.Graphic);
+      FLightCache.StoreID(AID, Result);
+      light.Free;
+    end;
+  end;
+end;
+
+procedure TLightManager.SetLightLevel(AValue: Byte);
+begin
+  FLightLevel := AValue;
+  FValid := False;
+end;
+
+procedure TLightManager.UpdateOverlay(AScreenRect: TRect);
+var
+  canvas: TFastARGB32Canvas;
+  color: TColor32Rec;
+  i: Integer;
+  lightMaterial: TLightMaterial;
+  colorGL: GLclampf;
+  fbo: GLuint;
+begin
+  glDeleteTextures(1, @FOverlayTexture);
+  if FUseFBO then
+  begin
+    glGenTextures(1, @FOverlayTexture);
+    glBindTexture(GL_TEXTURE_2D, FOverlayTexture);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, AScreenRect.Right,
+      AScreenRect.Bottom, 0, GL_RGBA, GL_UNSIGNED_BYTE, nil);
+    glBindTexture(GL_TEXTURE_2D, 0);
+
+    glGenFramebuffersEXT(1, @fbo);
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+      GL_TEXTURE_2D, FOverlayTexture, 0);
+
+    colorGL :=(32 - lightLevel) / 32;
+    glClearColor(colorGL, colorGL, colorGL, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    glBlendFunc(GL_ONE, GL_ONE);
+    for i := 0 to FLightSources.Count - 1 do
+      begin
+        lightMaterial := FLightSources[i].Material;
+        if lightMaterial <> nil then
+        begin
+          glBindTexture(GL_TEXTURE_2D, lightMaterial.Texture);
+          glBegin(GL_QUADS);
+            glTexCoord2i(0, 0);
+            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2,
+              FLightSources[i].FY - lightMaterial.RealHeight div 2);
+            glTexCoord2i(0, 1);
+            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2,
+              FLightSources[i].FY - lightMaterial.RealHeight div 2 +
+              lightMaterial.Height);
+            glTexCoord2i(1, 1);
+            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2 +
+              lightMaterial.Width, FLightSources[i].FY -
+              lightMaterial.RealHeight div 2 + lightMaterial.Height);
+            glTexCoord2i(1, 0);
+            glVertex2i(FLightSources[i].FX - lightMaterial.RealWidth div 2 +
+              lightMaterial.Width,
+              FLightSources[i].FY - lightMaterial.RealHeight div 2);
+          glEnd;
+        end;
+      end;
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    glDeleteFramebuffersEXT(1, @fbo);
+  end else
+  begin
+    FOverlay.Free;
+
+    color.A := $FF;
+    color.R := ((32 - FLightLevel) * 255) div 32;
+    color.G := color.R;
+    color.B := color.R;
+
+    FOverlay := TSingleImage.CreateFromParams(AScreenRect.Right,
+      AScreenRect.Bottom, ifA8R8G8B8);
+    canvas := TFastARGB32Canvas.CreateForImage(FOverlay);
+    try
+      canvas.FillColor32 := color.Color;
+      canvas.FillRect(AScreenRect);
+
+      for i := 0 to FLightSources.Count - 1 do
+      begin
+        lightMaterial := FLightSources[i].Material;
+        if lightMaterial <> nil then
+        begin
+          lightMaterial.Canvas.DrawAdd(lightMaterial.Canvas.ClipRect, canvas,
+            FLightSources[i].FX - lightMaterial.RealWidth div 2,
+            FLightSources[i].FY - lightMaterial.RealHeight div 2);
+        end;
+      end;
+    finally
+      canvas.Free;
+    end;
+
+    FOverlayTexture := CreateGLTextureFromImage(FOverlay.ImageDataPointer^);
+  end;
+
+  FValid := True;
+end;
+
+procedure TLightManager.InitGL;
+begin
+  FUseFBO := Load_GL_EXT_framebuffer_object;
+end;
+
+procedure TLightManager.UpdateLightMap(ALeft, AWidth, ATop, AHeight: Integer;
+  AScreenBuffer: TScreenBuffer);
+var
+  blockInfo: PBlockInfo;
+  lights: TWorldItemList;
+  i, x, y, tileID: Integer;
+  tileData: TTiledata;
+  tileMap: array of array of TWorldItem;
+begin
+  //Logger.EnterMethod([lcClient, lcDebug], 'UpdateLightMap');
+  FLightSources.Clear;
+  {Logger.Send([lcClient, lcDebug], 'AWidth', AWidth);
+  Logger.Send([lcClient, lcDebug], 'AHeight', AHeight);}
+  lights := TWorldItemList.Create(False);
+  SetLength(tileMap, AWidth, AHeight);
+  for x := 0 to AWidth - 1 do
+    for y := 0 to AHeight - 1 do
+      tileMap[x,y] := nil;
+
+  blockInfo := nil;
+  while AScreenBuffer.Iterate(blockInfo) do
+  begin
+    if blockInfo^.State = ssNormal then
+    begin
+      if blockInfo^.Item is TStaticItem then
+        tileID := blockInfo^.Item.TileID + $4000
+      else
+        tileID := blockInfo^.Item.TileID;
+      tileData := ResMan.Tiledata.TileData[tileID];
+
+      if tdfLightSource in tileData.Flags then
+        lights.Add(blockInfo^.Item)
+      else
+        tileMap[blockInfo^.Item.X - ALeft, blockInfo^.Item.Y - ATop] :=
+          blockInfo^.Item;
+    end;
+  end;
+
+  for i := 0 to lights.Count - 1 do
+  begin
+    x := lights[i].X + 1 - ALeft;
+    y := lights[i].Y + 1 - ATop;
+    if (x = AWidth) or (y = AHeight) or (tileMap[x,y] = nil) or
+      (tileMap[x,y].Z < lights[i].Z + 5) then
+      FLightSources.Add(TLightSource.Create(Self, lights[i]));
+  end;
+
+  lights.Free;
+
+  FValid := False;
+  //Logger.ExitMethod([lcClient, lcDebug], 'UpdateLightMap');
+end;
+
+procedure TLightManager.Draw(AScreenRect: TRect);
+begin
+  if not FInitialized then
+    InitGL;
+
+  glColor4f(1, 1, 1, 1);
+
+  if not FValid then
+    UpdateOverlay(AScreenRect);
+
+  glBindTexture(GL_TEXTURE_2D, FOverlayTexture);
+  glBlendFunc(GL_ZERO, GL_SRC_COLOR);
+  glBegin(GL_QUADS);
+  if FUseFBO then
+  begin
+    glTexCoord2i(0, 1);
+    glVertex2i(AScreenRect.Left, AScreenRect.Top);
+    glTexCoord2i(0, 0);
+    glVertex2i(AScreenRect.Left, AScreenRect.Bottom);
+    glTexCoord2i(1, 0);
+    glVertex2i(AScreenRect.Right, AScreenRect.Bottom);
+    glTexCoord2i(1, 1);
+    glVertex2i(AScreenRect.Right, AScreenRect.Top);
+  end else
+  begin
+    glTexCoord2i(0, 0);
+    glVertex2i(AScreenRect.Left, AScreenRect.Top);
+    glTexCoord2i(0, 1);
+    glVertex2i(AScreenRect.Left, AScreenRect.Bottom);
+    glTexCoord2i(1, 1);
+    glVertex2i(AScreenRect.Right, AScreenRect.Bottom);
+    glTexCoord2i(1, 0);
+    glVertex2i(AScreenRect.Right, AScreenRect.Top);
+  end;
+  glEnd;
+end;
+
+{ TLightSource }
+
+constructor TLightSource.Create(AManager: TLightManager; AWorldItem: TWorldItem);
+var
+  lightID: Byte;
+begin
+  lightID := ResMan.Tiledata.StaticTiles[AWorldItem.TileID].Quality;
+  FMaterial := AManager.GetLight(lightID);
+  if FMaterial <> nil then
+  begin
+    AManager.FCalculateOffset(AWorldItem.X, AWorldItem.Y, FX, FY);
+    FZ := AWorldItem.Z * 4;
+    FY := FY + 22 - FZ;
+    FMaterial.AddRef;
+  end;
+end;
+
+destructor TLightSource.Destroy;
+begin
+  if FMaterial <> nil then
+    FMaterial.DelRef;
+  inherited Destroy;
+end;
+
+{ TLightMaterial }
+
+constructor TLightMaterial.Create(AGraphic: TBaseImage);
+begin
+  inherited Create(AGraphic);
+  FCanvas := TFastARGB32Canvas.CreateForImage(FGraphic);
+end;
+
+destructor TLightMaterial.Destroy;
+begin
+  FreeAndNil(FCanvas);
+  inherited Destroy;
+end;
+
+end.
+
diff --git a/Client/UfrmMain.lfm b/Client/UfrmMain.lfm
index 696ffa2..0bcc9ba 100644
--- a/Client/UfrmMain.lfm
+++ b/Client/UfrmMain.lfm
@@ -967,14 +967,14 @@ object frmMain: TfrmMain
       OnClick = tbStaticsClick
     end
     object tbSeparator5: TToolButton
-      Left = 438
+      Left = 461
       Top = 2
       Width = 17
       Caption = 'tbSeparator5'
       Style = tbsDivider
     end
     object tbRadarMap: TToolButton
-      Left = 455
+      Left = 478
       Hint = 'Radar Map'
       Top = 2
       Caption = 'Radar Map'
@@ -996,7 +996,7 @@ object frmMain: TfrmMain
       OnMouseMove = tbFilterMouseMove
     end
     object tbFlat: TToolButton
-      Left = 403
+      Left = 426
       Top = 2
       Action = acFlat
       DropdownMenu = pmFlatViewSettings
@@ -1020,11 +1020,17 @@ object frmMain: TfrmMain
       Top = 2
       Action = acUndo
     end
-    object ToolButton1: TToolButton
-      Left = 380
+    object tbLightlevel: TToolButton
+      Left = 403
       Top = 2
       Action = acLightlevel
     end
+    object tbWalkable: TToolButton
+      Left = 380
+      Top = 2
+      Action = acWalkable
+      Style = tbsCheck
+    end
   end
   object pnlChatHeader: TPanel
     AnchorSideLeft.Control = pnlChat
@@ -1465,7 +1471,7 @@ object frmMain: TfrmMain
     left = 264
     top = 32
     Bitmap = {
-      4C69160000001000000010000000000000000000000000000000000000000000
+      4C69170000001000000010000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000D9A781FFD39E76FF00000000000000000000000000000000000000000000
       0000000000000000000000000000ECBEA1FFE7BB9DFFE4B697FFE0B292FFDAAE
@@ -2169,7 +2175,39 @@ object frmMain: TfrmMain
       FF0088A7BB5D485055F5444545FE3F4141FE3F474AF67D9CB16AFFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF006D9CD4896A9AD2FB6697CFEEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00709ED6DB6D9C
+      D4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFFFF00808080FF7E7E7EFF7C7C
+      7CFF7A7A7AFF777777FF757575FF727272FF719ED4FF6F9ED6FF87B2DCFFABD3
+      E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFFFF007D7D7DFF999999FF9999
+      99FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9DD3FFAAD1E7FFABD1E7FF98C7
+      E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFFFF007A7A7AFF999999FF5291
+      59FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9AD0FFA7CEE5FF8FC1DFFF89BD
+      DCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFFFF00777777FF9A9A9AFF3D8A
+      45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696CCFFA2CBE3FF89BDDCFF83B9
+      DAFF84B9DAFF518BB5FF437EB6EA44944DFF42914BFF3F8D48FF3D8945FF5DA4
+      65FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092C9FF9EC7E2FF83B8DAFF7DB4
+      D7FF7EB3D7FF4F89B4FF3B79B1EA41904AFF94D29FFF91D09AFF8DCD96FF89CB
+      92FF84C88DFF519858FF417C46FF9F9F9FFF5A8EC4FF98C3E0FF7CB3D7FF74AF
+      D6FF5EC4EDFF4B88B3FF3473ABEA3E8B46FF8FCE99FF7DC687FF78C381FF73C0
+      7CFF74C07CFF79C281FF49904FFF547F57FF5489BFFF94BFDDFF75ADD4FF63B8
+      E1FF4BD4FFFF428BB8FF2C6EA6EA3B8742FF89CB92FF84C88DFF80C688FF7BC3
+      83FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84BAFF8DBBDBFF6EA8D1FF66A6
+      D1FF5FB4DFFF4785B1FF2569A1EA37823EFF347E3BFF317937FF2E7534FF4991
+      50FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457EB4FF88B7D9FF67A3CFFF619E
+      CCFF639FCCFF4583B1FF1F649CEAFFFFFF00FFFFFF00606060FFA0A0A0FF3D76
+      41FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79B0FF82B3D7FF629FCCFF5A9A
+      C9FF5E9BCAFF4381AFFF196098EAFFFFFF00FFFFFF005C5C5CFFA1A1A1FF3C73
+      40FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674AAFF7DAFD4FF5B9AC9FF5495
+      C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFFFF00585858FFA2A2A2FFA2A2
+      A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6FA5FF78ABD2FF78ABD3FF73A7
+      D1FF69A0CDFF407FAEFF0F5991EA999999FF717171FF545454FF515151FF4F4F
+      4FFF4C4C4CFF4A4A4AFF474747FF454545FF25679DFF3274A8FF3D7CAFFF4784
+      B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D639B1619609839145D9562105A
+      92880D5890A4135C92FC0C578FED
     }
   end
   object pmTileList: TPopupMenu
@@ -2657,6 +2695,15 @@ object frmMain: TfrmMain
       ImageIndex = 21
       OnExecute = acLightlevelExecute
     end
+    object acWalkable: TAction
+      Category = 'Settings'
+      AutoCheck = True
+      Caption = 'Walkable'
+      Hint = 'Highlight (un)walkable surfaces'
+      ImageIndex = 22
+      OnExecute = acWalkableExecute
+      ShortCut = 16471
+    end
   end
   object tmGrabTileInfo: TTimer
     Enabled = False
diff --git a/Client/UfrmMain.pas b/Client/UfrmMain.pas
index 1021b53..a58dfd3 100644
--- a/Client/UfrmMain.pas
+++ b/Client/UfrmMain.pas
@@ -69,6 +69,7 @@ type
     acFlat: TAction;
     acNoDraw: TAction;
     acLightlevel: TAction;
+    acWalkable: TAction;
     acUndo: TAction;
     acVirtualLayer: TAction;
     ActionList1: TActionList;
@@ -149,7 +150,8 @@ type
     tbNoDraw: TToolButton;
     tbSeparator2: TToolButton;
     tbUndo: TToolButton;
-    ToolButton1: TToolButton;
+    tbLightlevel: TToolButton;
+    tbWalkable: TToolButton;
     tsLocations: TTabSheet;
     tbSetHue: TToolButton;
     tmGrabTileInfo: TTimer;
@@ -190,6 +192,7 @@ type
     procedure acSelectExecute(Sender: TObject);
     procedure acUndoExecute(Sender: TObject);
     procedure acVirtualLayerExecute(Sender: TObject);
+    procedure acWalkableExecute(Sender: TObject);
     procedure ApplicationProperties1Idle(Sender: TObject; var Done: Boolean);
     procedure ApplicationProperties1ShowHint(var HintStr: string;
       var CanShow: Boolean; var HintInfo: THintInfo);
@@ -525,6 +528,9 @@ end;
 procedure TfrmMain.oglGameWindowKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
+  if Shift <> [] then
+    Exit;
+
   case Key of
     VK_W, VK_NUMPAD8, VK_UP:
       MoveBy(-8, -8);
@@ -1125,6 +1131,12 @@ begin
   frmVirtualLayer.Show;
 end;
 
+procedure TfrmMain.acWalkableExecute(Sender: TObject);
+begin
+  InvalidateFilter;
+  FRepaintNeeded := True;
+end;
+
 procedure TfrmMain.acDrawExecute(Sender: TObject);
 begin
   acDraw.Checked := True;
@@ -2311,7 +2323,7 @@ end;
 procedure TfrmMain.Render;
 var
   highlight: Boolean;
-  intensity: GLfloat;
+  intensity, red, green, blue: GLfloat;
   blockInfo: PBlockInfo;
   item: TWorldItem;
 begin
@@ -2345,10 +2357,31 @@ begin
       SetDarkLights;
     end;
 
+    case blockInfo^.WalkRestriction of
+      wrNone:
+        begin
+          red := 1;
+          green := 1;
+          blue := 1;
+        end;
+      wrCanWalk:
+        begin
+          red := 0.5;
+          green := 1;
+          blue := 0.5;
+        end;
+      wrCannotWalk:
+        begin
+          red := 1;
+          green := 0.5;
+          blue := 0.5;
+        end;
+    end;
+
     if blockInfo^.Translucent then
-      glColor4f(intensity, intensity, intensity, 0.8)
+      glColor4f(intensity * red, intensity * green, intensity * blue, 0.8)
     else
-      glColor4f(intensity, intensity, intensity, 1.0);
+      glColor4f(intensity * red, intensity * green, intensity * blue, 1.0);
 
     highlight := blockInfo^.Highlighted and item.CanBeEdited;
 
@@ -2362,7 +2395,7 @@ begin
     begin
       glBindTexture(GL_TEXTURE_2D, blockInfo^.HighRes.Texture);
 
-      if not highlight then
+      if not highlight and (blockInfo^.WalkRestriction = wrNone) then
         glEnable(GL_LIGHTING);
 
       glBegin(GL_QUADS);
@@ -2376,7 +2409,7 @@ begin
         glTexCoord2i(1, 0); glVertex2iv(@blockInfo^.DrawQuad[1]);
       glEnd;
 
-      if not highlight then
+      if not highlight and (blockInfo^.WalkRestriction = wrNone) then
         glDisable(GL_LIGHTING);
     end else
     begin
@@ -2722,8 +2755,13 @@ end;
 procedure TfrmMain.UpdateFilter;
 var
   blockInfo: PBlockInfo;
+  tileData: TTiledata;
+  staticTileData: TStaticTileData;
+  lastSurface: PBlockInfo;
+  surfaceTop: Integer;
 begin
   blockInfo := nil;
+  lastSurface := nil;
   while FScreenBuffer.Iterate(blockInfo) do
   begin
     if blockInfo^.State in [ssNormal, ssFiltered] then
@@ -2739,8 +2777,56 @@ begin
       begin
         blockInfo^.State := ssFiltered;
       end;
+
+      blockInfo^.WalkRestriction := wrNone;
+      if acWalkable.Checked then
+      begin
+        if blockInfo^.Item is TMapCell then
+        begin
+          tileData := ResMan.Tiledata.LandTiles[blockInfo^.Item.TileID];
+          if tdfImpassable in tileData.Flags then
+          begin
+            blockInfo^.WalkRestriction := wrCannotWalk;
+            lastSurface := nil;
+          end else
+          begin
+            blockInfo^.WalkRestriction := wrCanWalk;
+            lastSurface := blockInfo;
+            surfaceTop := blockInfo^.Item.Z;
+          end;
+        end else
+        begin
+          staticTileData := ResMan.Tiledata.StaticTiles[blockInfo^.Item.TileID];
+          if (lastSurface <> nil) and (lastSurface^.WalkRestriction = wrCanWalk) and
+             (lastSurface^.Item.X = blockInfo^.Item.X) and
+             (lastSurface^.Item.Y = blockInfo^.Item.Y) and ([tdfSurface,
+              tdfImpassable] * staticTileData.Flags <> []) then
+          begin
+            if (blockInfo^.Item.Z < surfaceTop + 16) and
+               ((blockInfo^.Item.Z > lastSurface^.Item.Z + 2) or
+                not (tdfSurface in staticTileData.Flags)) then
+              lastSurface^.WalkRestriction := wrCannotWalk;
+          end;
+
+          if tdfSurface in staticTileData.Flags then
+          begin
+            if tdfImpassable in staticTileData.Flags then
+            begin
+              blockInfo^.WalkRestriction := wrCannotWalk;
+              lastSurface := nil;
+            end else
+            begin
+              blockInfo^.WalkRestriction := wrCanWalk;
+              lastSurface := blockInfo;
+              surfaceTop := blockInfo^.Item.Z + staticTileData.Height;
+            end;
+          end;
+        end;
+      end; //acWalkable.Checked
+
     end;
   end;
+
   Include(FScreenBufferState, sbsFiltered);
 
   if (FLightManager.LightLevel > 0) and not acFlat.Checked then
diff --git a/Server/ULandscape.pas b/Server/ULandscape.pas
index 7d9ae56..42361e5 100644
--- a/Server/ULandscape.pas
+++ b/Server/ULandscape.pas
@@ -30,7 +30,7 @@ unit ULandscape;
 interface
 
 uses
-  SysUtils, Classes, math, UGenericIndex, UMap, UStatics, UWorldItem, UMulBlock,
+  SysUtils, Classes, math, UGenericIndex, UMap, UStatics, UWorldItem,
   UTileDataProvider, URadarMap,
   UCacheManager, ULinkedList, UBufferedStreams,
   UEnhancedMemoryStream, UPacketHandlers, UPackets, UNetState, UEnums;
@@ -207,6 +207,7 @@ begin
     end;
     block.Free;
   end;
+  FChanged := False;
 end;
 
 constructor TSeperatedStaticBlock.Create(AData: TStream; AIndex: TGenericIndex);
@@ -558,7 +559,7 @@ end;
 
 procedure TLandscape.SaveBlock(AWorldBlock: TWorldBlock);
 var
-  i, j, size: Integer;
+  size: Integer;
   index: TGenericIndex;
 begin
   if AWorldBlock is TMapBlock then
diff --git a/Server/cedserver.lpi b/Server/cedserver.lpi
index 2dc95d3..405f1f7 100644
--- a/Server/cedserver.lpi
+++ b/Server/cedserver.lpi
@@ -42,7 +42,7 @@
         <PackageName Value="lnetbase"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="15">
+    <Units Count="16">
       <Unit0>
         <Filename Value="cedserver.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -118,6 +118,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UStatics"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="../UOLib/UMap.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UMap"/>
+      </Unit15>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/Server/cedserver.lpr b/Server/cedserver.lpr
index 447e175..5c1b5b6 100644
--- a/Server/cedserver.lpr
+++ b/Server/cedserver.lpr
@@ -1,76 +1,74 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2008 Andreas Schneider
- *)
-program cedserver;
-
-{$mode objfpc}{$H+}
-
-uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
-  cthreads,
-  {$ENDIF}{$ENDIF}
-  SysUtils, Classes, lnetbase, UConfig, UCEDServer, URadarMap,
-  ULargeScaleOperations, UPackets, UAdminHandling, UClientHandling, ULandscape,
-  UPacketHandlers, URegions, UStatics, Logging;
-  
-{$I version.inc}
-  
-{$IFDEF WINDOWS}{$R cedserver.rc}{$ENDIF}
-
-begin
-  Writeln('');
-  Writeln('CentrED Server Version ', ProductVersion);
-  Writeln('Copyright ', Copyright);
-  //Writeln('================================');
-  Writeln('');
-
-  {$IFDEF Windows}
-  if FileExists(ConfigFile) then
-    Config := TConfig.Create(ConfigFile)
-  else
-    Config := TConfig.Init(ConfigFile);
-  {$ELSE}
-  if ParamStr(1) = '--init' then
-    Config := TConfig.Init(ConfigFile)
-  else if FileExists(ConfigFile) then
-    Config := TConfig.Create(ConfigFile)
-  else begin
-    Writeln('No valid config file was found. Use --init to create one.');
-    Halt;
-  end;
-  {$ENDIF}
-  
-  Writeln(TimeStamp, 'Initialization started');
-  Randomize;
-  CEDServerInstance := TCEDServer.Create;
-  Writeln(TimeStamp, 'Initialization done');
-  CEDServerInstance.Run;
-  Write(TimeStamp, 'Shutting down ... ');
-  FreeAndNil(CEDServerInstance);
-  Config.Flush;
-  FreeAndNil(Config);
-  Writeln('done');
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2008 Andreas Schneider
+ *)
+program cedserver;
+
+{$mode objfpc}{$H+}
+
+uses
+  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  cthreads,
+  {$ENDIF}{$ENDIF}
+  SysUtils, UConfig, UCEDServer;
+  
+{$I version.inc}
+  
+{$IFDEF WINDOWS}{$R cedserver.rc}{$ENDIF}
+
+begin
+  Writeln('');
+  Writeln('CentrED Server Version ', ProductVersion);
+  Writeln('Copyright ', Copyright);
+  //Writeln('================================');
+  Writeln('');
+
+  {$IFDEF Windows}
+  if FileExists(ConfigFile) then
+    Config := TConfig.Create(ConfigFile)
+  else
+    Config := TConfig.Init(ConfigFile);
+  {$ELSE}
+  if ParamStr(1) = '--init' then
+    Config := TConfig.Init(ConfigFile)
+  else if FileExists(ConfigFile) then
+    Config := TConfig.Create(ConfigFile)
+  else begin
+    Writeln('No valid config file was found. Use --init to create one.');
+    Halt;
+  end;
+  {$ENDIF}
+  
+  Writeln(TimeStamp, 'Initialization started');
+  Randomize;
+  CEDServerInstance := TCEDServer.Create;
+  Writeln(TimeStamp, 'Initialization done');
+  CEDServerInstance.Run;
+  Write(TimeStamp, 'Shutting down ... ');
+  FreeAndNil(CEDServerInstance);
+  Config.Flush;
+  FreeAndNil(Config);
+  Writeln('done');
+end.
+
diff --git a/UOLib/UMap.pas b/UOLib/UMap.pas
index d81e4d4..a223cd6 100644
--- a/UOLib/UMap.pas
+++ b/UOLib/UMap.pas
@@ -173,8 +173,9 @@ begin
       for iX := 0 to 7 do
         Cells[iY * 8 + iX] := TMapCell.Create(Self, buffer, AX * 8 + iX, AY * 8 + iY);
   finally
-    if Assigned(buffer) then FreeAndNil(buffer);
+    buffer.Free;
   end;
+  FChanged := False;
 end;
 
 constructor TMapBlock.Create(AData: TStream);
diff --git a/UOLib/UStatics.pas b/UOLib/UStatics.pas
index 7d554b6..08535ca 100644
--- a/UOLib/UStatics.pas
+++ b/UOLib/UStatics.pas
@@ -189,6 +189,7 @@ begin
       FItems.Add(TStaticItem.Create(Self, block, AX, AY));
     block.Free;
   end;
+  FChanged := False;
 end;
 
 constructor TStaticBlock.Create(AData: TStream; AIndex: TGenericIndex);