aksdb
/
CentrED
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

- Fixed static tiles with hue 1 using the wrong cache id 

- Commented some debug messages
This commit is contained in:
Andreas Schneider 2009-12-22 19:47:46 +01:00
parent ca8f47d2a9
commit eb62553f5c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Client/ULandscape.pas
View File

@ -348,7 +348,7 @@ begin
Result := nil;
if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
ResMan.Tiledata.StaticTiles[ATileID -$4000].Flags) then
ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
begin
animData := ResMan.Animdata.AnimData[ATileID - $4000];
if (animData.FrameCount > 0) and not FAnimCache.QueryID(ATileID, Result) then
@ -384,10 +384,10 @@ begin
end else
begin
Result := nil;
id := ATileID or ((AHue.ID and $3FFF) shl 16) or (Byte(APartialHue) shl 30);
id := ATileID or (((AHue.ID + 1) and $3FFF) shl 16) or (Byte(APartialHue) shl 30);
if FUseAnims and (ATileID >= $4000) and (tdfAnimation in
ResMan.Tiledata.StaticTiles[ATileID -$4000].Flags) then
ResMan.Tiledata.StaticTiles[ATileID - $4000].Flags) then
begin
animData := ResMan.Animdata.AnimData[ATileID - $4000];
if (animData.FrameCount > 0) and not FAnimCache.QueryID(id, Result) then

4
Client/UfrmMain.lfm
View File

@ -823,7 +823,7 @@ object frmMain: TfrmMain
item
Position = 1
Text = 'Name'
Width = 131
Width = 135
end>
Header.DefaultHeight = 17
Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoVisible]
@ -1101,7 +1101,7 @@ object frmMain: TfrmMain
item
Position = 2
Text = 'Message'
Width = 379
Width = 381
end>
Header.DefaultHeight = 17
Header.MainColumn = 2

20
Client/UfrmMain.pas
View File

@ -601,7 +601,7 @@ var
lastTile: TWorldItem;
offsetX, offsetY: Integer;
begin
Logger.EnterMethod([lcClient, lcDebug], 'MouseMove');
//Logger.EnterMethod([lcClient, lcDebug], 'MouseMove');
lastTile := CurrentTile;
if ssMiddle in Shift then
@ -619,7 +619,7 @@ begin
UpdateCurrentTile(X, Y);
FRepaintNeeded := True;
Logger.ExitMethod([lcClient, lcDebug], 'MouseMove');
//Logger.ExitMethod([lcClient, lcDebug], 'MouseMove');
end;
procedure TfrmMain.oglGameWindowMouseUp(Sender: TObject; Button: TMouseButton;
@ -1915,13 +1915,13 @@ end;
procedure TfrmMain.SetCurrentTile(const AValue: TWorldItem);
begin
Logger.EnterMethod([lcClient, lcDebug], 'SetCurrentTile');
//Logger.EnterMethod([lcClient, lcDebug], 'SetCurrentTile');
if AValue = FCurrentTile then
begin
Logger.ExitMethod([lcClient, lcDebug], 'SetCurrentTile');
//Logger.ExitMethod([lcClient, lcDebug], 'SetCurrentTile');
Exit;
end;
Logger.Send([lcClient, lcDebug], 'Value', AValue);
//Logger.Send([lcClient, lcDebug], 'Value', AValue);
if FCurrentTile <> nil then
FCurrentTile.OnDestroy.UnregisterEvent(@OnTileRemoved);
@ -1946,18 +1946,18 @@ begin
end;
UpdateSelection;
Logger.ExitMethod([lcClient, lcDebug], 'SetCurrentTile');
//Logger.ExitMethod([lcClient, lcDebug], 'SetCurrentTile');
end;
procedure TfrmMain.SetSelectedTile(const AValue: TWorldItem);
begin
Logger.EnterMethod([lcClient, lcDebug], 'SetSelectedTile');
//Logger.EnterMethod([lcClient, lcDebug], 'SetSelectedTile');
if AValue = FSelectedTile then
begin
Logger.ExitMethod([lcClient, lcDebug], 'SetSelectedTile');
//Logger.ExitMethod([lcClient, lcDebug], 'SetSelectedTile');
Exit;
end;
Logger.Send([lcClient, lcDebug], 'Value', AValue);
//Logger.Send([lcClient, lcDebug], 'Value', AValue);
if FSelectedTile <> nil then
FSelectedTile.OnDestroy.UnregisterEvent(@OnTileRemoved);
@ -1966,7 +1966,7 @@ begin
FSelectedTile.OnDestroy.RegisterEvent(@OnTileRemoved);
UpdateSelection;
Logger.ExitMethod([lcClient, lcDebug], 'SetSelectedTile');
//Logger.ExitMethod([lcClient, lcDebug], 'SetSelectedTile');
end;
procedure TfrmMain.SetNormalLights;