diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi
index 18079de..4187d12 100644
--- a/Client/CentrED.lpi
+++ b/Client/CentrED.lpi
@@ -18,12 +18,15 @@
-
-
+
+
+
+
+
@@ -73,6 +76,9 @@
+
+
+
diff --git a/Client/CentrED.lpr b/Client/CentrED.lpr
index 84f72e4..d633c3d 100644
--- a/Client/CentrED.lpr
+++ b/Client/CentrED.lpr
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2011 Andreas Schneider
+ * Portions Copyright 2012 Andreas Schneider
*)
program CentrED;
diff --git a/Client/UfrmAbout.lfm b/Client/UfrmAbout.lfm
index f6fa6b9..63cfb2b 100644
--- a/Client/UfrmAbout.lfm
+++ b/Client/UfrmAbout.lfm
@@ -116,7 +116,7 @@ object frmAbout: TfrmAbout
Align = alTop
Alignment = taCenter
BorderSpacing.Around = 4
- Caption = 'Copyright 2011 Andreas Schneider'
+ Caption = 'Copyright 2012 Andreas Schneider'
ParentColor = False
end
end
diff --git a/Client/UfrmAbout.pas b/Client/UfrmAbout.pas
index 917664f..669edce 100644
--- a/Client/UfrmAbout.pas
+++ b/Client/UfrmAbout.pas
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2011 Andreas Schneider
+ * Portions Copyright 2012 Andreas Schneider
*)
unit UfrmAbout;
@@ -75,6 +75,7 @@ end;
procedure TfrmAbout.FormCreate(Sender: TObject);
begin
lblVersion.Caption := Format('Version %s', [VersionInfo.GetProductVersionString]);
+ lblCopyright.Caption := VersionInfo.GetCopyright(True);
end;
initialization
diff --git a/Client/UfrmLogin.lfm b/Client/UfrmLogin.lfm
index f0f6ac7..4ebe09b 100644
--- a/Client/UfrmLogin.lfm
+++ b/Client/UfrmLogin.lfm
@@ -1,20 +1,20 @@
object frmLogin: TfrmLogin
Left = 290
- Height = 250
+ Height = 265
Top = 201
Width = 483
ActiveControl = btnOK
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'UO CentrED'
- ClientHeight = 250
+ ClientHeight = 265
ClientWidth = 483
Font.Height = -11
OnClose = FormClose
OnCreate = FormCreate
Position = poScreenCenter
ShowInTaskBar = stAlways
- LCLVersion = '0.9.29'
+ LCLVersion = '0.9.31'
object lblCopyright: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = gbData
@@ -24,12 +24,13 @@ object frmLogin: TfrmLogin
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 0
- Height = 1
+ Height = 14
Top = 249
Width = 483
Alignment = taCenter
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8
+ Caption = ' '
ParentColor = False
end
object gbConnection: TGroupBox
diff --git a/Client/UfrmLogin.pas b/Client/UfrmLogin.pas
index c0fcae6..ad44ba8 100644
--- a/Client/UfrmLogin.pas
+++ b/Client/UfrmLogin.pas
@@ -79,9 +79,7 @@ var
implementation
uses
- UdmNetwork;
-
-{$I version.inc}
+ UdmNetwork, vinfo;
{ TfrmLogin }
@@ -171,8 +169,8 @@ procedure TfrmLogin.FormCreate(Sender: TObject);
var
searchRec: TSearchRec;
begin
- lblCopyright.Caption := Format('UO CentrED Client Version %s (c) %s',
- [ProductVersion, Copyright]);
+ lblCopyright.Caption := Format('UO CentrED Client Version %s %s',
+ [VersionInfo.GetProductVersionString, VersionInfo.GetCopyright]);
FProfilePath := GetAppConfigDir(False) + 'Profiles' + PathDelim;
ForceDirectories(FProfilePath);
diff --git a/Server/cedserver.lpi b/Server/cedserver.lpi
index 0adfb97..f3ffad3 100644
--- a/Server/cedserver.lpi
+++ b/Server/cedserver.lpi
@@ -13,15 +13,18 @@
-
-
-
+
+
+
+
+
+
-
+
@@ -48,6 +51,7 @@
+
@@ -64,8 +68,11 @@
+
+
+
-
+
@@ -92,6 +99,7 @@
+
@@ -211,7 +219,7 @@
-
+
@@ -228,7 +236,7 @@
-
+
diff --git a/Server/cedserver.lpr b/Server/cedserver.lpr
index 627b3f6..be6bd76 100644
--- a/Server/cedserver.lpr
+++ b/Server/cedserver.lpr
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2011 Andreas Schneider
+ * Portions Copyright 2012 Andreas Schneider
*)
program cedserver;
@@ -37,8 +37,8 @@ uses
begin
Writeln('');
- Writeln('CentrED Server Version ', versionInfo.GetProductVersionString);
- Writeln('Copyright 2011 Andreas Schneider');
+ Writeln('CentrED Server Version ', VersionInfo.GetProductVersionString);
+ Writeln(VersionInfo.GetCopyright(True));
//Writeln('================================');
Writeln('');
diff --git a/Setup/CentrED_win32.iss b/Setup/CentrED_win32.iss
index da4544c..a9a3872 100644
--- a/Setup/CentrED_win32.iss
+++ b/Setup/CentrED_win32.iss
@@ -3,7 +3,7 @@
[Setup]
AppName=CentrED
-AppVerName=CentrED 0.6.1
+AppVerName=CentrED 0.6.2
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.6.1
+VersionInfoVersion=0.6.2
VersionInfoCompany=AKS DataBasis
VersionInfoDescription=Client/Server based multiuser map editor
-VersionInfoTextVersion=0.6.1
+VersionInfoTextVersion=0.6.2
VersionInfoCopyright=Andreas Schneider
AppCopyright=Andreas Schneider
InfoBeforeFile=Changelog.txt
SignTool=defsign $f
-AppVersion=0.6.1
+AppVersion=0.6.2
AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5}
SignedUninstaller=true
@@ -44,4 +44,4 @@ Name: {commondesktop}\CentrED; Filename: {app}\CentrED.exe; Tasks: desktopicon
[Run]
Filename: {app}\CentrED.exe; Description: {cm:LaunchProgram,CentrED}; Flags: nowait postinstall skipifsilent
[Messages]
-BeveledLabel=Copyright 2009 Andreas Schneider
+BeveledLabel=Copyright 2012 Andreas Schneider
diff --git a/Setup/Changelog.txt b/Setup/Changelog.txt
index d179b60..0cb8366 100644
--- a/Setup/Changelog.txt
+++ b/Setup/Changelog.txt
@@ -1,6 +1,14 @@
Changelog:
[C] = Client, [S] = Server, [-] = Both/Unrelated
+Version 0.6.2
+=============
+[C] Added random pool for hues
+[C] Added more infos to the account list (for admins)
+[C] Added sorting to account list
+[C] Fixed possible crash with light sources enabled
+[-] Added support for new tiledata from High Seas expansion
+
Version 0.6.1
=============
[C] Added highlighting for (un)walkable tiles
@@ -9,7 +17,6 @@ Version 0.6.1
[C] Fixed flickering that occured in some cases
[S] Fixed server not always saving changes
-
Version 0.6
===========
[C] Added rendering of lightsources
diff --git a/version.inc b/version.inc
index 916c4ff..ab17349 100644
--- a/version.inc
+++ b/version.inc
@@ -1,5 +1,2 @@
const
- ProductVersion = '0.6.1';
ProtocolVersion = 6;
- Revision = '209';
- Copyright = '2009 Andreas Schneider';
diff --git a/vinfo.pas b/vinfo.pas
index b6bec70..6f6084f 100644
--- a/vinfo.pas
+++ b/vinfo.pas
@@ -29,6 +29,8 @@ type
//Helper functions
function GetProductVersionString(AMinPrecision: TVersionPrecision = 2): String;
+ function GetCopyright(ALong: Boolean = false): String;
+ procedure PrintStringFileInfo;
end;
var
@@ -100,6 +102,31 @@ begin
end;
end;
+function TVersionInfo.GetCopyright(ALong: Boolean = False): String;
+begin
+ Result := StringFileInfo[0]['LegalCopyright'];
+ if ALong then
+ Result := StringReplace(Result, '(c) ', 'Copyright ', []);
+end;
+
+procedure TVersionInfo.PrintStringFileInfo;
+var
+ verStringInfo: TVersionStringFileInfo;
+ verStringTable: TVersionStringTable;
+ i, j: Integer;
+begin
+ verStringInfo := GetStringFileInfo;
+ for i := 0 to verStringInfo.Count - 1 do
+ begin
+ writeln('Version String Info ', i + 1);
+ verStringTable := verStringInfo.Items[i];
+ for j := 0 to verStringTable.Count - 1 do
+ begin
+ writeln(' ', verStringTable.Keys[j], ' = ', verStringTable.ValuesByIndex[j]);
+ end;
+ end;
+end;
+
initialization
VersionInfo := TVersionInfo.Create;
VersionInfo.Load(HINSTANCE);