- Added optional highlight for (un)walkable tiles

- Fixed lightmanager to draw in the correct color
- Fixed TMapBlock and TStaticBlock to correctly initialize itself as "unchanged"
- Cleanup in the server project

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

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>

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.
+