- Optimized blockInfo.ScreenRect calculation for static tiles
- Fixed TScreenBuffer.Find to correctly handle the new buffer usage (search at the end, not the beginning)
This commit is contained in:
parent
1196ad6425
commit
01d5fb98d1
|
@ -49,64 +49,64 @@
|
||||||
</Unit0>
|
</Unit0>
|
||||||
<Unit1>
|
<Unit1>
|
||||||
<Filename Value="UfrmMain.pas"/>
|
<Filename Value="UfrmMain.pas"/>
|
||||||
<ComponentName Value="frmMain"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmMain"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmMain"/>
|
<UnitName Value="UfrmMain"/>
|
||||||
</Unit1>
|
</Unit1>
|
||||||
<Unit2>
|
<Unit2>
|
||||||
<Filename Value="UdmNetwork.pas"/>
|
<Filename Value="UdmNetwork.pas"/>
|
||||||
<ComponentName Value="dmNetwork"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="dmNetwork"/>
|
||||||
<ResourceBaseClass Value="DataModule"/>
|
<ResourceBaseClass Value="DataModule"/>
|
||||||
<UnitName Value="UdmNetwork"/>
|
<UnitName Value="UdmNetwork"/>
|
||||||
</Unit2>
|
</Unit2>
|
||||||
<Unit3>
|
<Unit3>
|
||||||
<Filename Value="UfrmLogin.pas"/>
|
<Filename Value="UfrmLogin.pas"/>
|
||||||
<ComponentName Value="frmLogin"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmLogin"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmLogin"/>
|
<UnitName Value="UfrmLogin"/>
|
||||||
</Unit3>
|
</Unit3>
|
||||||
<Unit4>
|
<Unit4>
|
||||||
<Filename Value="UfrmInitialize.pas"/>
|
<Filename Value="UfrmInitialize.pas"/>
|
||||||
<ComponentName Value="frmInitialize"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmInitialize"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmInitialize"/>
|
<UnitName Value="UfrmInitialize"/>
|
||||||
</Unit4>
|
</Unit4>
|
||||||
<Unit5>
|
<Unit5>
|
||||||
<Filename Value="UfrmAccountControl.pas"/>
|
<Filename Value="UfrmAccountControl.pas"/>
|
||||||
<ComponentName Value="frmAccountControl"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmAccountControl"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmAccountControl"/>
|
<UnitName Value="UfrmAccountControl"/>
|
||||||
</Unit5>
|
</Unit5>
|
||||||
<Unit6>
|
<Unit6>
|
||||||
<Filename Value="UfrmEditAccount.pas"/>
|
<Filename Value="UfrmEditAccount.pas"/>
|
||||||
<ComponentName Value="frmEditAccount"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmEditAccount"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmEditAccount"/>
|
<UnitName Value="UfrmEditAccount"/>
|
||||||
</Unit6>
|
</Unit6>
|
||||||
<Unit7>
|
<Unit7>
|
||||||
<Filename Value="Tools/UfrmDrawSettings.pas"/>
|
<Filename Value="Tools/UfrmDrawSettings.pas"/>
|
||||||
<ComponentName Value="frmDrawSettings"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmDrawSettings"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmDrawSettings"/>
|
<UnitName Value="UfrmDrawSettings"/>
|
||||||
</Unit7>
|
</Unit7>
|
||||||
<Unit8>
|
<Unit8>
|
||||||
<Filename Value="Tools/UfrmBoundaries.pas"/>
|
<Filename Value="Tools/UfrmBoundaries.pas"/>
|
||||||
<ComponentName Value="frmBoundaries"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmBoundaries"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmBoundaries"/>
|
<UnitName Value="UfrmBoundaries"/>
|
||||||
</Unit8>
|
</Unit8>
|
||||||
<Unit9>
|
<Unit9>
|
||||||
<Filename Value="Tools/UfrmElevateSettings.pas"/>
|
<Filename Value="Tools/UfrmElevateSettings.pas"/>
|
||||||
<ComponentName Value="frmElevateSettings"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmElevateSettings"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmElevateSettings"/>
|
<UnitName Value="UfrmElevateSettings"/>
|
||||||
</Unit9>
|
</Unit9>
|
||||||
|
@ -122,64 +122,64 @@
|
||||||
</Unit11>
|
</Unit11>
|
||||||
<Unit12>
|
<Unit12>
|
||||||
<Filename Value="Tools/UfrmConfirmation.pas"/>
|
<Filename Value="Tools/UfrmConfirmation.pas"/>
|
||||||
<ComponentName Value="frmConfirmation"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmConfirmation"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmConfirmation"/>
|
<UnitName Value="UfrmConfirmation"/>
|
||||||
</Unit12>
|
</Unit12>
|
||||||
<Unit13>
|
<Unit13>
|
||||||
<Filename Value="Tools/UfrmMoveSettings.pas"/>
|
<Filename Value="Tools/UfrmMoveSettings.pas"/>
|
||||||
<ComponentName Value="frmMoveSettings"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmMoveSettings"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmMoveSettings"/>
|
<UnitName Value="UfrmMoveSettings"/>
|
||||||
</Unit13>
|
</Unit13>
|
||||||
<Unit14>
|
<Unit14>
|
||||||
<Filename Value="UfrmAbout.pas"/>
|
<Filename Value="UfrmAbout.pas"/>
|
||||||
<ComponentName Value="frmAbout"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmAbout"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmAbout"/>
|
<UnitName Value="UfrmAbout"/>
|
||||||
</Unit14>
|
</Unit14>
|
||||||
<Unit15>
|
<Unit15>
|
||||||
<Filename Value="Tools/UfrmHueSettings.pas"/>
|
<Filename Value="Tools/UfrmHueSettings.pas"/>
|
||||||
<ComponentName Value="frmHueSettings"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmHueSettings"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmHueSettings"/>
|
<UnitName Value="UfrmHueSettings"/>
|
||||||
</Unit15>
|
</Unit15>
|
||||||
<Unit16>
|
<Unit16>
|
||||||
<Filename Value="UfrmRadar.pas"/>
|
<Filename Value="UfrmRadar.pas"/>
|
||||||
<ComponentName Value="frmRadarMap"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmRadarMap"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmRadar"/>
|
<UnitName Value="UfrmRadar"/>
|
||||||
</Unit16>
|
</Unit16>
|
||||||
<Unit17>
|
<Unit17>
|
||||||
<Filename Value="UfrmLargeScaleCommand.pas"/>
|
<Filename Value="UfrmLargeScaleCommand.pas"/>
|
||||||
<ComponentName Value="frmLargeScaleCommand"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmLargeScaleCommand"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmLargeScaleCommand"/>
|
<UnitName Value="UfrmLargeScaleCommand"/>
|
||||||
</Unit17>
|
</Unit17>
|
||||||
<Unit18>
|
<Unit18>
|
||||||
<Filename Value="Tools/UfrmVirtualLayer.pas"/>
|
<Filename Value="Tools/UfrmVirtualLayer.pas"/>
|
||||||
<ComponentName Value="frmVirtualLayer"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmVirtualLayer"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmVirtualLayer"/>
|
<UnitName Value="UfrmVirtualLayer"/>
|
||||||
</Unit18>
|
</Unit18>
|
||||||
<Unit19>
|
<Unit19>
|
||||||
<Filename Value="Tools/UfrmFilter.pas"/>
|
<Filename Value="Tools/UfrmFilter.pas"/>
|
||||||
<ComponentName Value="frmFilter"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmFilter"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmFilter"/>
|
<UnitName Value="UfrmFilter"/>
|
||||||
</Unit19>
|
</Unit19>
|
||||||
<Unit20>
|
<Unit20>
|
||||||
<Filename Value="UfrmTileInfo.pas"/>
|
<Filename Value="UfrmTileInfo.pas"/>
|
||||||
<ComponentName Value="frmTileInfo"/>
|
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<ComponentName Value="frmTileInfo"/>
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmTileInfo"/>
|
<UnitName Value="UfrmTileInfo"/>
|
||||||
</Unit20>
|
</Unit20>
|
||||||
|
@ -195,9 +195,9 @@
|
||||||
</Unit22>
|
</Unit22>
|
||||||
<Unit23>
|
<Unit23>
|
||||||
<Filename Value="UfrmRegionControl.pas"/>
|
<Filename Value="UfrmRegionControl.pas"/>
|
||||||
|
<IsPartOfProject Value="True"/>
|
||||||
<ComponentName Value="frmRegionControl"/>
|
<ComponentName Value="frmRegionControl"/>
|
||||||
<HasResources Value="True"/>
|
<HasResources Value="True"/>
|
||||||
<IsPartOfProject Value="True"/>
|
|
||||||
<ResourceBaseClass Value="Form"/>
|
<ResourceBaseClass Value="Form"/>
|
||||||
<UnitName Value="UfrmRegionControl"/>
|
<UnitName Value="UfrmRegionControl"/>
|
||||||
</Unit23>
|
</Unit23>
|
||||||
|
|
|
@ -1066,7 +1066,7 @@ var
|
||||||
begin
|
begin
|
||||||
Result := nil;
|
Result := nil;
|
||||||
current := FShortCuts[0];
|
current := FShortCuts[0];
|
||||||
while (current <> nil) and (Result = nil) do
|
while current <> nil do //search the last matching tile
|
||||||
begin
|
begin
|
||||||
if (current^.State = ssNormal) and
|
if (current^.State = ssNormal) and
|
||||||
PtInRect(current^.ScreenRect, AScreenPosition) and
|
PtInRect(current^.ScreenRect, AScreenPosition) and
|
||||||
|
|
4980
Client/UfrmMain.lfm
4980
Client/UfrmMain.lfm
File diff suppressed because it is too large
Load Diff
|
@ -2133,10 +2133,10 @@ begin
|
||||||
hue := nil;
|
hue := nil;
|
||||||
|
|
||||||
blockInfo^.LowRes := FTextureManager.GetArtMaterial($4000 + staticItem.TileID, hue, (staticTileData.Flags and tdfPartialHue) = tdfPartialHue);
|
blockInfo^.LowRes := FTextureManager.GetArtMaterial($4000 + staticItem.TileID, hue, (staticTileData.Flags and tdfPartialHue) = tdfPartialHue);
|
||||||
blockInfo^.ScreenRect := Bounds(Trunc(drawX - blockInfo^.LowRes.RealWidth div 2),
|
blockInfo^.ScreenRect := Bounds(Trunc(drawX - blockInfo^.LowRes.RealWidth / 2),
|
||||||
Trunc(drawY + 44 - blockInfo^.LowRes.RealHeight - z * 4),
|
Trunc(drawY + 44 - blockInfo^.LowRes.RealHeight - z * 4),
|
||||||
blockInfo^.LowRes.RealWidth,
|
blockInfo^.LowRes.RealWidth,
|
||||||
Trunc(blockInfo^.LowRes.RealHeight));
|
blockInfo^.LowRes.RealHeight);
|
||||||
|
|
||||||
south := blockInfo^.LowRes.RealHeight;
|
south := blockInfo^.LowRes.RealHeight;
|
||||||
east := blockInfo^.LowRes.RealWidth div 2;
|
east := blockInfo^.LowRes.RealWidth div 2;
|
||||||
|
|
Loading…
Reference in New Issue