hedgewars/uLandGraphics.pas
author unc0rr
Wed, 30 May 2012 22:45:30 +0400
changeset 7150 fba3b14ff746
parent 7147 11b7b12e2b85
child 7170 84ac6c6d2d8e
permissions -rw-r--r--
This should make drawn maps rendering even more faster
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
6700
e04da46ee43c the most important commit of the year
koda
parents: 6681
diff changeset
     3
 * Copyright (c) 2004-2012 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
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
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
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    25
type TRangeArray = array[0..31] of record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    26
                                   Left, Right: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    27
                                   end;
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    28
     PRangeArray = ^TRangeArray;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    29
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    30
function  addBgColor(OldColor, NewColor: LongWord): LongWord;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2695
diff changeset
    31
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
    32
function  Despeckle(X, Y: LongInt): Boolean;
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
    33
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
    34
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
    35
function  DrawExplosion(X, Y, Radius: LongInt): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    36
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    37
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    38
procedure FillRoundInLand(X, Y, Radius: LongInt; Value: Longword);
511
2b5b9e00419d - Further work on new collisions implementation
unc0rr
parents: 505
diff changeset
    39
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet: boolean);
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
    40
function  LandBackPixel(x, y: LongInt): LongWord;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
    41
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
    42
procedure DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    43
4886
e3e5362a308e fixed unlimeted fuel bug for rcplane
Henek
parents: 4791
diff changeset
    44
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; indestructible: boolean): boolean;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
    45
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    46
implementation
4403
unc0rr
parents: 4377
diff changeset
    47
uses SDLh, uLandTexture, uVariables, uUtils, uDebug;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    48
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    49
function addBgColor(OldColor, NewColor: LongWord): LongWord;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    50
// Factor ranges from 0 to 100% NewColor
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    51
var
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    52
    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
    53
begin
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    54
    oAlpha := (OldColor shr AShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    55
    nAlpha := (NewColor shr AShift);
5692
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    56
    // shortcircuit
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    57
    if (oAlpha = 0) or (nAlpha = $FF) then
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    58
        begin
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    59
        addBgColor:= NewColor;
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    60
        exit
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
    61
        end; 
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    62
    // Get colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    63
    oRed   := (OldColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    64
    oGreen := (OldColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    65
    oBlue  := (OldColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    66
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    67
    nRed   := (NewColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    68
    nGreen := (NewColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    69
    nBlue  := (NewColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    70
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    71
    // Mix colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
    72
    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
    73
    nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*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
    74
    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
    75
    nAlpha := min(255, oAlpha + nAlpha);
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    76
5041
3dc6ad20cbfe Fix endianness
nemo
parents: 4976
diff changeset
    77
    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
    78
end;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    79
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    80
procedure FillCircleLines(x, y, dx, dy: LongInt; Value: Longword);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    81
var i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    82
begin
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    83
if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
    84
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
    85
        if (Land[y + dy, i] and lfIndestructible) = 0 then
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    86
            Land[y + dy, i]:= Value;
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    87
if ((y - dy) 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
    88
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
    89
        if (Land[y - dy, i] and lfIndestructible) = 0 then
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    90
            Land[y - dy, i]:= Value;
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    91
if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
    92
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
    93
        if (Land[y + dx, i] and lfIndestructible) = 0 then
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    94
            Land[y + dx, i]:= Value;
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    95
if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
    96
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
    97
        if (Land[y - dx, i] and lfIndestructible) = 0 then
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1738
diff changeset
    98
            Land[y - dx, i]:= Value;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    99
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   100
511
2b5b9e00419d - Further work on new collisions implementation
unc0rr
parents: 505
diff changeset
   101
procedure ChangeCircleLines(x, y, dx, dy: LongInt; doSet: boolean);
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   102
var i: LongInt;
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   103
begin
511
2b5b9e00419d - Further work on new collisions implementation
unc0rr
parents: 505
diff changeset
   104
if not doSet then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   105
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   106
    if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   107
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   108
            if (Land[y + dy, i] > 0) and (Land[y + dy, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   109
                dec(Land[y + dy, i]); // check > 0 because explosion can erase collision data
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   110
    if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   111
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   112
            if (Land[y - dy, i] > 0) and (Land[y - dy, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   113
                dec(Land[y - dy, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   114
    if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   115
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   116
            if (Land[y + dx, i] > 0) and (Land[y + dx, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   117
                dec(Land[y + dx, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   118
    if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   119
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   120
            if (Land[y - dx, i] > 0) and (Land[y - dx, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   121
                dec(Land[y - dx, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   122
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   123
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   124
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   125
    if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   126
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   127
            if (Land[y + dy, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   128
                inc(Land[y + dy, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   129
    if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   130
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   131
            if (Land[y - dy, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   132
                inc(Land[y - dy, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   133
    if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   134
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   135
            if (Land[y + dx, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   136
                inc(Land[y + dx, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   137
    if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   138
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   139
            if (Land[y - dx, i] < 256) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   140
                inc(Land[y - dx, i]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   141
    end
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   142
end;
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   143
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   144
procedure FillRoundInLand(X, Y, Radius: LongInt; Value: Longword);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   145
var dx, dy, d: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   146
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   147
dx:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   148
dy:= Radius;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   149
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
   150
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
   151
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   152
    FillCircleLines(x, y, dx, dy, Value);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   153
    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
   154
        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
   155
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   156
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   157
        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
   158
        dec(dy)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   159
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   160
    inc(dx)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   161
    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   162
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
   163
    FillCircleLines(x, y, dx, dy, Value);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   164
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   165
511
2b5b9e00419d - Further work on new collisions implementation
unc0rr
parents: 505
diff changeset
   166
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet: boolean);
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   167
var dx, dy, d: LongInt;
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   168
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   169
dx:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   170
dy:= Radius;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   171
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
   172
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
   173
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   174
    ChangeCircleLines(x, y, dx, dy, doSet);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   175
    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
   176
        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
   177
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   178
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   179
        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
   180
        dec(dy)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   181
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   182
    inc(dx)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   183
    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   184
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
   185
    ChangeCircleLines(x, y, dx, dy, doSet)
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   186
end;
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   187
2603
abed6070a669 revert previous commit to remove a wip patch
koda
parents: 2602
diff changeset
   188
procedure FillLandCircleLines0(x, y, dx, dy: LongInt);
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   189
var i, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   190
begin
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   191
t:= y + dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   192
if (t and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   193
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   194
        if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  then
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
   195
            if (cReducedQuality and rqBlurryLand) = 0 then
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   196
                LandPixels[t, i]:= 0
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
   197
            else
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   198
                LandPixels[t div 2, i div 2]:= 0;
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
   199
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   200
t:= y - dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   201
if (t and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   202
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   203
        if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  then
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
   204
            if (cReducedQuality and rqBlurryLand) = 0 then
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   205
                LandPixels[t, i]:= 0
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
   206
            else
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   207
                LandPixels[t div 2, i div 2]:= 0;
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
   208
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   209
t:= y + dx;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   210
if (t and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   211
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   212
        if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  then
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
   213
            if (cReducedQuality and rqBlurryLand) = 0 then
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   214
                LandPixels[t, i]:= 0
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
   215
            else
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   216
                LandPixels[t div 2, i div 2]:= 0;
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
   217
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   218
t:= y - dx;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   219
if (t and LAND_HEIGHT_MASK) = 0 then
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   220
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   221
        if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  then
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
   222
            if (cReducedQuality and rqBlurryLand) = 0 then
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   223
                LandPixels[t, i]:= 0
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
   224
            else
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   225
                LandPixels[t div 2, i div 2]:= 0;
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
   226
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   227
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   228
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   229
function FillLandCircleLinesBG(x, y, dx, dy: LongInt): Longword;
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   230
var i, t, by, bx: LongInt;
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   231
    cnt: Longword;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   232
begin
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   233
cnt:= 0;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   234
t:= y + dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   235
if (t 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
   236
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   237
        if (Land[t, i] and lfIndestructible) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   238
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   239
            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
   240
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   241
                by:= t; bx:= i;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   242
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   243
            else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   244
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   245
                by:= t div 2; bx:= i div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   246
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   247
            if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   248
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   249
                inc(cnt);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   250
                LandPixels[by, bx]:= LandBackPixel(i, t)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   251
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   252
            else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   253
                LandPixels[by, bx]:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   254
            end;
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
   255
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   256
t:= y - dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   257
if (t 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
   258
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   259
        if (Land[t, i] and lfIndestructible) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   260
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   261
            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
   262
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   263
                by:= t; bx:= i;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   264
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   265
            else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   266
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   267
                by:= t div 2; bx:= i div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   268
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   269
            if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   270
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   271
                inc(cnt);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   272
                LandPixels[by, bx]:= LandBackPixel(i, t)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   273
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   274
            else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   275
                LandPixels[by, bx]:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   276
            end;
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
   277
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   278
t:= y + dx;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   279
if (t 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
   280
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   281
        if (Land[t, i] and lfIndestructible) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   282
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   283
            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
   284
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   285
                by:= t; bx:= i;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   286
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   287
            else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   288
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   289
                by:= t div 2; bx:= i div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   290
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   291
            if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   292
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   293
                inc(cnt);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   294
                LandPixels[by, bx]:= LandBackPixel(i, t)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   295
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   296
            else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   297
                LandPixels[by, bx]:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   298
            end;
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   299
t:= y - dx;
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   300
if (t 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
   301
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   302
        if (Land[t, i] and lfIndestructible) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   303
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   304
            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
   305
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   306
                by:= t; bx:= i;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   307
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   308
            else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   309
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   310
                by:= t div 2; bx:= i div 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   311
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   312
            if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   313
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   314
                inc(cnt);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   315
                LandPixels[by, bx]:= LandBackPixel(i, t)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   316
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   317
            else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   318
                LandPixels[by, bx]:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   319
            end;
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   320
FillLandCircleLinesBG:= cnt;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   321
end;
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   322
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   323
procedure FillLandCircleLinesEBC(x, y, dx, dy: LongInt);
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   324
var i, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   325
begin
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   326
t:= y + dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   327
if (t 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
   328
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   329
        if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   330
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   331
            if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   332
                LandPixels[t, i]:= ExplosionBorderColor
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   333
            else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   334
                LandPixels[t div 2, i 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
   335
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   336
            Land[t, i]:= Land[t, i] or lfDamaged;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   337
            //Despeckle(i, t);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   338
            LandDirty[t div 32, i div 32]:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   339
            end;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   340
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   341
t:= y - dy;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   342
if (t 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
   343
    for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   344
        if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   345
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   346
            if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   347
                LandPixels[t, i]:= 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
   348
            else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   349
                LandPixels[t div 2, i div 2]:= ExplosionBorderColor;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   350
            Land[t, i]:= Land[t, i] or lfDamaged;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   351
            //Despeckle(i, t);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   352
            LandDirty[t div 32, i div 32]:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   353
            end;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   354
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   355
t:= y + dx;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   356
if (t 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
   357
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   358
        if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   359
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   360
            if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   361
                LandPixels[t, i]:= 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
   362
            else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   363
               LandPixels[t div 2, i 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
   364
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   365
            Land[t, i]:= Land[t, i] or lfDamaged;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   366
            //Despeckle(i, t);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   367
            LandDirty[t div 32, i div 32]:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   368
            end;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   369
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   370
t:= y - dx;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   371
if (t 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
   372
    for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   373
        if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   374
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   375
            if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   376
                LandPixels[t, i]:= 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
   377
            else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   378
                LandPixels[t div 2, i 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
   379
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   380
            Land[t, i]:= Land[t, i] or lfDamaged;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   381
            //Despeckle(i, y - dy);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   382
            LandDirty[t div 32, i div 32]:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   383
            end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   384
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   385
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   386
function DrawExplosion(X, Y, Radius: LongInt): Longword;
2603
abed6070a669 revert previous commit to remove a wip patch
koda
parents: 2602
diff changeset
   387
var dx, dy, ty, tx, d: LongInt;
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   388
    cnt: Longword;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   389
begin
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   390
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   391
// draw background land texture
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   392
    begin
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   393
    cnt:= 0;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   394
    dx:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   395
    dy:= Radius;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   396
    d:= 3 - 2 * Radius;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   397
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   398
    while (dx < dy) do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   399
        begin
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   400
        inc(cnt, FillLandCircleLinesBG(x, y, dx, dy));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   401
        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
   402
            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
   403
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   404
            begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   405
            d:= d + 4 * (dx - dy) + 10;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   406
            dec(dy)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   407
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   408
        inc(dx)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   409
        end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   410
    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
   411
        inc(cnt, FillLandCircleLinesBG(x, y, dx, dy));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   412
    end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   413
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   414
// draw a hole in land
2733
52a5a160566f Engine:
smxx
parents: 2716
diff changeset
   415
if Radius > 20 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   416
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   417
    dx:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   418
    dy:= Radius - 15;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   419
    d:= 3 - 2 * dy;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   420
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   421
    while (dx < dy) do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   422
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   423
        FillLandCircleLines0(x, y, dx, dy);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   424
        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
   425
            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
   426
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   427
            begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   428
            d:= d + 4 * (dx - dy) + 10;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   429
            dec(dy)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   430
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   431
        inc(dx)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   432
        end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   433
    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
   434
        FillLandCircleLines0(x, y, dx, dy);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   435
    end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   436
1849
2a989e5abda6 4 utilities by nemo
unc0rr
parents: 1809
diff changeset
   437
  // FillRoundInLand after erasing land pixels to allow Land 0 check for mask.png to function
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   438
    FillRoundInLand(X, Y, Radius, 0);
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   439
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   440
// draw explosion border
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   441
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   442
    inc(Radius, 4);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   443
    dx:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   444
    dy:= Radius;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   445
    d:= 3 - 2 * Radius;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   446
    while (dx < dy) do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   447
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   448
        FillLandCircleLinesEBC(x, y, dx, dy);
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 (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
   450
            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
   451
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   452
            begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   453
            d:= d + 4 * (dx - dy) + 10;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   454
            dec(dy)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   455
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   456
        inc(dx)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   457
        end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   458
    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
   459
        FillLandCircleLinesEBC(x, y, dx, dy);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   460
    end;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   461
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   462
tx:= Max(X - Radius - 1, 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   463
dx:= Min(X + Radius + 1, LAND_WIDTH) - tx;
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   464
ty:= Max(Y - Radius - 1, 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   465
dy:= Min(Y + Radius + 1, LAND_HEIGHT) - ty;
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   466
UpdateLandTexture(tx, dx, ty, dy);
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   467
DrawExplosion:= cnt
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   468
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   469
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   470
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
   471
var tx, ty, by, bx,  i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   472
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   473
for i:= 0 to Pred(Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   474
    begin
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   475
    for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   476
        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
   477
            begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   478
            if (Land[ty, tx] and lfIndestructible) = 0 then
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   479
                begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   480
                if (cReducedQuality and rqBlurryLand) = 0 then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   481
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   482
                    by:= ty; bx:= tx;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   483
                    end
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   484
                else
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   485
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   486
                    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
   487
                    end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   488
                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
   489
                    LandPixels[by, bx]:= LandBackPixel(tx, ty)
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   490
                else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then 
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   491
                    LandPixels[by, bx]:= 0
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   492
                end
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   493
            end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   494
    inc(y, dY)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   495
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   496
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   497
inc(Radius, 4);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   498
dec(y, Count * dY);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   499
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   500
for i:= 0 to Pred(Count) do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   501
    begin
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   502
    for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   503
        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
   504
            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
   505
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   506
                 if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   507
                    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
   508
                else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   509
                    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
   510
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   511
                Land[ty, tx]:= Land[ty, tx] or lfDamaged;
3596
51062794ed01 Store some calcs to speed up uLandGraphics a tad
nemo
parents: 3595
diff changeset
   512
                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
   513
                end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   514
    inc(y, dY)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   515
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   516
818
635e58295079 Fix drill bug
unc0rr
parents: 772
diff changeset
   517
1807
795f97007833 Split land texture into small ones:
unc0rr
parents: 1806
diff changeset
   518
UpdateLandTexture(0, LAND_WIDTH, 0, LAND_HEIGHT)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   519
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   520
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   521
//
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   522
//  - (dX, dY) - direction, vector of length = 0.5
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   523
//
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   524
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   525
var nx, ny, dX8, dY8: hwFloat;
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   526
    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
   527
    despeckle : Boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   528
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
   529
stY:= hwRound(Y);
1809
77923087a1ce Some optimization of land texture updating
unc0rr
parents: 1807
diff changeset
   530
stX:= hwRound(X);
772
e8d530ca77be Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents: 769
diff changeset
   531
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   532
despeckle:= HalfWidth > 1;
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   533
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   534
nx:= X + dY * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   535
ny:= Y - dX * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   536
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   537
dX8:= dX * 8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   538
dY8:= dY * 8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   539
for i:= 0 to 7 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;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   543
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   544
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   545
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   546
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   547
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   548
    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
   549
    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
   550
    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
   551
    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
   552
        begin
5887
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   553
        if despeckle then 
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   554
            begin
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   555
            Land[ty, tx]:= Land[ty, tx] or lfDamaged;
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   556
            LandDirty[ty div 32, tx div 32]:= 1
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   557
            end;
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   558
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   559
            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
   560
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   561
            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
   562
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   563
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   564
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   565
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   566
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   567
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   568
for i:= -HalfWidth to HalfWidth do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   569
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   570
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   571
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   572
    for t:= 0 to 7 do
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
   573
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   574
        X:= X + dX;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   575
        Y:= Y + dY;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   576
        tx:= hwRound(X);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   577
        ty:= hwRound(Y);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   578
        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
   579
        or ((Land[ty, tx] and lfObject) <> 0)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   580
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   581
            Land[ty, tx]:= Land[ty, tx] or lfDamaged;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   582
            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
   583
                LandDirty[ty div 32, tx div 32]:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   584
            if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   585
                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
   586
            else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   587
                LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   588
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   589
        end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   590
    X:= nx;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   591
    Y:= ny;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   592
    for t:= 0 to ticks do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   593
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   594
        X:= X + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   595
        Y:= Y + dY;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   596
        tx:= hwRound(X);
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   597
        ty:= hwRound(Y);
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   598
        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
   599
            begin
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   600
            if (cReducedQuality and rqBlurryLand) = 0 then
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   601
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   602
                by:= ty; bx:= tx;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   603
                end
4690
490cf71b436a revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents: 4688
diff changeset
   604
            else
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   605
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   606
                by:= ty div 2; bx:= tx div 2;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   607
                end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   608
            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
   609
                LandPixels[by, bx]:= LandBackPixel(tx, ty)
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   610
            else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
6097
db10abae541f Couple more, add back misplaced clearing of Land
nemo
parents: 6096
diff changeset
   611
                LandPixels[by, bx]:= 0;
db10abae541f Couple more, add back misplaced clearing of Land
nemo
parents: 6096
diff changeset
   612
            Land[ty, tx]:= 0;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   613
            end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   614
        end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   615
    for t:= 0 to 7 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   616
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   617
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   618
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   619
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   620
    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
   621
    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
   622
    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
   623
        begin
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   624
        Land[ty, tx]:= Land[ty, tx] or lfDamaged;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   625
        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
   626
            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
   627
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   628
            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
   629
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   630
            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
   631
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   632
        end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   633
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   634
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   635
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   636
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   637
for i:= 0 to 7 do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   638
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   639
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   640
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   641
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   642
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   643
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   644
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   645
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   646
    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
   647
    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
   648
    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
   649
        begin
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   650
        Land[ty, tx]:= Land[ty, tx] or lfDamaged;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   651
        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
   652
            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
   653
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   654
            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
   655
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   656
            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
   657
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   658
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   659
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   660
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   661
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   662
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   663
tx:= Max(stX - HalfWidth * 2 - 4 - abs(hwRound(dX * ticks)), 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   664
ty:= Max(stY - HalfWidth * 2 - 4 - abs(hwRound(dY * ticks)), 0);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   665
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
   666
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
   667
77923087a1ce Some optimization of land texture updating
unc0rr
parents: 1807
diff changeset
   668
UpdateLandTexture(tx, ddx, ty, ddy)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   669
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   670
4886
e3e5362a308e fixed unlimeted fuel bug for rcplane
Henek
parents: 4791
diff changeset
   671
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; indestructible: boolean): 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
   672
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   673
    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
   674
    Image: PSDL_Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   675
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
   676
TryPlaceOnLand:= false;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   677
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   678
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   679
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
   680
Image:= SpritesData[Obj].Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   681
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
   682
h:= SpritesData[Obj].Height;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   683
row:= Frame mod numFramesFirstCol;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   684
col:= Frame div numFramesFirstCol;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   685
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   686
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
   687
    SDLTry(SDL_LockSurface(Image) >= 0, true);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   688
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   689
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
   690
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
   691
// Check that sprite fits free space
2236
af8fc3311748 the -1 was a bad idea
nemo
parents: 2235
diff changeset
   692
p:= @(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   693
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
   694
    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
   695
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   696
        for x:= 0 to Pred(w) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   697
            if (PLongword(@(p^[x * 4]))^) <> 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
   698
                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
   699
                   ((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
   700
                    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
   701
                        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
   702
                            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
   703
                        exit;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   704
                    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   705
        p:= @(p^[Image^.pitch]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   706
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   707
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   708
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   709
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
   710
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
   711
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   712
    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
   713
        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
   714
    exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   715
    end;
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   716
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   717
// Checked, now place
2236
af8fc3311748 the -1 was a bad idea
nemo
parents: 2235
diff changeset
   718
p:= @(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   719
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
   720
    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
   721
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   722
        for x:= 0 to Pred(w) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   723
            if (PLongword(@(p^[x * 4]))^) <> 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
   724
                   begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   725
                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
   726
                    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   727
                    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
   728
                    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
   729
                    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   730
                else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   731
                     begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   732
                     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
   733
                     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
   734
                    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   735
                if indestructible then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   736
                    Land[cpY + y, cpX + x]:= lfIndestructible
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   737
                else if (LandPixels[gY, gX] and AMask) shr AShift = 255 then  // This test assumes lfBasic and lfObject differ only graphically
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   738
                    Land[cpY + y, cpX + x]:= lfBasic
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   739
                else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   740
                    Land[cpY + y, cpX + x]:= lfObject;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   741
                // For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   742
                if (Theme = 'Snow') or (Theme = 'Christmas') then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   743
                    Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or lfIce;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   744
                    LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   745
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   746
        p:= @(p^[Image^.pitch]);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   747
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   748
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   749
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
   750
    SDL_UnlockSurface(Image);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   751
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   752
x:= Max(cpX, leftX);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   753
w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   754
y:= Max(cpY, topY);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   755
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
1807
795f97007833 Split land texture into small ones:
unc0rr
parents: 1806
diff changeset
   756
UpdateLandTexture(x, w, y, h)
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   757
end;
4f1841929ccc Construction tool
unc0rr
parents: 393
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;
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
   762
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
   763
    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
   764
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
    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
   766
    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
   767
        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
   768
        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
   769
    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
   770
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   771
    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
   772
        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
   773
        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
   774
    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
   775
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
    pixelsweep:= ((Land[Y, X] and $FF00) = 0) and (LandPixels[yy, xx] <> 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
   777
    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
   778
    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
   779
        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
   780
        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
   781
            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
   782
                if (i <> 0) or (j <> 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   783
                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
   784
                    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
   785
                    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
   786
                    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
   787
                    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
   788
                        if pixelsweep then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   789
                        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
   790
                            if ((cReducedQuality and rqBlurryLand) <> 0) then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   791
                            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
   792
                                nx:= nx 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
   793
                                ny:= ny div 2
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   794
                            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
   795
                            if LandPixels[ny, nx] <> 0 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
   796
                                inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   797
                        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   798
                    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
   799
                        inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
   800
                    end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   801
                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
   802
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
   803
        if c < 4 then // 0-3 neighbours
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   804
        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
   805
            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
   806
                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
   807
            else
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
   808
                LandPixels[yy, xx]:= 0;
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
   809
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
   810
            if not pixelsweep then
6681
nemo
parents: 6580
diff changeset
   811
            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
   812
                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
   813
                exit
6681
nemo
parents: 6580
diff changeset
   814
            end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   815
        end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   816
    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
   817
    Despeckle:= false
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   818
end;
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   819
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   820
procedure Smooth(X, Y: LongInt);
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   821
begin
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   822
// a bit of AA for explosions
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   823
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
   824
    (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
   825
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   826
    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
   827
    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
   828
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   829
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   830
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   831
            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
   832
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (128 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   833
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   834
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   835
                                (((((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
   836
                                (((((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
   837
                                (((((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
   838
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   839
        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
   840
            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
   841
        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
   842
            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
   843
        else
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]:= lfBasic;
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   845
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   846
    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
   847
    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
   848
    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
   849
    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
   850
    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
   851
    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
   852
    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
   853
    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
   854
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   855
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   856
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   857
            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
   858
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (64 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   859
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
   860
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   861
                                (((((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
   862
                                (((((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
   863
                                (((((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
   864
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   865
        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
   866
            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
   867
        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
   868
            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
   869
        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
   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-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
   872
        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
   873
        else Land[y,x]:= lfBasic
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
   874
        end
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
   875
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   876
else if ((cReducedQuality and rqBlurryLand) = 0) and (LandPixels[Y, X] and AMask = 255)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   877
and ((Land[Y, X] and (lfDamaged or lfBasic) = lfBasic) or (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   878
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
   879
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   880
    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
   881
    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
   882
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   883
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   884
                        (((((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
   885
                        (((((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
   886
                        (((((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
   887
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   888
    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
   889
    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
   890
    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
   891
    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
   892
    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
   893
    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
   894
    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
   895
    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
   896
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   897
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   898
                        (((((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
   899
                        (((((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
   900
                        (((((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
   901
        end
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
   902
    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
   903
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
   904
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   905
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
   906
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
   907
    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
   908
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
   909
bRes:= false;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   910
reCheck:= true;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   911
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   912
while recheck do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   913
    begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   914
    recheck:= false;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   915
    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
   916
        begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   917
        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
   918
            begin
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   919
            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
   920
                begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   921
                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
   922
                resweep:= true;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   923
                ty:= y * 32;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   924
                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
   925
                while(resweep) do
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   926
                    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
   927
                    resweep:= false;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
   928
                    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
   929
                        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
   930
                            if Despeckle(xx, yy) then
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   931
                                begin
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   932
                                bRes:= true;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   933
                                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
   934
                                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
   935
                                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
   936
                                    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
   937
                                    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
   938
                                    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
   939
                                    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
   940
                                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
   941
                                    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
   942
                                    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
   943
                                    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
   944
                                    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
   945
                                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
   946
                                    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
   947
                                    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
   948
                                    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
   949
                                    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
   950
                                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
   951
                                    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
   952
                                    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
   953
                                    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
   954
                                    end
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   955
                                end;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   956
                    end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   957
                if updateBlock then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   958
                    UpdateLandTexture(tx, 32, ty, 32);
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   959
                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
   960
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   961
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   962
        end;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
   963
     end;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
   964
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   965
for y:= 0 to LAND_HEIGHT div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   966
    for x:= 0 to LAND_WIDTH div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   967
        if LandDirty[y, x] <> 0 then
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   968
            begin
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   969
            LandDirty[y, x]:= 0;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   970
            ty:= y * 32;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   971
            tx:= x * 32;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   972
            for yy:= ty to ty + 31 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   973
                for xx:= tx to tx + 31 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   974
                    Smooth(xx,yy)
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   975
            end;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
   976
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
   977
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
   978
end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   979
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
   980
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
   981
// 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
   982
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
   983
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   984
    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
   985
end;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   986
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   987
function LandBackPixel(x, y: LongInt): LongWord; inline;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   988
var p: PLongWordArray;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   989
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   990
    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
   991
        LandBackPixel:= 0
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   992
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   993
        begin
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   994
        p:= LandBackSurface^.pixels;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   995
        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
   996
        end
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   997
end;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   998
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
   999
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1000
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1001
var
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1002
  eX, eY, dX, dY: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1003
  i, sX, sY, x, y, d: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1004
begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1005
eX:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1006
eY:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1007
dX:= X2 - X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1008
dY:= Y2 - Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1009
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1010
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
  1011
    sX:= 1
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1012
else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1013
    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
  1014
        begin
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;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1016
        dX:= -dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1017
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1018
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1019
        sX:= dX;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1020
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1021
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
  1022
    sY:= 1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1023
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1024
    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
  1025
        begin
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
        dY:= -dY
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1028
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1029
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1030
        sY:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1031
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1032
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
  1033
    d:= dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1034
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1035
    d:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1036
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1037
x:= X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1038
y:= Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1039
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1040
for i:= 0 to d do
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1041
    begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1042
    inc(eX, dX);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1043
    inc(eY, dY);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1044
    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
  1045
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1046
        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
  1047
        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
  1048
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1049
    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
  1050
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1051
        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
  1052
        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
  1053
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1054
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1055
    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
  1056
        Land[y, x]:= Color;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1057
    end
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1058
end;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1059
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1060
procedure DrawDots(x, y, xx, yy: Longint; Color: Longword); inline;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1061
begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1062
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) then Land[y + yy, x + xx]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1063
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) then Land[y - yy, x + xx]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1064
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) then Land[y + yy, x - xx]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1065
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) then Land[y - yy, x - xx]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1066
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) then Land[y + xx, x + yy]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1067
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) then Land[y - xx, x + yy]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1068
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) then Land[y + xx, x - yy]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1069
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) then Land[y - xx, x - yy]:= Color;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1070
end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1071
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1072
procedure DrawLines(X1, Y1, X2, Y2, XX, YY: LongInt; color: Longword);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1073
var
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1074
  eX, eY, dX, dY: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1075
  i, sX, sY, x, y, d: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1076
  f: boolean;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1077
begin
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1078
    eX:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1079
    eY:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1080
    dX:= X2 - X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1081
    dY:= Y2 - Y1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1082
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1083
    if (dX > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1084
        sX:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1085
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1086
        if (dX < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1087
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1088
            sX:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1089
            dX:= -dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1090
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1091
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1092
            sX:= dX;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1093
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1094
    if (dY > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1095
        sY:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1096
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1097
        if (dY < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1098
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1099
            sY:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1100
            dY:= -dY
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1101
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1102
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1103
            sY:= dY;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1104
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1105
    if (dX > dY) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1106
        d:= dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1107
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1108
        d:= dY;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1109
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1110
    x:= X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1111
    y:= Y1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1112
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1113
    for i:= 0 to d do
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1114
        begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1115
        inc(eX, dX);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1116
        inc(eY, dY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1117
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1118
        f:= eX > d;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1119
        if f then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1120
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1121
            dec(eX, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1122
            inc(x, sX);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1123
            DrawDots(x, y, xx, yy, color)
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1124
            end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1125
        if (eY > d) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1126
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1127
            dec(eY, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1128
            inc(y, sY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1129
            f:= true;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1130
            DrawDots(x, y, xx, yy, color)
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1131
            end;
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
        if not f then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1134
            DrawDots(x, y, xx, yy, color)
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1135
        end
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1136
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1137
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1138
procedure DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword);
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1139
var dx, dy, d: LongInt;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1140
begin
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1141
    dx:= 0;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1142
    dy:= Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1143
    d:= 3 - 2 * Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1144
    while (dx < dy) do
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1145
        begin
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1146
        DrawLines(x1, y1, x2, y2, dx, dy, color);
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1147
        if (d < 0) then
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1148
            d:= d + 4 * dx + 6
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1149
        else
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1150
            begin
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1151
            d:= d + 4 * (dx - dy) + 10;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1152
            dec(dy)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1153
            end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1154
        inc(dx)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1155
        end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1156
    if (dx = dy) then
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1157
        DrawLines(x1, y1, x2, y2, dx, dy, color);
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1158
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1159
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
  1160
end.