From 365fa72dc99c73d5bfccb3feb61955abdac9db12 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 18 Dec 2009 01:07:55 +0100 Subject: [PATCH] - Changed TfrmMain.BuildTileList to use all available static tiles - Added static tile id checking to the random preset loading --- Client/CentrED.lpi | 720 ++++++++++++++++++++++---------------------- Client/UfrmMain.pas | 11 +- 2 files changed, 367 insertions(+), 364 deletions(-) diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi index a090aea..a1f118b 100644 --- a/Client/CentrED.lpi +++ b/Client/CentrED.lpi @@ -1,360 +1,360 @@ - - - - - - - - - - - - - <Icon Value="0"/> - </General> - <LazDoc Paths="../doc"/> - <VersionInfo> - <UseVersionInfo Value="True"/> - <CurrentMajorRevNr Value="5"/> - <CurrentBuildNr Value="162"/> - <ProjectVersion Value="0.5.0.162"/> - <CompanyName Value="AKS DataBasis"/> - <FileDescription Value="UO CentrED"/> - <LegalCopyright Value="Andreas Schneider"/> - <OriginalFilename Value="CentrED.exe"/> - <ProductName Value="CentrED"/> - </VersionInfo> - <PublishOptions> - <Version Value="2"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> - </PublishOptions> - <RunParams> - <local> - <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> - </local> - </RunParams> - <RequiredPackages Count="5"> - <Item1> - <PackageName Value="multiloglaz"/> - </Item1> - <Item2> - <PackageName Value="LazOpenGLContext"/> - <MinVersion Valid="True"/> - </Item2> - <Item3> - <PackageName Value="LCL"/> - </Item3> - <Item4> - <PackageName Value="lnetvisual"/> - <MinVersion Minor="5" Release="3" Valid="True"/> - </Item4> - <Item5> - <PackageName Value="virtualtreeview_package"/> - <MinVersion Major="4" Minor="5" Release="1" Valid="True"/> - </Item5> - </RequiredPackages> - <Units Count="43"> - <Unit0> - <Filename Value="CentrED.lpr"/> - <IsPartOfProject Value="True"/> - <UnitName Value="CentrED"/> - </Unit0> - <Unit1> - <Filename Value="UfrmMain.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmMain"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmMain"/> - </Unit1> - <Unit2> - <Filename Value="UdmNetwork.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="dmNetwork"/> - <ResourceBaseClass Value="DataModule"/> - <UnitName Value="UdmNetwork"/> - </Unit2> - <Unit3> - <Filename Value="UfrmLogin.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmLogin"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmLogin"/> - </Unit3> - <Unit4> - <Filename Value="UfrmInitialize.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmInitialize"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmInitialize"/> - </Unit4> - <Unit5> - <Filename Value="UfrmAccountControl.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmAccountControl"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmAccountControl"/> - </Unit5> - <Unit6> - <Filename Value="UfrmEditAccount.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmEditAccount"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmEditAccount"/> - </Unit6> - <Unit7> - <Filename Value="Tools/UfrmDrawSettings.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmDrawSettings"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmDrawSettings"/> - </Unit7> - <Unit8> - <Filename Value="Tools/UfrmBoundaries.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmBoundaries"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmBoundaries"/> - </Unit8> - <Unit9> - <Filename Value="Tools/UfrmElevateSettings.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmElevateSettings"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmElevateSettings"/> - </Unit9> - <Unit10> - <Filename Value="UOverlayUI.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UOverlayUI"/> - </Unit10> - <Unit11> - <Filename Value="UResourceManager.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UResourceManager"/> - </Unit11> - <Unit12> - <Filename Value="Tools/UfrmConfirmation.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmConfirmation"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmConfirmation"/> - </Unit12> - <Unit13> - <Filename Value="Tools/UfrmMoveSettings.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmMoveSettings"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmMoveSettings"/> - </Unit13> - <Unit14> - <Filename Value="UfrmAbout.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmAbout"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmAbout"/> - </Unit14> - <Unit15> - <Filename Value="Tools/UfrmHueSettings.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmHueSettings"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmHueSettings"/> - </Unit15> - <Unit16> - <Filename Value="UfrmRadar.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmRadarMap"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmRadar"/> - </Unit16> - <Unit17> - <Filename Value="UfrmLargeScaleCommand.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmLargeScaleCommand"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmLargeScaleCommand"/> - </Unit17> - <Unit18> - <Filename Value="Tools/UfrmVirtualLayer.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmVirtualLayer"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmVirtualLayer"/> - </Unit18> - <Unit19> - <Filename Value="Tools/UfrmFilter.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmFilter"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmFilter"/> - </Unit19> - <Unit20> - <Filename Value="UfrmTileInfo.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmTileInfo"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmTileInfo"/> - </Unit20> - <Unit21> - <Filename Value="UGUIPlatformUtils.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UGUIPlatformUtils"/> - </Unit21> - <Unit22> - <Filename Value="UPlatformTypes.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UPlatformTypes"/> - </Unit22> - <Unit23> - <Filename Value="UfrmRegionControl.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmRegionControl"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmRegionControl"/> - </Unit23> - <Unit24> - <Filename Value="UPacketHandlers.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UPacketHandlers"/> - </Unit24> - <Unit25> - <Filename Value="UPackets.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UPackets"/> - </Unit25> - <Unit26> - <Filename Value="ULandscape.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="ULandscape"/> - </Unit26> - <Unit27> - <Filename Value="UGameResources.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UGameResources"/> - </Unit27> - <Unit28> - <Filename Value="UAdminHandling.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UAdminHandling"/> - </Unit28> - <Unit29> - <Filename Value="Tools/UfrmToolWindow.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmToolWindow"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="UfrmToolWindow"/> - </Unit29> - <Unit30> - <Filename Value="../Logging.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="Logging"/> - </Unit30> - <Unit31> - <Filename Value="../UOLib/UStatics.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UStatics"/> - </Unit31> - <Unit32> - <Filename Value="../UOLib/UWorldItem.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UWorldItem"/> - </Unit32> - <Unit33> - <Filename Value="../UOLib/UMap.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UMap"/> - </Unit33> - <Unit34> - <Filename Value="../UOLib/UTiledata.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UTiledata"/> - </Unit34> - <Unit35> - <Filename Value="UGLFont.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UGLFont"/> - </Unit35> - <Unit36> - <Filename Value="../UOLib/UAnimData.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UAnimData"/> - </Unit36> - <Unit37> - <Filename Value="../MulProvider/UTileDataProvider.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UTileDataProvider"/> - </Unit37> - <Unit38> - <Filename Value="../MulProvider/UAnimDataProvider.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UAnimDataProvider"/> - </Unit38> - <Unit39> - <Filename Value="../MulProvider/UMulManager.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UMulManager"/> - </Unit39> - <Unit40> - <Filename Value="../MulProvider/UArtProvider.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UArtProvider"/> - </Unit40> - <Unit41> - <Filename Value="../MulProvider/UTexmapProvider.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="UTexmapProvider"/> - </Unit41> - <Unit42> - <Filename Value="../version.inc"/> - <IsPartOfProject Value="True"/> - </Unit42> - </Units> - </ProjectOptions> - <CompilerOptions> - <Version Value="8"/> - <Target> - <Filename Value="../bin/CentrED"/> - </Target> - <SearchPaths> - <IncludeFiles Value="../Imaging/;../"/> - <OtherUnitFiles Value="../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/> - <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/> - <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/;../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/> - </SearchPaths> - <Parsing> - <SyntaxOptions> - <CStyleOperator Value="False"/> - <UseAnsiStrings Value="True"/> - </SyntaxOptions> - </Parsing> - <CodeGeneration> - <SmartLinkUnit Value="True"/> - <Optimizations> - <OptimizationLevel Value="3"/> - </Optimizations> - </CodeGeneration> - <Linking> - <Debugging> - <UseLineInfoUnit Value="False"/> - <StripSymbols Value="True"/> - </Debugging> - <LinkSmart Value="True"/> - <Options> - <Win32> - <GraphicApplication Value="True"/> - </Win32> - </Options> - </Linking> - <Other> - <CompilerMessages> - <IgnoredMessages idx5024="True"/> - </CompilerMessages> - <CustomOptions Value="-FE../bin/ --dNoLogging"/> - <CompilerPath Value="$(CompPath)"/> - </Other> - </CompilerOptions> -</CONFIG> +<?xml version="1.0"?> +<CONFIG> + <ProjectOptions> + <Version Value="7"/> + <General> + <Flags> + <LRSInOutputDirectory Value="False"/> + </Flags> + <SessionStorage Value="InProjectDir"/> + <MainUnit Value="0"/> + <TargetFileExt Value=".exe"/> + <Title Value="CentrED"/> + <Icon Value="0"/> + </General> + <LazDoc Paths="../doc"/> + <VersionInfo> + <UseVersionInfo Value="True"/> + <CurrentMajorRevNr Value="5"/> + <CurrentBuildNr Value="162"/> + <ProjectVersion Value="0.5.0.162"/> + <CompanyName Value="AKS DataBasis"/> + <FileDescription Value="UO CentrED"/> + <LegalCopyright Value="Andreas Schneider"/> + <OriginalFilename Value="CentrED.exe"/> + <ProductName Value="CentrED"/> + </VersionInfo> + <PublishOptions> + <Version Value="2"/> + <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> + <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> + </PublishOptions> + <RunParams> + <local> + <FormatVersion Value="1"/> + <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + </local> + </RunParams> + <RequiredPackages Count="5"> + <Item1> + <PackageName Value="multiloglaz"/> + </Item1> + <Item2> + <PackageName Value="LazOpenGLContext"/> + <MinVersion Valid="True"/> + </Item2> + <Item3> + <PackageName Value="LCL"/> + </Item3> + <Item4> + <PackageName Value="lnetvisual"/> + <MinVersion Minor="5" Release="3" Valid="True"/> + </Item4> + <Item5> + <PackageName Value="virtualtreeview_package"/> + <MinVersion Major="4" Minor="5" Release="1" Valid="True"/> + </Item5> + </RequiredPackages> + <Units Count="43"> + <Unit0> + <Filename Value="CentrED.lpr"/> + <IsPartOfProject Value="True"/> + <UnitName Value="CentrED"/> + </Unit0> + <Unit1> + <Filename Value="UfrmMain.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmMain"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmMain"/> + </Unit1> + <Unit2> + <Filename Value="UdmNetwork.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="dmNetwork"/> + <ResourceBaseClass Value="DataModule"/> + <UnitName Value="UdmNetwork"/> + </Unit2> + <Unit3> + <Filename Value="UfrmLogin.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmLogin"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmLogin"/> + </Unit3> + <Unit4> + <Filename Value="UfrmInitialize.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmInitialize"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmInitialize"/> + </Unit4> + <Unit5> + <Filename Value="UfrmAccountControl.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmAccountControl"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmAccountControl"/> + </Unit5> + <Unit6> + <Filename Value="UfrmEditAccount.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmEditAccount"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmEditAccount"/> + </Unit6> + <Unit7> + <Filename Value="Tools/UfrmDrawSettings.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmDrawSettings"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmDrawSettings"/> + </Unit7> + <Unit8> + <Filename Value="Tools/UfrmBoundaries.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmBoundaries"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmBoundaries"/> + </Unit8> + <Unit9> + <Filename Value="Tools/UfrmElevateSettings.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmElevateSettings"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmElevateSettings"/> + </Unit9> + <Unit10> + <Filename Value="UOverlayUI.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UOverlayUI"/> + </Unit10> + <Unit11> + <Filename Value="UResourceManager.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UResourceManager"/> + </Unit11> + <Unit12> + <Filename Value="Tools/UfrmConfirmation.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmConfirmation"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmConfirmation"/> + </Unit12> + <Unit13> + <Filename Value="Tools/UfrmMoveSettings.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmMoveSettings"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmMoveSettings"/> + </Unit13> + <Unit14> + <Filename Value="UfrmAbout.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmAbout"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmAbout"/> + </Unit14> + <Unit15> + <Filename Value="Tools/UfrmHueSettings.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmHueSettings"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmHueSettings"/> + </Unit15> + <Unit16> + <Filename Value="UfrmRadar.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmRadarMap"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmRadar"/> + </Unit16> + <Unit17> + <Filename Value="UfrmLargeScaleCommand.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmLargeScaleCommand"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmLargeScaleCommand"/> + </Unit17> + <Unit18> + <Filename Value="Tools/UfrmVirtualLayer.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmVirtualLayer"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmVirtualLayer"/> + </Unit18> + <Unit19> + <Filename Value="Tools/UfrmFilter.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmFilter"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmFilter"/> + </Unit19> + <Unit20> + <Filename Value="UfrmTileInfo.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmTileInfo"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmTileInfo"/> + </Unit20> + <Unit21> + <Filename Value="UGUIPlatformUtils.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UGUIPlatformUtils"/> + </Unit21> + <Unit22> + <Filename Value="UPlatformTypes.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UPlatformTypes"/> + </Unit22> + <Unit23> + <Filename Value="UfrmRegionControl.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmRegionControl"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmRegionControl"/> + </Unit23> + <Unit24> + <Filename Value="UPacketHandlers.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UPacketHandlers"/> + </Unit24> + <Unit25> + <Filename Value="UPackets.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UPackets"/> + </Unit25> + <Unit26> + <Filename Value="ULandscape.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULandscape"/> + </Unit26> + <Unit27> + <Filename Value="UGameResources.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UGameResources"/> + </Unit27> + <Unit28> + <Filename Value="UAdminHandling.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UAdminHandling"/> + </Unit28> + <Unit29> + <Filename Value="Tools/UfrmToolWindow.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmToolWindow"/> + <ResourceBaseClass Value="Form"/> + <UnitName Value="UfrmToolWindow"/> + </Unit29> + <Unit30> + <Filename Value="../Logging.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="Logging"/> + </Unit30> + <Unit31> + <Filename Value="../UOLib/UStatics.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UStatics"/> + </Unit31> + <Unit32> + <Filename Value="../UOLib/UWorldItem.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UWorldItem"/> + </Unit32> + <Unit33> + <Filename Value="../UOLib/UMap.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UMap"/> + </Unit33> + <Unit34> + <Filename Value="../UOLib/UTiledata.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UTiledata"/> + </Unit34> + <Unit35> + <Filename Value="UGLFont.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UGLFont"/> + </Unit35> + <Unit36> + <Filename Value="../UOLib/UAnimData.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UAnimData"/> + </Unit36> + <Unit37> + <Filename Value="../MulProvider/UTileDataProvider.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UTileDataProvider"/> + </Unit37> + <Unit38> + <Filename Value="../MulProvider/UAnimDataProvider.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UAnimDataProvider"/> + </Unit38> + <Unit39> + <Filename Value="../MulProvider/UMulManager.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UMulManager"/> + </Unit39> + <Unit40> + <Filename Value="../MulProvider/UArtProvider.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UArtProvider"/> + </Unit40> + <Unit41> + <Filename Value="../MulProvider/UTexmapProvider.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UTexmapProvider"/> + </Unit41> + <Unit42> + <Filename Value="../version.inc"/> + <IsPartOfProject Value="True"/> + </Unit42> + </Units> + </ProjectOptions> + <CompilerOptions> + <Version Value="8"/> + <Target> + <Filename Value="../bin/CentrED"/> + </Target> + <SearchPaths> + <IncludeFiles Value="../Imaging/;../"/> + <OtherUnitFiles Value="../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/> + <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/> + <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/;../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> + <CStyleOperator Value="False"/> + <UseAnsiStrings Value="True"/> + </SyntaxOptions> + </Parsing> + <CodeGeneration> + <SmartLinkUnit Value="True"/> + <Optimizations> + <OptimizationLevel Value="3"/> + </Optimizations> + </CodeGeneration> + <Linking> + <Debugging> + <UseLineInfoUnit Value="False"/> + <StripSymbols Value="True"/> + </Debugging> + <LinkSmart Value="True"/> + <Options> + <Win32> + <GraphicApplication Value="True"/> + </Win32> + </Options> + </Linking> + <Other> + <CompilerMessages> + <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/> + </CompilerMessages> + <CustomOptions Value="-FE../bin/ +-dNoLogging"/> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> +</CONFIG> diff --git a/Client/UfrmMain.pas b/Client/UfrmMain.pas index c6a46ee..7a1d11c 100644 --- a/Client/UfrmMain.pas +++ b/Client/UfrmMain.pas @@ -966,7 +966,7 @@ var tiles: TDOMNodeList; tileNode: PVirtualNode; tileInfo: PTileInfo; - i: Integer; + i, id: Integer; begin if cbRandomPreset.ItemIndex > -1 then begin @@ -976,11 +976,13 @@ begin for i := 0 to tiles.Count - 1 do begin tile := TDOMElement(tiles[i]); - if tile.NodeName = 'Tile' then + if (tile.NodeName = 'Tile') and + TryStrToInt(tile.AttribStrings['ID'], id) and + (id < FLandscape.MaxStaticID + $4000) then begin tileNode := vdtRandom.AddChild(nil); tileInfo := vdtRandom.GetNodeData(tileNode); - tileInfo^.ID := StrToInt(tile.AttribStrings['ID']); + tileInfo^.ID := id; end; end; end; @@ -2416,8 +2418,9 @@ var tileInfo: PTileInfo; filter: string; begin + maxID := $3FFF; if cbTerrain.Checked then minID := $0 else minID := $4000; - if cbStatics.Checked then maxID := $7FFF else maxID := $3FFF; + if cbStatics.Checked then maxID := maxID + FLandscape.MaxStaticID; filter := AnsiLowerCase(UTF8ToISO_8859_1(edFilter.Text)); node := vdtTiles.GetFirstSelected;