hedgewars/uLandGraphics.pas
author sheepluva
Sun, 01 Jun 2014 04:17:27 +0200
changeset 10251 a3b42e81803c
parent 10246 8da91cd7a32a
child 10253 ea57f2f2b98d
permissions -rw-r--r--
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 883
diff changeset
     2
 * Hedgewars, a free turn based strategy game
9998
736015b847e3 update copyright to 2014
sheepluva
parents: 9879
diff changeset
     3
 * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     4
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     8
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    12
 * GNU General Public License for more details.
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    13
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    14
 * You should have received a copy of the GNU General Public License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    15
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10099
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    17
 *)
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    21
unit uLandGraphics;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    22
interface
4357
a1fcfc341a52 Introduce unit uTypes in order to remove some cyclic unit dependencies
unC0Rr
parents: 3749
diff changeset
    23
uses uFloat, uConsts, uTypes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    24
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    25
type
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    26
    fillType = (nullPixel, backgroundPixel, ebcPixel, icePixel, setNotCurrentMask, changePixelSetNotCurrent, setCurrentHog, changePixelNotSetNotCurrent);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    27
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    28
type TRangeArray = array[0..31] of record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    29
                                   Left, Right: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    30
                                   end;
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    31
     PRangeArray = ^TRangeArray;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    32
TLandCircleProcedure = procedure (landX, landY, pixelX, pixelY: Longint);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    33
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    34
function  addBgColor(OldColor, NewColor: LongWord): LongWord;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2695
diff changeset
    35
function  SweepDirty: boolean;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
    36
function  Despeckle(X, Y: LongInt): Boolean;
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
    37
procedure Smooth(X, Y: LongInt);
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
    38
function  CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
4377
43945842da0c Haven't found a better place than uIO for OutError
unC0Rr
parents: 4374
diff changeset
    39
function  DrawExplosion(X, Y, Radius: LongInt): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    40
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    41
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
    42
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
    43
function FillRoundInLandFT(X, Y, Radius: LongInt; fill: fillType): Longword;
7270
93e92e82d5c8 Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents: 7268
diff changeset
    44
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet, isCurrent: boolean);
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
    45
function  LandBackPixel(x, y: LongInt): LongWord;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
    46
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
10246
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
    47
function  DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword): Longword;
7268
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
    48
procedure DumpLandToLog(x, y, r: LongInt);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
    49
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint);
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
    50
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline;
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
    51
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean; LandFlags: Word): boolean;
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
    52
function GetPlaceCollisionTex(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt): PTexture;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
    53
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    54
implementation
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
    55
uses SDLh, uLandTexture, uTextures, uVariables, uUtils, uDebug;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    56
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    57
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    58
procedure calculatePixelsCoordinates(landX, landY: Longint; var pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    59
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    60
if (cReducedQuality and rqBlurryLand) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    61
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    62
    pixelX := landX;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    63
    pixelY := landY;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    64
    end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    65
else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    66
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    67
    pixelX := LandX div 2;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    68
    pixelY := LandY div 2;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    69
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    70
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    71
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    72
function drawPixelBG(landX, landY, pixelX, pixelY: Longint): Longword; inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    73
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    74
drawPixelBG := 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    75
if (Land[LandY, landX] and lfIndestructible) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    76
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    77
        if ((Land[landY, landX] and lfBasic) <> 0) and (((LandPixels[pixelY, pixelX] and AMask) shr AShift) = 255) and (not disableLandBack) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    78
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    79
            LandPixels[pixelY, pixelX]:= LandBackPixel(landX, landY);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    80
            inc(drawPixelBG);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    81
        end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    82
        else if ((Land[landY, landX] and lfObject) <> 0) or (((LandPixels[pixelY, pixelX] and AMask) shr AShift) < 255) then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
    83
            LandPixels[pixelY, pixelX]:= LandPixels[pixelY, pixelX] and (not AMASK)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    84
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    85
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
    86
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    87
procedure drawPixelEBC(landX, landY, pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    88
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    89
if ((Land[landY, landX] and lfBasic) <> 0) or ((Land[landY, landX] and lfObject) <> 0) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    90
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    91
    LandPixels[pixelY, pixelX]:= ExplosionBorderColor;
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
    92
    Land[landY, landX]:= (Land[landY, landX] or lfDamaged) and (not lfIce);
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
    93
    LandDirty[landY div 32, landX div 32]:= 1;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    94
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    95
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
    96
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    97
function isLandscapeEdge(weight:Longint):boolean; inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    98
begin
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
    99
isLandscapeEdge := (weight < 8) and (weight >= 2);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   100
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   101
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   102
function getPixelWeight(x, y:Longint): Longint;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   103
var
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   104
    i, j, r: Longint;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   105
begin
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   106
r := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   107
for i := x - 1 to x + 1 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   108
    for j := y - 1 to y + 1 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   109
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   110
    if (i < 0) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   111
       (i > LAND_WIDTH - 1) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   112
       (j < 0) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   113
       (j > LAND_HEIGHT -1) then
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   114
       exit(9);
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   115
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   116
    if Land[j, i] and lfLandMask and (not lfIce) = 0 then
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   117
       inc(r)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   118
    end;
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   119
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   120
    getPixelWeight:= r
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   121
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   122
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   123
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   124
procedure fillPixelFromIceSprite(pixelX, pixelY:Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   125
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   126
    iceSurface: PSDL_Surface;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   127
    icePixels: PLongwordArray;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   128
    w: LongWord;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   129
begin
9460
7d7e4ca70f6b Skip some LandPixels manipulations in stats-only mode
unc0rr
parents: 9080
diff changeset
   130
    if cOnlyStats then exit;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   131
    // So. 3 parameters here. Ice colour, Ice opacity, and a bias on the greyscaled pixel towards lightness
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   132
    iceSurface:= SpritesData[sprIceTexture].Surface;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   133
    icePixels := iceSurface^.pixels;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   134
    w:= LandPixels[pixelY, pixelX];
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   135
    if w > 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   136
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   137
        w:= round(((w shr RShift and $FF) * RGB_LUMINANCE_RED +
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   138
              (w shr BShift and $FF) * RGB_LUMINANCE_GREEN +
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   139
              (w shr GShift and $FF) * RGB_LUMINANCE_BLUE));
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   140
        if w < 128 then w:= w+128;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   141
        if w > 255 then w:= 255;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   142
        w:= (w shl RShift) or (w shl BShift) or (w shl GShift) or (LandPixels[pixelY, pixelX] and AMask);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   143
        LandPixels[pixelY, pixelX]:= addBgColor(w, IceColor);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   144
        LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)])
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   145
        end
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   146
    else
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   147
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   148
        LandPixels[pixelY, pixelX]:= IceColor and (not AMask) or $E8 shl AShift;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   149
        LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)]);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   150
        // silly workaround to avoid having to make background erasure a tadb it smarter about sea ice
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   151
        if LandPixels[pixelY, pixelX] and AMask shr AShift = 255 then
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   152
            LandPixels[pixelY, pixelX]:= LandPixels[pixelY, pixelX] and (not AMask) or 254 shl AShift;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   153
        end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   154
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   155
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   156
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   157
procedure DrawPixelIce(landX, landY, pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   158
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   159
if ((Land[landY, landX] and lfIce) <> 0) then exit;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   160
if isLandscapeEdge(getPixelWeight(landX, landY)) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   161
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   162
    if (LandPixels[pixelY, pixelX] and AMask < 255) and (LandPixels[pixelY, pixelX] and AMask > 0) then
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   163
        LandPixels[pixelY, pixelX] := (IceEdgeColor and (not AMask)) or (LandPixels[pixelY, pixelX] and AMask)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   164
    else if (LandPixels[pixelY, pixelX] and AMask < 255) or (Land[landY, landX] > 255) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   165
        LandPixels[pixelY, pixelX] := IceEdgeColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   166
    end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   167
else if Land[landY, landX] > 255 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   168
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   169
        fillPixelFromIceSprite(pixelX, pixelY);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   170
    end;
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   171
if Land[landY, landX] > 255 then Land[landY, landX] := Land[landY, landX] or lfIce and (not lfDamaged);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   172
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   173
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   174
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   175
function FillLandCircleLineFT(y, fromPix, toPix: LongInt; fill : fillType): Longword;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   176
var px, py, i: LongInt;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   177
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   178
//get rid of compiler warning
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   179
    px := 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   180
    py := 0;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   181
    FillLandCircleLineFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   182
    case fill of
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   183
    backgroundPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   184
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   185
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   186
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   187
            inc(FillLandCircleLineFT, drawPixelBG(i, y, px, py));
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   188
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   189
    ebcPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   190
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   191
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   192
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   193
            drawPixelEBC(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   194
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   195
    nullPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   196
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   197
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   198
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   199
            if ((Land[y, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[y, i] > 255))  then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   200
                LandPixels[py, px]:= LandPixels[py, px] and (not AMASK);
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   201
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   202
    icePixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   203
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   204
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   205
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   206
            DrawPixelIce(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   207
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   208
    setNotCurrentMask:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   209
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   210
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   211
            Land[y, i]:= Land[y, i] and lfNotCurrentMask;
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   212
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   213
    changePixelSetNotCurrent:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   214
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   215
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   216
            if Land[y, i] and lfObjMask > 0 then
9878
163944282710 Uberfix. TODO: ask fpc guys wtf.
unc0rr
parents: 9877
diff changeset
   217
                Land[y, i]:= Land[y, i] - 1;
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   218
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   219
    setCurrentHog:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   220
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   221
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   222
            Land[y, i]:= Land[y, i] or lfCurrentHog
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   223
            end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   224
    changePixelNotSetNotCurrent:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   225
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   226
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   227
            if Land[y, i] and lfObjMask < lfObjMask then
9878
163944282710 Uberfix. TODO: ask fpc guys wtf.
unc0rr
parents: 9877
diff changeset
   228
                Land[y, i]:= Land[y, i] + 1
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   229
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   230
    end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   231
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   232
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   233
function FillLandCircleSegmentFT(x, y, dx, dy: LongInt; fill : fillType): Longword; inline;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   234
begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   235
    FillLandCircleSegmentFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   236
if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   237
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y + dy, Max(x - dx, 0), Min(x + dx, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   238
if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   239
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y - dy, Max(x - dx, 0), Min(x + dx, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   240
if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   241
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y + dx, Max(x - dy, 0), Min(x + dy, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   242
if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   243
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y - dx, Max(x - dy, 0), Min(x + dy, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   244
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   245
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   246
function FillRoundInLandFT(X, Y, Radius: LongInt; fill: fillType): Longword; inline;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   247
var dx, dy, d: LongInt;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   248
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   249
dx:= 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   250
dy:= Radius;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   251
d:= 3 - 2 * Radius;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   252
FillRoundInLandFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   253
while (dx < dy) do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   254
    begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   255
    inc(FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   256
    if (d < 0) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   257
        d:= d + 4 * dx + 6
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   258
    else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   259
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   260
        d:= d + 4 * (dx - dy) + 10;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   261
        dec(dy)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   262
        end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   263
    inc(dx)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   264
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   265
if (dx = dy) then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   266
    inc (FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   267
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   268
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   269
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   270
function addBgColor(OldColor, NewColor: LongWord): LongWord;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   271
// Factor ranges from 0 to 100% NewColor
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   272
var
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   273
    oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: byte;
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   274
begin
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   275
    oAlpha := (OldColor shr AShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   276
    nAlpha := (NewColor shr AShift);
5692
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   277
    // shortcircuit
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   278
    if (oAlpha = 0) or (nAlpha = $FF) then
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   279
        begin
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   280
        addBgColor:= NewColor;
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   281
        exit
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   282
        end;
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   283
    // Get colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   284
    oRed   := (OldColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   285
    oGreen := (OldColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   286
    oBlue  := (OldColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   287
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   288
    nRed   := (NewColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   289
    nGreen := (NewColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   290
    nBlue  := (NewColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   291
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   292
    // Mix colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   293
    nRed   := min(255,((nRed*nAlpha) div 255) + ((oRed*oAlpha*byte(255-nAlpha)) div 65025));
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   294
    nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*oAlpha*byte(255-nAlpha)) div 65025));
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   295
    nBlue  := min(255,((nBlue*nAlpha) div 255) + ((oBlue*oAlpha*byte(255-nAlpha)) div 65025));
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   296
    nAlpha := min(255, oAlpha + nAlpha);
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   297
5041
3dc6ad20cbfe Fix endianness
nemo
parents: 4976
diff changeset
   298
    addBgColor := (nAlpha shl AShift) or (nRed shl RShift) or (nGreen shl GShift) or (nBlue shl BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   299
end;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   300
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   301
function FillCircleLines(x, y, dx, dy: LongInt; Value: Longword): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   302
var i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   303
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   304
    FillCircleLines:= 0;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   305
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   306
    if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   307
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   308
            if (Land[y + dy, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   309
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   310
                if Land[y + dy, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   311
                Land[y + dy, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   312
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   313
    if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   314
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   315
            if (Land[y - dy, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   316
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   317
                if Land[y - dy, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   318
                Land[y - dy, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   319
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   320
    if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   321
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   322
            if (Land[y + dx, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   323
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   324
                if Land[y + dx, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   325
                Land[y + dx, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   326
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   327
    if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   328
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   329
            if (Land[y - dx, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   330
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   331
                if Land[y - dx, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   332
                Land[y - dx, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   333
            end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   334
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   335
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   336
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   337
var dx, dy, d: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   338
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   339
FillRoundInLand:= 0;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   340
dx:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   341
dy:= Radius;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   342
d:= 3 - 2 * Radius;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   343
while (dx < dy) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   344
    begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   345
    inc(FillRoundInLand, FillCircleLines(x, y, dx, dy, Value));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   346
    if (d < 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   347
        d:= d + 4 * dx + 6
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   348
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   349
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   350
        d:= d + 4 * (dx - dy) + 10;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   351
        dec(dy)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   352
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   353
    inc(dx)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   354
    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   355
if (dx = dy) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   356
    inc(FillRoundInLand, FillCircleLines(x, y, dx, dy, Value));
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   357
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   358
7270
93e92e82d5c8 Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents: 7268
diff changeset
   359
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet, isCurrent: boolean);
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   360
begin
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   361
if not doSet and isCurrent then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   362
    FillRoundInLandFT(X, Y, Radius, setNotCurrentMask)
9954
bf51bc7e2808 - Fix build via pas2c
unc0rr
parents: 9950
diff changeset
   363
else if not doSet and (not IsCurrent) then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   364
    FillRoundInLandFT(X, Y, Radius, changePixelSetNotCurrent)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   365
else if doSet and IsCurrent then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   366
    FillRoundInLandFT(X, Y, Radius, setCurrentHog)
9954
bf51bc7e2808 - Fix build via pas2c
unc0rr
parents: 9950
diff changeset
   367
else if doSet and (not IsCurrent) then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   368
    FillRoundInLandFT(X, Y, Radius, changePixelNotSetNotCurrent);
8583
f2edd6d5f958 Change shape of ice to round
Urbertar@gmail.com
parents: 8579
diff changeset
   369
end;
f2edd6d5f958 Change shape of ice to round
Urbertar@gmail.com
parents: 8579
diff changeset
   370
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   371
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint);
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   372
var
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   373
    i, j: integer;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   374
    landRect: TSDL_Rect;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   375
begin
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   376
for i := min(max(x - iceRadius, 0), LAND_WIDTH - 1) to min(max(x + iceRadius, 0), LAND_WIDTH - 1) do
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   377
    begin
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   378
    for j := min(max(y, 0), LAND_HEIGHT - 1) to min(max(y + iceHeight, 0), LAND_HEIGHT - 1) do
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   379
        begin
8624
12bdc51a6790 tweaks to sea ice appearance
nemo
parents: 8612
diff changeset
   380
        if Land[j, i] = 0 then
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   381
            begin
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   382
            Land[j, i] := lfIce;
10099
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   383
            if (cReducedQuality and rqBlurryLand) = 0 then
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   384
                fillPixelFromIceSprite(i, j)
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   385
            else
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   386
                fillPixelFromIceSprite(i div 2, j div 2);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   387
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   388
        end;
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   389
    end;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   390
landRect.x := min(max(x - iceRadius, 0), LAND_WIDTH - 1);
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   391
landRect.y := min(max(y, 0), LAND_HEIGHT - 1);
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   392
landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1);
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   393
landRect.h := min(iceHeight, LAND_HEIGHT - landRect.y - 1);
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   394
UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   395
end;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   396
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   397
function DrawExplosion(X, Y, Radius: LongInt): Longword;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   398
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   399
    tx, ty, dx, dy: Longint;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   400
begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   401
    DrawExplosion := FillRoundInLandFT(x, y, Radius, backgroundPixel);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   402
    if Radius > 20 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   403
        FillRoundInLandFT(x, y, Radius - 15, nullPixel);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   404
    FillRoundInLand(X, Y, Radius, 0);
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   405
    FillRoundInLandFT(x, y, Radius + 4, ebcPixel);
8828
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   406
    tx:= Max(X - Radius - 5, 0);
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   407
    dx:= Min(X + Radius + 5, LAND_WIDTH) - tx;
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   408
    ty:= Max(Y - Radius - 5, 0);
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   409
    dy:= Min(Y + Radius + 5, LAND_HEIGHT) - ty;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   410
    UpdateLandTexture(tx, dx, ty, dy, false);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   411
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   412
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   413
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   414
var tx, ty, by, bx,  i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   415
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   416
for i:= 0 to Pred(Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   417
    begin
7509
76e3a3fc17cd revert 3188794b9d87. does not do what I'd like.
nemo
parents: 7492
diff changeset
   418
    for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
76e3a3fc17cd revert 3188794b9d87. does not do what I'd like.
nemo
parents: 7492
diff changeset
   419
        for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   420
            begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   421
            if (Land[ty, tx] and lfIndestructible) = 0 then
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   422
                begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   423
                if (cReducedQuality and rqBlurryLand) = 0 then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   424
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   425
                    by:= ty; bx:= tx;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   426
                    end
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   427
                else
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   428
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   429
                    by:= ty div 2; bx:= tx div 2;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   430
                    end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   431
                if ((Land[ty, tx] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   432
                    LandPixels[by, bx]:= LandBackPixel(tx, ty)
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   433
                else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   434
                    LandPixels[by, bx]:= LandPixels[by, bx] and (not AMASK)
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   435
                end
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   436
            end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   437
    inc(y, dY)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   438
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   439
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   440
inc(Radius, 4);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   441
dec(y, Count * dY);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   442
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   443
for i:= 0 to Pred(Count) do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   444
    begin
7509
76e3a3fc17cd revert 3188794b9d87. does not do what I'd like.
nemo
parents: 7492
diff changeset
   445
    for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
76e3a3fc17cd revert 3188794b9d87. does not do what I'd like.
nemo
parents: 7492
diff changeset
   446
        for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do
4690
490cf71b436a revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents: 4688
diff changeset
   447
            if ((Land[ty, tx] and lfBasic) <> 0) or ((Land[ty, tx] and lfObject) <> 0) then
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   448
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   449
                 if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   450
                    LandPixels[ty, tx]:= ExplosionBorderColor
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   451
                else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   452
                    LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor;
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3554
diff changeset
   453
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   454
                Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
3596
51062794ed01 Store some calcs to speed up uLandGraphics a tad
nemo
parents: 3595
diff changeset
   455
                LandDirty[ty div 32, tx div 32]:= 1;
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   456
                end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   457
    inc(y, dY)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   458
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   459
818
635e58295079 Fix drill bug
unc0rr
parents: 772
diff changeset
   460
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   461
UpdateLandTexture(0, LAND_WIDTH, 0, LAND_HEIGHT, false)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   462
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   463
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   464
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   465
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   466
procedure DrawExplosionBorder(X, Y, dx, dy:hwFloat;  despeckle : Boolean);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   467
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   468
    t, tx, ty :Longint;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   469
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   470
for t:= 0 to 7 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   471
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   472
    X:= X + dX;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   473
    Y:= Y + dY;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   474
    tx:= hwRound(X);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   475
    ty:= hwRound(Y);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   476
    if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   477
    or ((Land[ty, tx] and lfObject) <> 0)) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   478
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   479
        Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   480
        if despeckle then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   481
            LandDirty[ty div 32, tx div 32]:= 1;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   482
        if (cReducedQuality and rqBlurryLand) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   483
            LandPixels[ty, tx]:= ExplosionBorderColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   484
        else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   485
            LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   486
        end
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   487
    end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   488
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   489
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   490
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   491
//
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   492
//  - (dX, dY) - direction, vector of length = 0.5
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   493
//
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   494
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   495
var nx, ny, dX8, dY8: hwFloat;
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   496
    i, t, tx, ty, by, bx, stX, stY, ddy, ddx: Longint;
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   497
    despeckle : Boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   498
begin  // (-dY, dX) is (dX, dY) rotated by PI/2
772
e8d530ca77be Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents: 769
diff changeset
   499
stY:= hwRound(Y);
1809
77923087a1ce Some optimization of land texture updating
unc0rr
parents: 1807
diff changeset
   500
stX:= hwRound(X);
772
e8d530ca77be Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents: 769
diff changeset
   501
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   502
despeckle:= HalfWidth > 1;
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   503
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   504
nx:= X + dY * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   505
ny:= Y - dX * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   506
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   507
dX8:= dX * 8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   508
dY8:= dY * 8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   509
for i:= 0 to 7 do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   510
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   511
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   512
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   513
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   514
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   515
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   516
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   517
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   518
    ty:= hwRound(Y);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   519
    if ((ty and LAND_HEIGHT_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   520
    and ((tx and LAND_WIDTH_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   521
    and (((Land[ty, tx] and lfBasic) <> 0) or ((Land[ty, tx] and lfObject) <> 0)) then
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
   522
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   523
        Land[ty, tx]:= Land[ty, tx] and (not lfIce);
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   524
        if despeckle then
5887
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   525
            begin
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   526
            Land[ty, tx]:= Land[ty, tx] or lfDamaged;
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   527
            LandDirty[ty div 32, tx div 32]:= 1
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   528
            end;
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   529
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   530
            LandPixels[ty, tx]:= ExplosionBorderColor
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   531
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   532
            LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
   533
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   534
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   535
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   536
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   537
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   538
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   539
for i:= -HalfWidth to HalfWidth do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   540
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   541
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   542
    Y:= ny - dY8;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   543
    DrawExplosionBorder(X, Y, dx, dy, despeckle);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   544
    X:= nx;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   545
    Y:= ny;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   546
    for t:= 0 to ticks do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   547
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   548
        X:= X + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   549
        Y:= Y + dY;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   550
        tx:= hwRound(X);
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   551
        ty:= hwRound(Y);
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   552
        if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and ((Land[ty, tx] and lfIndestructible) = 0) then
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   553
            begin
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   554
            if (cReducedQuality and rqBlurryLand) = 0 then
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   555
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   556
                by:= ty; bx:= tx;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   557
                end
4690
490cf71b436a revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents: 4688
diff changeset
   558
            else
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   559
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   560
                by:= ty div 2; bx:= tx div 2;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   561
                end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   562
            if ((Land[ty, tx] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   563
                LandPixels[by, bx]:= LandBackPixel(tx, ty)
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   564
            else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   565
                LandPixels[by, bx]:= LandPixels[by, bx] and (not AMASK);
6097
db10abae541f Couple more, add back misplaced clearing of Land
nemo
parents: 6096
diff changeset
   566
            Land[ty, tx]:= 0;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   567
            end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   568
        end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   569
    DrawExplosionBorder(X, Y, dx, dy, despeckle);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   570
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   571
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   572
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   573
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   574
for i:= 0 to 7 do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   575
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   576
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   577
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   578
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   579
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   580
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   581
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   582
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   583
    ty:= hwRound(Y);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   584
    if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   585
    or ((Land[ty, tx] and lfObject) <> 0)) then
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
   586
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   587
        Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   588
        if despeckle then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   589
            LandDirty[ty div 32, tx div 32]:= 1;
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3554
diff changeset
   590
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   591
            LandPixels[ty, tx]:= ExplosionBorderColor
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   592
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   593
            LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
   594
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   595
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   596
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   597
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   598
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   599
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   600
tx:= Max(stX - HalfWidth * 2 - 4 - abs(hwRound(dX * ticks)), 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   601
ty:= Max(stY - HalfWidth * 2 - 4 - abs(hwRound(dY * ticks)), 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   602
ddx:= Min(stX + HalfWidth * 2 + 4 + abs(hwRound(dX * ticks)), LAND_WIDTH) - tx;
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   603
ddy:= Min(stY + HalfWidth * 2 + 4 + abs(hwRound(dY * ticks)), LAND_HEIGHT) - ty;
1809
77923087a1ce Some optimization of land texture updating
unc0rr
parents: 1807
diff changeset
   604
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   605
UpdateLandTexture(tx, ddx, ty, ddy, false)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   606
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   607
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   608
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline;
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   609
begin
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   610
TryPlaceOnLand:= TryPlaceOnLand(cpX, cpY, Obj, Frame, doPlace, indestructible, 0);
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   611
end;
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   612
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   613
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean; LandFlags: Word): boolean;
6077
d8fa5a85d24f This prevents girders from erasing landbacktex (square windows in tunnels and such), at the cost of requiring lfBasic and lfObject to be treated the same apart from graphically
nemo
parents: 6011
diff changeset
   614
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   615
    p: PByteArray;
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   616
    Image: PSDL_Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   617
begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   618
TryPlaceOnLand:= false;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   619
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   620
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   621
TryDo(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true);
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   622
Image:= SpritesData[Obj].Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   623
w:= SpritesData[Obj].Width;
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   624
h:= SpritesData[Obj].Height;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   625
row:= Frame mod numFramesFirstCol;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   626
col:= Frame div numFramesFirstCol;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   627
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   628
if SDL_MustLock(Image) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   629
    SDLTry(SDL_LockSurface(Image) >= 0, true);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   630
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   631
bpp:= Image^.format^.BytesPerPixel;
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   632
TryDo(bpp = 4, 'It should be 32 bpp sprite', true);
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   633
// Check that sprite fits free space
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   634
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   635
case bpp of
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   636
    4: for y:= 0 to Pred(h) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   637
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   638
        for x:= 0 to Pred(w) do
10138
1a71d28392cb Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents: 10131
diff changeset
   639
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   640
                if ((cpY + y) <= Longint(topY)) or ((cpY + y) >= LAND_HEIGHT) or
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   641
                   ((cpX + x) <= Longint(leftX)) or ((cpX + x) >= Longint(rightX)) or (Land[cpY + y, cpX + x] <> 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   642
                    begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   643
                        if SDL_MustLock(Image) then
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   644
                            SDL_UnlockSurface(Image);
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   645
                        exit;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   646
                    end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   647
        p:= PByteArray(@(p^[Image^.pitch]));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   648
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   649
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   650
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   651
TryPlaceOnLand:= true;
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   652
if not doPlace then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   653
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   654
    if SDL_MustLock(Image) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   655
        SDL_UnlockSurface(Image);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   656
    exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   657
    end;
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   658
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   659
// Checked, now place
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   660
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   661
case bpp of
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   662
    4: for y:= 0 to Pred(h) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   663
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   664
        for x:= 0 to Pred(w) do
10138
1a71d28392cb Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents: 10131
diff changeset
   665
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   666
                   begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   667
                if (cReducedQuality and rqBlurryLand) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   668
                    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   669
                    gX:= cpX + x;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   670
                    gY:= cpY + y;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   671
                    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   672
                else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   673
                     begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   674
                     gX:= (cpX + x) div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   675
                     gY:= (cpY + y) div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   676
                    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   677
                if indestructible then
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   678
                    Land[cpY + y, cpX + x]:= lfIndestructible or LandFlags
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   679
                else if (LandPixels[gY, gX] and AMask) shr AShift = 255 then  // This test assumes lfBasic and lfObject differ only graphically
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   680
                    Land[cpY + y, cpX + x]:= lfBasic or LandFlags
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   681
                else
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   682
                    Land[cpY + y, cpX + x]:= lfObject or LandFlags;
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   683
                LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   684
                end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   685
        p:= PByteArray(@(p^[Image^.pitch]));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   686
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   687
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   688
if SDL_MustLock(Image) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   689
    SDL_UnlockSurface(Image);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   690
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   691
x:= Max(cpX, leftX);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   692
w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   693
y:= Max(cpY, topY);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   694
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   695
UpdateLandTexture(x, w, y, h, true)
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   696
end;
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   697
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   698
function GetPlaceCollisionTex(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt): PTexture;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   699
var X, Y, bpp, h, w, row, col, numFramesFirstCol: LongInt;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   700
    p, pt: PByteArray;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   701
    Image, finalSurface: PSDL_Surface;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   702
begin
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   703
GetPlaceCollisionTex:= nil;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   704
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   705
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   706
TryDo(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   707
Image:= SpritesData[Obj].Surface;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   708
w:= SpritesData[Obj].Width;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   709
h:= SpritesData[Obj].Height;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   710
row:= Frame mod numFramesFirstCol;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   711
col:= Frame div numFramesFirstCol;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   712
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   713
if SDL_MustLock(Image) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   714
    SDLTry(SDL_LockSurface(Image) >= 0, true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   715
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   716
bpp:= Image^.format^.BytesPerPixel;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   717
TryDo(bpp = 4, 'It should be 32 bpp sprite', true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   718
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   719
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   720
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   721
finalSurface:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   722
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   723
TryDo(finalSurface <> nil, 'GetPlaceCollisionTex: fail to create surface', true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   724
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   725
if SDL_MustLock(finalSurface) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   726
    SDLTry(SDL_LockSurface(finalSurface) >= 0, true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   727
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   728
// draw on surface based on collisions
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   729
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   730
pt:= PByteArray(@(PByteArray(finalSurface^.pixels)^));
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   731
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   732
case bpp of
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   733
    4: for y:= 0 to Pred(h) do
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   734
        begin
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   735
        for x:= 0 to Pred(w) do
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   736
            if (((PLongword(@(p^[x * 4]))^) and AMask) <> 0)
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   737
                and (((cpY + y) <= Longint(topY)) or ((cpY + y) >= LAND_HEIGHT) or
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   738
                   ((cpX + x) <= Longint(leftX)) or ((cpX + x) >= Longint(rightX)) or (Land[cpY + y, cpX + x] <> 0)) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   739
                    (PLongword(@(pt^[x * 4]))^):= cWhiteColor
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   740
            else
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   741
                (PLongword(@(pt^[x * 4]))^):= 0;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   742
        p:= PByteArray(@(p^[Image^.pitch]));
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   743
        pt:= PByteArray(@(pt^[finalSurface^.pitch]));
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   744
        end;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   745
    end;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   746
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   747
if SDL_MustLock(Image) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   748
    SDL_UnlockSurface(Image);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   749
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   750
if SDL_MustLock(finalSurface) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   751
    SDL_UnlockSurface(finalSurface);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   752
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   753
GetPlaceCollisionTex:= Surface2Tex(finalSurface, true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   754
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   755
SDL_FreeSurface(finalSurface);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   756
end;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   757
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   758
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   759
function Despeckle(X, Y: LongInt): boolean;
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   760
var nx, ny, i, j, c, xx, yy: LongInt;
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   761
    pixelsweep: boolean;
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   762
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   763
begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   764
    Despeckle:= true;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   765
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   766
    if (cReducedQuality and rqBlurryLand) = 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   767
    begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   768
        xx:= X;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   769
        yy:= Y;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   770
    end
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   771
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   772
    begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   773
        xx:= X div 2;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   774
        yy:= Y div 2;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   775
    end;
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   776
8751
4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents: 8744
diff changeset
   777
    pixelsweep:= (Land[Y, X] <= lfAllObjMask) and (LandPixels[yy, xx] <> 0);
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   778
    if (((Land[Y, X] and lfDamaged) <> 0) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   779
    begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   780
        c:= 0;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   781
        for i:= -1 to 1 do
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   782
            for j:= -1 to 1 do
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   783
                if (i <> 0) or (j <> 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   784
                begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   785
                    ny:= Y + i;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   786
                    nx:= X + j;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   787
                    if ((ny and LAND_HEIGHT_MASK) = 0) and ((nx and LAND_WIDTH_MASK) = 0) then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   788
                    begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   789
                        if pixelsweep then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   790
                        begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   791
                            if ((cReducedQuality and rqBlurryLand) <> 0) then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   792
                            begin
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   793
                                ny:= Y div 2 + i;
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   794
                                nx:= X div 2 + j;
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   795
                                if ((ny and (LAND_HEIGHT_MASK div 2)) = 0) and ((nx and (LAND_WIDTH_MASK div 2)) = 0) then
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   796
                                    if LandPixels[ny, nx] <> 0 then
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   797
                                        inc(c);
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   798
                            end
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   799
                            else if LandPixels[ny, nx] <> 0 then
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
   800
                                    inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   801
                        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   802
                    else if Land[ny, nx] > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   803
                        inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   804
                    end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   805
                end;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   806
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   807
        if c < 4 then // 0-3 neighbours
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   808
        begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   809
            if ((Land[Y, X] and lfBasic) <> 0) and (not disableLandBack) then
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   810
                LandPixels[yy, xx]:= LandBackPixel(X, Y)
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   811
            else
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   812
                LandPixels[yy, xx]:= LandPixels[yy, xx] and (not AMASK);
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3554
diff changeset
   813
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   814
            if not pixelsweep then
6681
nemo
parents: 6580
diff changeset
   815
            begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   816
                Land[Y, X]:= 0;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   817
                exit
6681
nemo
parents: 6580
diff changeset
   818
            end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   819
        end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   820
    end;
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
   821
    Despeckle:= false
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   822
end;
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   823
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   824
procedure Smooth(X, Y: LongInt);
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   825
begin
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   826
// a bit of AA for explosions
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   827
if (Land[Y, X] = 0) and (Y > LongInt(topY) + 1) and
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   828
    (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   829
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   830
    if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   831
    or (((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   832
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   833
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   834
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   835
            if ((LandPixels[y,x] and AMask) shr AShift) < 10 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   836
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (128 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   837
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   838
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   839
                                (((((LandPixels[y,x] and RMask shr RShift) div 2)+((ExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   840
                                (((((LandPixels[y,x] and GMask shr GShift) div 2)+((ExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   841
                                (((((LandPixels[y,x] and BMask shr BShift) div 2)+((ExplosionBorderColor and BMask) shr BShift) div 2) and $FF) shl BShift) or ($FF shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   842
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   843
        if (Land[y, x-1] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   844
            Land[y,x]:= lfObject
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   845
        else if (Land[y, x+1] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   846
            Land[y,x]:= lfObject
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   847
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   848
            Land[y,x]:= lfBasic;
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   849
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   850
    else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   851
    or (((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   852
    or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   853
    or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   854
    or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   855
    or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   856
    or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   857
    or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   858
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   859
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   860
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   861
            if ((LandPixels[y,x] and AMask) shr AShift) < 10 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   862
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (64 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   863
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   864
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   865
                                (((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((ExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   866
                                (((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((ExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   867
                                (((((LandPixels[y,x] and BMask shr BShift) * 3 div 4)+((ExplosionBorderColor and BMask) shr BShift) div 4) and $FF) shl BShift) or ($FF shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   868
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   869
        if (Land[y, x-1] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   870
            Land[y, x]:= lfObject
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   871
        else if (Land[y, x+1] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   872
            Land[y, x]:= lfObject
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   873
        else if (Land[y+1, x] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   874
            Land[y, x]:= lfObject
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   875
        else if (Land[y-1, x] = lfObject) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   876
        Land[y, x]:= lfObject
5687
fac606654317 Die speckles, round N. Check that alpha is not basically empty while blending, try to match the damaged land type.
nemo
parents: 5480
diff changeset
   877
        else Land[y,x]:= lfBasic
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   878
        end
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   879
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   880
else if ((cReducedQuality and rqBlurryLand) = 0) and (LandPixels[Y, X] and AMask = 255)
8598
9d21bab30893 Apologies if jaree had done something similar, but didn't see anything in repo pull. This removes Land[] mixed w/ LandPixels[] and streamlines things a little
nemo
parents: 8596
diff changeset
   881
and (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   882
and (Y > LongInt(topY) + 1) and (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   883
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   884
    if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   885
    or (((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   886
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   887
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   888
                        (((((LandPixels[y,x] and RMask shr RShift) div 2)+((ExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   889
                        (((((LandPixels[y,x] and GMask shr GShift) div 2)+((ExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   890
                        (((((LandPixels[y,x] and BMask shr BShift) div 2)+((ExplosionBorderColor and BMask) shr BShift) div 2) and $FF) shl BShift) or ($FF shl AShift)
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   891
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   892
    else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   893
    or (((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   894
    or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   895
    or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   896
    or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   897
    or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   898
    or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   899
    or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   900
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   901
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   902
                        (((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((ExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   903
                        (((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((ExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   904
                        (((((LandPixels[y,x] and BMask shr BShift) * 3 div 4)+((ExplosionBorderColor and BMask) shr BShift) div 4) and $FF) shl BShift) or ($FF shl AShift)
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   905
        end
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   906
    end
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   907
end;
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   908
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   909
function SweepDirty: boolean;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   910
var x, y, xx, yy, ty, tx: LongInt;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   911
    bRes, updateBlock, resweep, recheck: boolean;
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   912
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
   913
bRes:= false;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   914
reCheck:= true;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   915
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   916
while recheck do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   917
    begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   918
    recheck:= false;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   919
    for y:= 0 to LAND_HEIGHT div 32 - 1 do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   920
        begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   921
        for x:= 0 to LAND_WIDTH div 32 - 1 do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   922
            begin
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   923
            if LandDirty[y, x] = 1 then
2167
4e9ad395c1d1 Loop sweeping to avoid stray pixels. Avoided at first hoping there was a cleverer approach. Fortunately sweep is infrequent.
nemo
parents: 1892
diff changeset
   924
                begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   925
                updateBlock:= false;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   926
                resweep:= true;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   927
                ty:= y * 32;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   928
                tx:= x * 32;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   929
                while(resweep) do
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   930
                    begin
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   931
                    resweep:= false;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   932
                    for yy:= ty to ty + 31 do
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   933
                        for xx:= tx to tx + 31 do
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   934
                            if Despeckle(xx, yy) then
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   935
                                begin
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   936
                                bRes:= true;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   937
                                updateBlock:= true;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   938
                                resweep:= true;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   939
                                if (yy = ty) and (y > 0) then
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   940
                                    begin
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   941
                                    LandDirty[y-1, x]:= 1;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   942
                                    recheck:= true;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   943
                                    end
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   944
                                else if (yy = ty+31) and (y < LAND_HEIGHT div 32 - 1) then
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   945
                                    begin
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   946
                                    LandDirty[y+1, x]:= 1;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   947
                                    recheck:= true;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   948
                                    end;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   949
                                if (xx = tx) and (x > 0) then
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   950
                                    begin
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   951
                                    LandDirty[y, x-1]:= 1;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   952
                                    recheck:= true;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   953
                                    end
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   954
                                else if (xx = tx+31) and (x < LAND_WIDTH div 32 - 1) then
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   955
                                    begin
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   956
                                    LandDirty[y, x+1]:= 1;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   957
                                    recheck:= true;
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   958
                                    end
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   959
                                end;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   960
                    end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   961
                if updateBlock then
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   962
                    UpdateLandTexture(tx, 32, ty, 32, false);
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   963
                LandDirty[y, x]:= 2;
2167
4e9ad395c1d1 Loop sweeping to avoid stray pixels. Avoided at first hoping there was a cleverer approach. Fortunately sweep is infrequent.
nemo
parents: 1892
diff changeset
   964
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   965
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   966
        end;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   967
     end;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   968
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   969
for y:= 0 to LAND_HEIGHT div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   970
    for x:= 0 to LAND_WIDTH div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   971
        if LandDirty[y, x] <> 0 then
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   972
            begin
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   973
            LandDirty[y, x]:= 0;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   974
            ty:= y * 32;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   975
            tx:= x * 32;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   976
            for yy:= ty to ty + 31 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   977
                for xx:= tx to tx + 31 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   978
                    Smooth(xx,yy)
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   979
            end;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   980
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
   981
SweepDirty:= bRes;
1738
00e8dadce69a Add nemo's depixeling patch. Still needs some polishing for the case when we delete pixel on which hedgehog stays
unc0rr
parents: 1066
diff changeset
   982
end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   983
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
   984
2331
e4941a7986d6 Another try at keeping blowtorch/firepunch/jackhammer from going through indestructible stuff. Shame these routines don't use hedgehog movement
nemo
parents: 2236
diff changeset
   985
// Return true if outside of land or not the value tested, used right now for some X/Y movement that does not use normal hedgehog movement in GSHandlers.inc
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   986
function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean; inline;
2331
e4941a7986d6 Another try at keeping blowtorch/firepunch/jackhammer from going through indestructible stuff. Shame these routines don't use hedgehog movement
nemo
parents: 2236
diff changeset
   987
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   988
    CheckLandValue:= ((X and LAND_WIDTH_MASK <> 0) or (Y and LAND_HEIGHT_MASK <> 0)) or ((Land[Y, X] and LandFlag) = 0)
2331
e4941a7986d6 Another try at keeping blowtorch/firepunch/jackhammer from going through indestructible stuff. Shame these routines don't use hedgehog movement
nemo
parents: 2236
diff changeset
   989
end;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   990
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   991
function LandBackPixel(x, y: LongInt): LongWord; inline;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   992
var p: PLongWordArray;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   993
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   994
    if LandBackSurface = nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   995
        LandBackPixel:= 0
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   996
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   997
        begin
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   998
        p:= LandBackSurface^.pixels;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   999
        LandBackPixel:= p^[LandBackSurface^.w * (y mod LandBackSurface^.h) + (x mod LandBackSurface^.w)];// or $FF000000;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1000
        end
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1001
end;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1002
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1003
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1004
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1005
var
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1006
  eX, eY, dX, dY: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1007
  i, sX, sY, x, y, d: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1008
begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1009
eX:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1010
eY:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1011
dX:= X2 - X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1012
dY:= Y2 - Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1013
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1014
if (dX > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1015
    sX:= 1
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1016
else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1017
    if (dX < 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1018
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1019
        sX:= -1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1020
        dX:= -dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1021
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1022
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1023
        sX:= dX;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1024
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1025
if (dY > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1026
    sY:= 1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1027
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1028
    if (dY < 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1029
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1030
        sY:= -1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1031
        dY:= -dY
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1032
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1033
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1034
        sY:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1035
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1036
if (dX > dY) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1037
    d:= dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1038
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1039
    d:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1040
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1041
x:= X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1042
y:= Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1043
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1044
for i:= 0 to d do
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1045
    begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1046
    inc(eX, dX);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1047
    inc(eY, dY);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1048
    if (eX > d) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1049
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1050
        dec(eX, d);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1051
        inc(x, sX);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1052
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1053
    if (eY > d) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1054
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1055
        dec(eY, d);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1056
        inc(y, sY);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1057
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1058
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1059
    if ((x and LAND_WIDTH_MASK) = 0) and ((y and LAND_HEIGHT_MASK) = 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1060
        Land[y, x]:= Color;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1061
    end
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1062
end;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1063
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1064
function DrawDots(x, y, xx, yy: Longint; Color: Longword): Longword; inline;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1065
begin
10246
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
  1066
    DrawDots:= 0;
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
  1067
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1068
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) and (Land[y + yy, x + xx] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1069
        begin inc(DrawDots); Land[y + yy, x + xx]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1070
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) and (Land[y - yy, x + xx] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1071
        begin inc(DrawDots); Land[y - yy, x + xx]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1072
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) and (Land[y + yy, x - xx] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1073
        begin inc(DrawDots); Land[y + yy, x - xx]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1074
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) and (Land[y - yy, x - xx] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1075
        begin inc(DrawDots); Land[y - yy, x - xx]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1076
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) and (Land[y + xx, x + yy] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1077
        begin inc(DrawDots); Land[y + xx, x + yy]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1078
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) and (Land[y - xx, x + yy] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1079
        begin inc(DrawDots); Land[y - xx, x + yy]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1080
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) and (Land[y + xx, x - yy] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1081
        begin inc(DrawDots); Land[y + xx, x - yy]:= Color; end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1082
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) and (Land[y - xx, x - yy] <> Color) then 
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1083
        begin inc(DrawDots); Land[y - xx, x - yy]:= Color; end;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1084
end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1085
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1086
function DrawLines(X1, Y1, X2, Y2, XX, YY: LongInt; color: Longword): Longword;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1087
var
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1088
  eX, eY, dX, dY: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1089
  i, sX, sY, x, y, d: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1090
  f: boolean;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1091
begin
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1092
    eX:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1093
    eY:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1094
    dX:= X2 - X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1095
    dY:= Y2 - Y1;
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1096
    DrawLines:= 0;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1097
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1098
    if (dX > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1099
        sX:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1100
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1101
        if (dX < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1102
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1103
            sX:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1104
            dX:= -dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1105
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1106
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1107
            sX:= dX;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1108
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1109
    if (dY > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1110
        sY:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1111
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1112
        if (dY < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1113
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1114
            sY:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1115
            dY:= -dY
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1116
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1117
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1118
            sY:= dY;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1119
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1120
    if (dX > dY) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1121
        d:= dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1122
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1123
        d:= dY;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1124
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1125
    x:= X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1126
    y:= Y1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1127
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1128
    for i:= 0 to d do
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1129
        begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1130
        inc(eX, dX);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1131
        inc(eY, dY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1132
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1133
        f:= eX > d;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1134
        if f then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1135
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1136
            dec(eX, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1137
            inc(x, sX);
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1138
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1139
            end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1140
        if (eY > d) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1141
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1142
            dec(eY, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1143
            inc(y, sY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1144
            f:= true;
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1145
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1146
            end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1147
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1148
        if not f then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1149
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1150
        end
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1151
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1152
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1153
function DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword): Longword;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1154
var dx, dy, d: LongInt;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1155
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1156
    DrawThickLine:= 0;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1157
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1158
    dx:= 0;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1159
    dy:= Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1160
    d:= 3 - 2 * Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1161
    while (dx < dy) do
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1162
        begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1163
        inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color));
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1164
        if (d < 0) then
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1165
            d:= d + 4 * dx + 6
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1166
        else
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1167
            begin
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1168
            d:= d + 4 * (dx - dy) + 10;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1169
            dec(dy)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1170
            end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1171
        inc(dx)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1172
        end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1173
    if (dx = dy) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1174
        inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color));
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1175
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1176
7268
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1177
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1178
procedure DumpLandToLog(x, y, r: LongInt);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1179
var xx, yy, dx: LongInt;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1180
    s: shortstring;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1181
begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1182
    s[0]:= char(r * 2 + 1);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1183
    for yy:= y - r to y + r do
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1184
        begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1185
        for dx:= 0 to r*2 do
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1186
            begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1187
            xx:= dx - r + x;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1188
            if (xx = x) and (yy = y) then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1189
                s[dx + 1]:= 'X'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1190
            else if Land[yy, xx] > 255 then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1191
                s[dx + 1]:= 'O'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1192
            else if Land[yy, xx] > 0 then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1193
                s[dx + 1]:= '*'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1194
            else
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1195
                s[dx + 1]:= '.'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1196
            end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1197
        AddFileLog('Land dump: ' + s);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1198
        end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1199
end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1200
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
  1201
end.