From db0ef54660e5c2c1499ed7aa123881dd689c3451 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 22 Dec 2009 20:51:43 +0100 Subject: [PATCH] - Pushed version to 0.6 --- Client/CentrED.lpi | 14 ++-- Client/CentrED.rc | 54 +++++++-------- Server/cedserver.lpi | 17 +++-- Server/cedserver.lpr | 150 ++++++++++++++++++++-------------------- Setup/CentrED_win32.iss | 9 +-- Setup/Changelog.txt | 13 ++++ version.inc | 10 +-- 7 files changed, 146 insertions(+), 121 deletions(-) diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi index 44d1c1e..f8ff03c 100644 --- a/Client/CentrED.lpi +++ b/Client/CentrED.lpi @@ -17,9 +17,9 @@ - - - + + + @@ -350,15 +350,15 @@ - + - - + + @@ -370,7 +370,7 @@ +-dNoLogging"/> diff --git a/Client/CentrED.rc b/Client/CentrED.rc index e12e3ab..47e9836 100644 --- a/Client/CentrED.rc +++ b/Client/CentrED.rc @@ -1,27 +1,27 @@ -1 VERSIONINFO -FILEVERSION 0,5,0,162 -PRODUCTVERSION 0,5,0,162 -{ - BLOCK "StringFileInfo" - { - BLOCK "040904E4" - { - VALUE "Comments", "\000" - VALUE "CompanyName", "AKS DataBasis\000" - VALUE "FileDescription", "UO CentrED\000" - VALUE "FileVersion", "0.5.0.162\000" - VALUE "InternalName", "\000" - VALUE "LegalCopyright", "Andreas Schneider\000" - VALUE "LegalTrademarks", "\000" - VALUE "OriginalFilename", "CentrED.exe\000" - VALUE "ProductName", "CentrED\000" - VALUE "ProductVersion", "0.5.0.162\000" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0409, 0x04E4 - } -} - -MAINICON ICON "CentrED.ico" +1 VERSIONINFO +FILEVERSION 0,6,0,200 +PRODUCTVERSION 0,6,0,200 +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "Comments", "\000" + VALUE "CompanyName", "AKS DataBasis\000" + VALUE "FileDescription", "UO CentrED\000" + VALUE "FileVersion", "0.6.0.200\000" + VALUE "InternalName", "\000" + VALUE "LegalCopyright", "Andreas Schneider\000" + VALUE "LegalTrademarks", "\000" + VALUE "OriginalFilename", "CentrED.exe\000" + VALUE "ProductName", "CentrED\000" + VALUE "ProductVersion", "0.6.0.200\000" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0409, 0x04E4 + } +} + +MAINICON ICON "CentrED.ico" diff --git a/Server/cedserver.lpi b/Server/cedserver.lpi index 1cb51a1..f794501 100644 --- a/Server/cedserver.lpi +++ b/Server/cedserver.lpi @@ -11,7 +11,16 @@ - + + + + + + + + + + @@ -129,13 +138,13 @@ - + - - + + diff --git a/Server/cedserver.lpr b/Server/cedserver.lpr index ccd1318..447e175 100644 --- a/Server/cedserver.lpr +++ b/Server/cedserver.lpr @@ -1,74 +1,76 @@ -(* - * 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} - -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, 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. + diff --git a/Setup/CentrED_win32.iss b/Setup/CentrED_win32.iss index b2a5646..6a674ce 100644 --- a/Setup/CentrED_win32.iss +++ b/Setup/CentrED_win32.iss @@ -3,7 +3,7 @@ [Setup] AppName=CentrED -AppVerName=CentrED 0.5 +AppVerName=CentrED 0.6 AppPublisher=AKS DataBasis AppPublisherURL=http://www.aksdb.de/CentrED AppSupportURL=http://www.aksdb.de/CentrED @@ -13,15 +13,15 @@ DefaultGroupName=AKS DataBasis\CentrED OutputBaseFilename=CentrED_win32 Compression=lzma SolidCompression=true -VersionInfoVersion=0.5 +VersionInfoVersion=0.6 VersionInfoCompany=AKS DataBasis VersionInfoDescription=Client/Server based multiuser map editor -VersionInfoTextVersion=0.5 +VersionInfoTextVersion=0.6 VersionInfoCopyright=Andreas Schneider AppCopyright=Andreas Schneider InfoBeforeFile=Changelog.txt SignTool=defsign $f -AppVersion=0.5 +AppVersion=0.6 AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5} SignedUninstaller=true @@ -35,6 +35,7 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad Source: ..\bin\CentrED.exe; DestDir: {app}; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Source: ..\bin\CentrED.dat; DestDir: {app} +Source: ..\bin\nodraw.txt; DestDir: {app} [Icons] Name: {group}\CentrED; Filename: {app}\CentrED.exe diff --git a/Setup/Changelog.txt b/Setup/Changelog.txt index 7820647..ac0f712 100644 --- a/Setup/Changelog.txt +++ b/Setup/Changelog.txt @@ -1,6 +1,19 @@ Changelog: [C] = Client, [S] = Server, [-] = Both/Unrelated +Version 0.6 +=========== +[C] Added rendering of lightsources +[C] Added buttons to the largescale and region dialogs to pick locations from the game window +[-] Added support for larger tiledata/animdata/art files +[C] Added ability to define custom "nodraw" tiles (see Wiki) +[C] Changed static tile render order +[C] Changed translucent tiles to be more opaque +[C] Changed the format of locations and random presets to be less fragile +[C] Fixed a crash related to the Virtual Layer +[C] Fixed several smaller bugs +[S] Fixed memory leak + Version 0.5 =========== [C] Completely reworked rendering (should be much faster now) diff --git a/version.inc b/version.inc index 1242631..5eba465 100644 --- a/version.inc +++ b/version.inc @@ -1,5 +1,5 @@ -const - ProductVersion = '0.5.0'; - ProtocolVersion = 6; - Revision = '162'; - Copyright = '2009 Andreas Schneider'; +const + ProductVersion = '0.6.0'; + ProtocolVersion = 6; + Revision = '200'; + Copyright = '2009 Andreas Schneider';