- Pushed version to 0.6

This commit is contained in:
Andreas Schneider 2009-12-22 20:51:43 +01:00
parent eb62553f5c
commit db0ef54660
7 changed files with 146 additions and 121 deletions

View File

@ -17,9 +17,9 @@
<LazDoc Paths="../doc"/> <LazDoc Paths="../doc"/>
<VersionInfo> <VersionInfo>
<UseVersionInfo Value="True"/> <UseVersionInfo Value="True"/>
<CurrentMajorRevNr Value="5"/> <CurrentMajorRevNr Value="6"/>
<CurrentBuildNr Value="162"/> <CurrentBuildNr Value="200"/>
<ProjectVersion Value="0.5.0.162"/> <ProjectVersion Value="0.6.0.200"/>
<CompanyName Value="AKS DataBasis"/> <CompanyName Value="AKS DataBasis"/>
<FileDescription Value="UO CentrED"/> <FileDescription Value="UO CentrED"/>
<LegalCopyright Value="Andreas Schneider"/> <LegalCopyright Value="Andreas Schneider"/>
@ -350,15 +350,15 @@
<CodeGeneration> <CodeGeneration>
<SmartLinkUnit Value="True"/> <SmartLinkUnit Value="True"/>
<Optimizations> <Optimizations>
<OptimizationLevel Value="0"/> <OptimizationLevel Value="3"/>
</Optimizations> </Optimizations>
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDebugInfo Value="True"/> <UseLineInfoUnit Value="False"/>
<UseHeaptrc Value="True"/>
<UseExternalDbgSyms Value="True"/> <UseExternalDbgSyms Value="True"/>
</Debugging> </Debugging>
<LinkSmart Value="True"/>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>
@ -370,7 +370,7 @@
<IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/> <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
</CompilerMessages> </CompilerMessages>
<CustomOptions Value="-FE../bin/ <CustomOptions Value="-FE../bin/
#-dNoLogging"/> -dNoLogging"/>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>

View File

@ -1,27 +1,27 @@
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,5,0,162 FILEVERSION 0,6,0,200
PRODUCTVERSION 0,5,0,162 PRODUCTVERSION 0,6,0,200
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
{ {
BLOCK "040904E4" BLOCK "040904E4"
{ {
VALUE "Comments", "\000" VALUE "Comments", "\000"
VALUE "CompanyName", "AKS DataBasis\000" VALUE "CompanyName", "AKS DataBasis\000"
VALUE "FileDescription", "UO CentrED\000" VALUE "FileDescription", "UO CentrED\000"
VALUE "FileVersion", "0.5.0.162\000" VALUE "FileVersion", "0.6.0.200\000"
VALUE "InternalName", "\000" VALUE "InternalName", "\000"
VALUE "LegalCopyright", "Andreas Schneider\000" VALUE "LegalCopyright", "Andreas Schneider\000"
VALUE "LegalTrademarks", "\000" VALUE "LegalTrademarks", "\000"
VALUE "OriginalFilename", "CentrED.exe\000" VALUE "OriginalFilename", "CentrED.exe\000"
VALUE "ProductName", "CentrED\000" VALUE "ProductName", "CentrED\000"
VALUE "ProductVersion", "0.5.0.162\000" VALUE "ProductVersion", "0.6.0.200\000"
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
{ {
VALUE "Translation", 0x0409, 0x04E4 VALUE "Translation", 0x0409, 0x04E4
} }
} }
MAINICON ICON "CentrED.ico" MAINICON ICON "CentrED.ico"

View File

@ -11,7 +11,16 @@
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <UseVersionInfo Value="True"/>
<CurrentMajorRevNr Value="6"/>
<CurrentBuildNr Value="200"/>
<ProjectVersion Value="0.6.0.200"/>
<CompanyName Value="AKS DataBasis"/>
<FileDescription Value="CentrED Server"/>
<InternalName Value="CentrED Server"/>
<LegalCopyright Value="Andreas Schneider"/>
<OriginalFilename Value="cedserver.exe"/>
<ProductName Value="CentrED"/>
</VersionInfo> </VersionInfo>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -129,13 +138,13 @@
<CodeGeneration> <CodeGeneration>
<SmartLinkUnit Value="True"/> <SmartLinkUnit Value="True"/>
<Optimizations> <Optimizations>
<OptimizationLevel Value="0"/> <OptimizationLevel Value="3"/>
</Optimizations> </Optimizations>
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDebugInfo Value="True"/> <UseLineInfoUnit Value="False"/>
<UseHeaptrc Value="True"/> <StripSymbols Value="True"/>
</Debugging> </Debugging>
<LinkSmart Value="True"/> <LinkSmart Value="True"/>
</Linking> </Linking>

View File

@ -1,74 +1,76 @@
(* (*
* CDDL HEADER START * CDDL HEADER START
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License, Version 1.0 only * Common Development and Distribution License, Version 1.0 only
* (the "License"). You may not use this file except in compliance * (the "License"). You may not use this file except in compliance
* with the License. * with the License.
* *
* You can obtain a copy of the license at * You can obtain a copy of the license at
* http://www.opensource.org/licenses/cddl1.php. * http://www.opensource.org/licenses/cddl1.php.
* See the License for the specific language governing permissions * See the License for the specific language governing permissions
* and limitations under the License. * and limitations under the License.
* *
* When distributing Covered Code, include this CDDL HEADER in each * When distributing Covered Code, include this CDDL HEADER in each
* file and include the License file at * file and include the License file at
* http://www.opensource.org/licenses/cddl1.php. If applicable, * http://www.opensource.org/licenses/cddl1.php. If applicable,
* add the following below this CDDL HEADER, with the fields enclosed * add the following below this CDDL HEADER, with the fields enclosed
* by brackets "[]" replaced with your own identifying * information: * by brackets "[]" replaced with your own identifying * information:
* Portions Copyright [yyyy] [name of copyright owner] * Portions Copyright [yyyy] [name of copyright owner]
* *
* CDDL HEADER END * CDDL HEADER END
* *
* *
* Portions Copyright 2008 Andreas Schneider * Portions Copyright 2008 Andreas Schneider
*) *)
program cedserver; program cedserver;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
uses uses
{$IFDEF UNIX}{$IFDEF UseCThreads} {$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads, cthreads,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
SysUtils, Classes, lnetbase, UConfig, UCEDServer, URadarMap, SysUtils, Classes, lnetbase, UConfig, UCEDServer, URadarMap,
ULargeScaleOperations, UPackets, UAdminHandling, UClientHandling, ULandscape, ULargeScaleOperations, UPackets, UAdminHandling, UClientHandling, ULandscape,
UPacketHandlers, URegions, UStatics, Logging; UPacketHandlers, URegions, UStatics, Logging;
{$I version.inc} {$I version.inc}
begin {$IFDEF WINDOWS}{$R cedserver.rc}{$ENDIF}
Writeln('');
Writeln('CentrED Server Version ', ProductVersion); begin
Writeln('Copyright ', Copyright); Writeln('');
//Writeln('================================'); Writeln('CentrED Server Version ', ProductVersion);
Writeln(''); Writeln('Copyright ', Copyright);
//Writeln('================================');
{$IFDEF Windows} Writeln('');
if FileExists(ConfigFile) then
Config := TConfig.Create(ConfigFile) {$IFDEF Windows}
else if FileExists(ConfigFile) then
Config := TConfig.Init(ConfigFile); Config := TConfig.Create(ConfigFile)
{$ELSE} else
if ParamStr(1) = '--init' then Config := TConfig.Init(ConfigFile);
Config := TConfig.Init(ConfigFile) {$ELSE}
else if FileExists(ConfigFile) then if ParamStr(1) = '--init' then
Config := TConfig.Create(ConfigFile) Config := TConfig.Init(ConfigFile)
else begin else if FileExists(ConfigFile) then
Writeln('No valid config file was found. Use --init to create one.'); Config := TConfig.Create(ConfigFile)
Halt; else begin
end; Writeln('No valid config file was found. Use --init to create one.');
{$ENDIF} Halt;
end;
Writeln(TimeStamp, 'Initialization started'); {$ENDIF}
Randomize;
CEDServerInstance := TCEDServer.Create; Writeln(TimeStamp, 'Initialization started');
Writeln(TimeStamp, 'Initialization done'); Randomize;
CEDServerInstance.Run; CEDServerInstance := TCEDServer.Create;
Write(TimeStamp, 'Shutting down ... '); Writeln(TimeStamp, 'Initialization done');
FreeAndNil(CEDServerInstance); CEDServerInstance.Run;
Config.Flush; Write(TimeStamp, 'Shutting down ... ');
FreeAndNil(Config); FreeAndNil(CEDServerInstance);
Writeln('done'); Config.Flush;
end. FreeAndNil(Config);
Writeln('done');
end.

View File

@ -3,7 +3,7 @@
[Setup] [Setup]
AppName=CentrED AppName=CentrED
AppVerName=CentrED 0.5 AppVerName=CentrED 0.6
AppPublisher=AKS DataBasis AppPublisher=AKS DataBasis
AppPublisherURL=http://www.aksdb.de/CentrED AppPublisherURL=http://www.aksdb.de/CentrED
AppSupportURL=http://www.aksdb.de/CentrED AppSupportURL=http://www.aksdb.de/CentrED
@ -13,15 +13,15 @@ DefaultGroupName=AKS DataBasis\CentrED
OutputBaseFilename=CentrED_win32 OutputBaseFilename=CentrED_win32
Compression=lzma Compression=lzma
SolidCompression=true SolidCompression=true
VersionInfoVersion=0.5 VersionInfoVersion=0.6
VersionInfoCompany=AKS DataBasis VersionInfoCompany=AKS DataBasis
VersionInfoDescription=Client/Server based multiuser map editor VersionInfoDescription=Client/Server based multiuser map editor
VersionInfoTextVersion=0.5 VersionInfoTextVersion=0.6
VersionInfoCopyright=Andreas Schneider VersionInfoCopyright=Andreas Schneider
AppCopyright=Andreas Schneider AppCopyright=Andreas Schneider
InfoBeforeFile=Changelog.txt InfoBeforeFile=Changelog.txt
SignTool=defsign $f SignTool=defsign $f
AppVersion=0.5 AppVersion=0.6
AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5} AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5}
SignedUninstaller=true SignedUninstaller=true
@ -35,6 +35,7 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:Ad
Source: ..\bin\CentrED.exe; DestDir: {app}; Flags: ignoreversion Source: ..\bin\CentrED.exe; DestDir: {app}; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
Source: ..\bin\CentrED.dat; DestDir: {app} Source: ..\bin\CentrED.dat; DestDir: {app}
Source: ..\bin\nodraw.txt; DestDir: {app}
[Icons] [Icons]
Name: {group}\CentrED; Filename: {app}\CentrED.exe Name: {group}\CentrED; Filename: {app}\CentrED.exe

View File

@ -1,6 +1,19 @@
Changelog: Changelog:
[C] = Client, [S] = Server, [-] = Both/Unrelated [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 Version 0.5
=========== ===========
[C] Completely reworked rendering (should be much faster now) [C] Completely reworked rendering (should be much faster now)

View File

@ -1,5 +1,5 @@
const const
ProductVersion = '0.5.0'; ProductVersion = '0.6.0';
ProtocolVersion = 6; ProtocolVersion = 6;
Revision = '162'; Revision = '200';
Copyright = '2009 Andreas Schneider'; Copyright = '2009 Andreas Schneider';