* Removed heContrns dependency (replaced by fgl ... again)

Client/ULightManager.pas

@@ -32,7 +32,7 @@ interface
 
 uses
   Classes, SysUtils, Imaging, ImagingTypes, ImagingClasses, ImagingCanvases,
-  ImagingOpenGL, GL, GLu, GLext, Math, heContnrs, ULandscape, UWorldItem,
+  ImagingOpenGL, GL, GLu, GLext, Math, fgl, ULandscape, UWorldItem,
   UCacheManager, DOM, XMLRead;
 
 const
@@ -85,7 +85,7 @@ type
     property Material: TLightMaterial read FMaterial;
   end;
 
-  TLightSources = specialize TheObjectVector<TLightSource>;
+  TLightSources = specialize TFPGObjectList<TLightSource>;
 
   { TLightManager }
 

UContnrExt.pas

@@ -1,54 +0,0 @@
-(*
-  * 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 2012 Andreas Schneider
-  *)
-unit UContnrExt;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  heContnrs;
-
-type
-
-  { TPointerVectorSet }
-
-  generic TPointerVectorSet<T> = class(specialize TheCmpVectorSet<T>)
-  public
-    function Compare(const A, B: T): Integer; override;
-  end;
-
-implementation
-
-{ TPointerVectorSet }
-
-function TPointerVectorSet.Compare(const A, B: T): Integer;
-begin
-  Result := @A - @B;
-end;
-
-end.
-

UOLib/UMap.pas

@@ -30,7 +30,7 @@ unit UMap;
 interface
 
 uses
-  SysUtils, Classes, heContnrs, UWorldItem;
+  SysUtils, Classes, fgl, UWorldItem;
 
 const
   MapCellSize = 3;
@@ -60,7 +60,7 @@ type
     procedure Write(AData: TStream); override;
   end;
 
-  TMapCellList = specialize TheObjectVector<TMapCell>;
+  TMapCellList = specialize TFPGObjectList<TMapCell>;
 
   { TMapBlock }
 

UOLib/UStatics.pas

@@ -30,7 +30,7 @@ unit UStatics;
 interface
 
 uses
-  SysUtils, Classes, heContnrs, UGenericIndex, UWorldItem, UTiledata;
+  SysUtils, Classes, fgl, UGenericIndex, UWorldItem, UTiledata;
 
 type
   { TStaticItem }
@@ -56,7 +56,7 @@ type
     procedure Write(AData: TStream); override;
   end;
 
-  TStaticItemList = specialize TheObjectVector<TStaticItem>;
+  TStaticItemList = specialize TFPGObjectList<TStaticItem>;
 
   { TStaticBlock}
 

UOLib/UWorldItem.pas

@@ -30,7 +30,7 @@ unit UWorldItem;
 interface
 
 uses
-  Classes, heContnrs, UMulBlock;
+  Classes, fgl, UMulBlock;
 
 type
   TWorldBlock = class;
@@ -81,7 +81,7 @@ type
     property RawZ: ShortInt read FZ;
   end;
 
-  TWorldItemList = specialize TheObjectVector<TWorldItem>;
+  TWorldItemList = specialize TFPGObjectList<TWorldItem>;
 
   { TWorldBlock }