hedgewars/uLandGraphics.pas
author Wuzzy <Wuzzy2@mail.ru>
Sat, 15 Jun 2019 01:18:40 +0200
changeset 15145 53342ce3f0a6
parent 14291 7a7c090f96f6
child 15146 af14c418c92f
permissions -rw-r--r--
Fix freezer drawing land outside of indestructible land border in some map types
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
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10957
diff changeset
     3
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     4
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     8
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    12
 * GNU General Public License for more details.
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    13
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    14
 * You should have received a copy of the GNU General Public License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    15
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10099
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    17
 *)
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    21
unit uLandGraphics;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    22
interface
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
    23
uses uFloat, uConsts, uTypes, Math, uRenderUtils;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    24
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    25
type
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
    26
    fillType = (nullPixel, backgroundPixel, ebcPixel, icePixel, addNotHHObj, removeNotHHObj, addHH, removeHH, setCurrentHog, removeCurrentHog);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    27
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    28
type TRangeArray = array[0..31] of record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    29
                                   Left, Right: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    30
                                   end;
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 6990
diff changeset
    31
     PRangeArray = ^TRangeArray;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    32
TLandCircleProcedure = procedure (landX, landY, pixelX, pixelY: Longint);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    33
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
    34
function  addBgColor(OldColor, NewColor: LongWord): LongWord;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2695
diff changeset
    35
function  SweepDirty: boolean;
5885
ae257409bcff Remove extra graphical resweeps, and smooth prior to despeckling. Was getting odd desync here without Land[] seemingly incorrect at end of passes. Just removing seems to fix, and code wasn't that good an idea in its prior state anyway.
nemo
parents: 5832
diff changeset
    36
function  Despeckle(X, Y: LongInt): Boolean;
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
    37
procedure Smooth(X, Y: LongInt);
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3236
diff changeset
    38
function  CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean;
4377
43945842da0c Haven't found a better place than uIO for OutError
unC0Rr
parents: 4374
diff changeset
    39
function  DrawExplosion(X, Y, Radius: LongInt): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    40
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
    41
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
    42
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
    43
function FillRoundInLandFT(X, Y, Radius: LongInt; fill: fillType): Longword;
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
    44
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet, isCurrent, isHH: boolean);
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
    45
function  LandBackPixel(x, y: LongInt): LongWord;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
    46
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
10246
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
    47
function  DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword): Longword;
7268
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
    48
procedure DumpLandToLog(x, y, r: LongInt);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
    49
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint);
10295
ec6b68241575 fix some pas2c related overloading issue
sheepluva
parents: 10287
diff changeset
    50
function TryPlaceOnLandSimple(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline;
10296
fbc5f217f291 I misscounted
sheepluva
parents: 10295
diff changeset
    51
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; LandFlags: Word): boolean; inline;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
    52
function ForcePlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; LandFlags: Word; Tint: LongWord; Behind, flipHoriz, flipVert: boolean): boolean; inline;
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
    53
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, outOfMap, force, behind, flipHoriz, flipVert: boolean; LandFlags: Word; Tint: LongWord): boolean;
10903
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
    54
procedure EraseLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; LandFlags: Word; eraseOnLFMatch, onlyEraseLF, flipHoriz, flipVert: boolean);
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
    55
function GetPlaceCollisionTex(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt): PTexture;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
    56
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    57
implementation
10541
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
    58
uses SDLh, uLandTexture, uTextures, uVariables, uUtils, uDebug, uScript;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
    59
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    60
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    61
procedure calculatePixelsCoordinates(landX, landY: Longint; var pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    62
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    63
if (cReducedQuality and rqBlurryLand) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    64
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    65
    pixelX := landX;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    66
    pixelY := landY;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    67
    end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    68
else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    69
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    70
    pixelX := LandX div 2;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    71
    pixelY := LandY div 2;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    72
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    73
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    74
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    75
function drawPixelBG(landX, landY, pixelX, pixelY: Longint): Longword; inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    76
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    77
drawPixelBG := 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    78
if (Land[LandY, landX] and lfIndestructible) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    79
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    80
        if ((Land[landY, landX] and lfBasic) <> 0) and (((LandPixels[pixelY, pixelX] and AMask) shr AShift) = 255) and (not disableLandBack) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    81
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    82
            LandPixels[pixelY, pixelX]:= LandBackPixel(landX, landY);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    83
            inc(drawPixelBG);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    84
        end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    85
        else if ((Land[landY, landX] and lfObject) <> 0) or (((LandPixels[pixelY, pixelX] and AMask) shr AShift) < 255) then
10878
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
    86
            LandPixels[pixelY, pixelX]:= ExplosionBorderColorNoA
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    87
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    88
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
    89
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    90
procedure drawPixelEBC(landX, landY, pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    91
begin
10957
f3fcba306da9 prevent damage colouring of indestructible terrain
nemo
parents: 10909
diff changeset
    92
if (Land[landY, landX] and lfIndestructible = 0) and 
f3fcba306da9 prevent damage colouring of indestructible terrain
nemo
parents: 10909
diff changeset
    93
    (((Land[landY, landX] and lfBasic) <> 0) or ((Land[landY, landX] and lfObject) <> 0)) then
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    94
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    95
    LandPixels[pixelY, pixelX]:= ExplosionBorderColor;
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
    96
    Land[landY, landX]:= (Land[landY, landX] or lfDamaged) and (not lfIce);
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
    97
    LandDirty[landY div 32, landX div 32]:= 1;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    98
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
    99
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   100
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   101
function isLandscapeEdge(weight:Longint):boolean; inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   102
begin
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   103
isLandscapeEdge := (weight < 8) and (weight >= 2);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   104
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   105
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   106
function getPixelWeight(x, y:Longint): Longint;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   107
var
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   108
    i, j, r: Longint;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   109
begin
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   110
r := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   111
for i := x - 1 to x + 1 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   112
    for j := y - 1 to y + 1 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   113
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   114
    if (i < 0) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   115
       (i > LAND_WIDTH - 1) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   116
       (j < 0) or
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   117
       (j > LAND_HEIGHT -1) then
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   118
       exit(9);
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   119
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   120
    if Land[j, i] and lfLandMask and (not lfIce) = 0 then
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   121
       inc(r)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   122
    end;
8841
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   123
338f7c2bac2c Fix rendering errors now.
unc0rr
parents: 8839
diff changeset
   124
    getPixelWeight:= r
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   125
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   126
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   127
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   128
procedure fillPixelFromIceSprite(pixelX, pixelY:Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   129
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   130
    iceSurface: PSDL_Surface;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   131
    icePixels: PLongwordArray;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   132
    w: LongWord;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   133
begin
9460
7d7e4ca70f6b Skip some LandPixels manipulations in stats-only mode
unc0rr
parents: 9080
diff changeset
   134
    if cOnlyStats then exit;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   135
    // So. 3 parameters here. Ice colour, Ice opacity, and a bias on the greyscaled pixel towards lightness
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   136
    iceSurface:= SpritesData[sprIceTexture].Surface;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   137
    icePixels := iceSurface^.pixels;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   138
    w:= LandPixels[pixelY, pixelX];
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   139
    if w > 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   140
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   141
        w:= round(((w shr RShift and $FF) * RGB_LUMINANCE_RED +
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   142
              (w shr BShift and $FF) * RGB_LUMINANCE_GREEN +
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   143
              (w shr GShift and $FF) * RGB_LUMINANCE_BLUE));
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   144
        if w < 128 then w:= w+128;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   145
        if w > 255 then w:= 255;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   146
        w:= (w shl RShift) or (w shl BShift) or (w shl GShift) or (LandPixels[pixelY, pixelX] and AMask);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   147
        LandPixels[pixelY, pixelX]:= addBgColor(w, IceColor);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   148
        LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)])
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   149
        end
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   150
    else
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   151
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   152
        LandPixels[pixelY, pixelX]:= IceColor and (not AMask) or $E8 shl AShift;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   153
        LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)]);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   154
        // silly workaround to avoid having to make background erasure a tadb it smarter about sea ice
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   155
        if LandPixels[pixelY, pixelX] and AMask shr AShift = 255 then
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   156
            LandPixels[pixelY, pixelX]:= LandPixels[pixelY, pixelX] and (not AMask) or 254 shl AShift;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   157
        end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   158
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   159
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   160
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   161
procedure DrawPixelIce(landX, landY, pixelX, pixelY: Longint); inline;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   162
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   163
if ((Land[landY, landX] and lfIce) <> 0) then exit;
15145
53342ce3f0a6 Fix freezer drawing land outside of indestructible land border in some map types
Wuzzy <Wuzzy2@mail.ru>
parents: 14291
diff changeset
   164
if (pixelX < LeftX) or (pixelX > RightX) or (pixelY < TopY) then exit;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   165
if isLandscapeEdge(getPixelWeight(landX, landY)) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   166
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   167
    if (LandPixels[pixelY, pixelX] and AMask < 255) and (LandPixels[pixelY, pixelX] and AMask > 0) then
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   168
        LandPixels[pixelY, pixelX] := (IceEdgeColor and (not AMask)) or (LandPixels[pixelY, pixelX] and AMask)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   169
    else if (LandPixels[pixelY, pixelX] and AMask < 255) or (Land[landY, landX] > 255) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   170
        LandPixels[pixelY, pixelX] := IceEdgeColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   171
    end
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   172
else if Land[landY, landX] > 255 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   173
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   174
        fillPixelFromIceSprite(pixelX, pixelY);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   175
    end;
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   176
if Land[landY, landX] > 255 then Land[landY, landX] := Land[landY, landX] or lfIce and (not lfDamaged);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   177
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   178
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   179
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   180
function FillLandCircleLineFT(y, fromPix, toPix: LongInt; fill : fillType): Longword;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   181
var px, py, i: LongInt;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   182
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   183
//get rid of compiler warning
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   184
    px := 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   185
    py := 0;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   186
    FillLandCircleLineFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   187
    case fill of
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   188
    backgroundPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   189
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   190
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   191
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   192
            inc(FillLandCircleLineFT, drawPixelBG(i, y, px, py));
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   193
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   194
    ebcPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   195
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   196
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   197
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   198
            drawPixelEBC(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   199
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   200
    nullPixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   201
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   202
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   203
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   204
            if ((Land[y, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[y, i] > 255))  then
10878
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   205
                LandPixels[py, px]:= ExplosionBorderColorNoA;
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   206
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   207
    icePixel:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   208
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   209
            begin
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   210
            calculatePixelsCoordinates(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   211
            DrawPixelIce(i, y, px, py);
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   212
            end;
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   213
    addNotHHObj:
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   214
        for i:= fromPix to toPix do
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   215
            begin
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   216
            if Land[y, i] and lfNotHHObjMask shr lfNotHHObjShift < lfNotHHObjSize then
11595
8d1cfedfaf1f fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents: 11594
diff changeset
   217
                Land[y, i]:= (Land[y, i] and (not lfNotHHObjMask)) or ((Land[y, i] and lfNotHHObjMask shr lfNotHHObjShift + 1) shl lfNotHHObjShift);
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   218
            end;
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   219
    removeNotHHObj:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   220
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   221
            begin
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   222
            if Land[y, i] and lfNotHHObjMask <> 0 then
11595
8d1cfedfaf1f fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents: 11594
diff changeset
   223
                Land[y, i]:= (Land[y, i] and (not lfNotHHObjMask)) or ((Land[y, i] and lfNotHHObjMask shr lfNotHHObjShift - 1) shl lfNotHHObjShift);
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   224
            end;
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   225
    addHH:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   226
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   227
            begin
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   228
            if Land[y, i] and lfHHMask < lfHHMask then
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   229
                Land[y, i]:= Land[y, i] + 1
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   230
            end;
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   231
    removeHH:
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   232
        for i:= fromPix to toPix do
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   233
            begin
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   234
            if Land[y, i] and lfHHMask > 0 then
9878
163944282710 Uberfix. TODO: ask fpc guys wtf.
unc0rr
parents: 9877
diff changeset
   235
                Land[y, i]:= Land[y, i] - 1;
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   236
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   237
    setCurrentHog:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   238
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   239
            begin
13468
f1d349a52bc7 Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents: 13410
diff changeset
   240
            Land[y, i]:= Land[y, i] or lfCurHogCrate
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   241
            end;
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   242
    removeCurrentHog:
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   243
        for i:= fromPix to toPix do
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   244
            begin
13468
f1d349a52bc7 Refactor: lfCurrentHog→lfCurHogCrate, lfNotCurrentMask→lfNotCurHogCrate
Wuzzy <Wuzzy2@mail.ru>
parents: 13410
diff changeset
   245
            Land[y, i]:= Land[y, i] and lfNotCurHogCrate;
9877
2f3355b29420 A bit of formatting
unc0rr
parents: 9876
diff changeset
   246
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   247
    end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   248
end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   249
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   250
function FillLandCircleSegmentFT(x, y, dx, dy: LongInt; fill : fillType): Longword; inline;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   251
begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   252
    FillLandCircleSegmentFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   253
if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   254
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y + dy, Max(x - dx, 0), Min(x + dx, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   255
if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   256
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y - dy, Max(x - dx, 0), Min(x + dx, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   257
if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   258
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y + dx, Max(x - dy, 0), Min(x + dy, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   259
if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   260
    inc(FillLandCircleSegmentFT, FillLandCircleLineFT(y - dx, Max(x - dy, 0), Min(x + dy, LAND_WIDTH - 1), fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   261
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   262
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   263
function FillRoundInLandFT(X, Y, Radius: LongInt; fill: fillType): Longword; inline;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   264
var dx, dy, d: LongInt;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   265
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   266
dx:= 0;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   267
dy:= Radius;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   268
d:= 3 - 2 * Radius;
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   269
FillRoundInLandFT := 0;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   270
while (dx < dy) do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   271
    begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   272
    inc(FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   273
    if (d < 0) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   274
        d:= d + 4 * dx + 6
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   275
    else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   276
        begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   277
        d:= d + 4 * (dx - dy) + 10;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   278
        dec(dy)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   279
        end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   280
    inc(dx)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   281
    end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   282
if (dx = dy) then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   283
    inc (FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill));
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   284
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   285
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   286
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   287
function addBgColor(OldColor, NewColor: LongWord): LongWord;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   288
// Factor ranges from 0 to 100% NewColor
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   289
var
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   290
    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
   291
begin
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   292
    oAlpha := (OldColor shr AShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   293
    nAlpha := (NewColor shr AShift);
5692
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   294
    // shortcircuit
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   295
    if (oAlpha = 0) or (nAlpha = $FF) then
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   296
        begin
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   297
        addBgColor:= NewColor;
753ae5d0776c implement proper blending
nemo
parents: 5687
diff changeset
   298
        exit
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   299
        end;
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   300
    // Get colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   301
    oRed   := (OldColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   302
    oGreen := (OldColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   303
    oBlue  := (OldColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   304
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   305
    nRed   := (NewColor shr RShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   306
    nGreen := (NewColor shr GShift);
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   307
    nBlue  := (NewColor shr BShift);
4791
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   308
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   309
    // Mix colors
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5895
diff changeset
   310
    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
   311
    nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*oAlpha*byte(255-nAlpha)) div 65025));
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   312
    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
   313
    nAlpha := min(255, oAlpha + nAlpha);
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   314
5041
3dc6ad20cbfe Fix endianness
nemo
parents: 4976
diff changeset
   315
    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
   316
end;
458d9854c679 Snow blends into land, trys to fill the gaps
Palewolf
parents: 4700
diff changeset
   317
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   318
function FillCircleLines(x, y, dx, dy: LongInt; Value: Longword): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   319
var i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   320
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   321
    FillCircleLines:= 0;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   322
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   323
    if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   324
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   325
            if (Land[y + dy, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   326
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   327
                if Land[y + dy, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   328
                Land[y + dy, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   329
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   330
    if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   331
        for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   332
            if (Land[y - dy, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   333
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   334
                if Land[y - dy, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   335
                Land[y - dy, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   336
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   337
    if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   338
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   339
            if (Land[y + dx, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   340
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   341
                if Land[y + dx, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   342
                Land[y + dx, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   343
            end;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   344
    if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   345
        for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   346
            if (Land[y - dx, i] and lfIndestructible) = 0 then
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   347
            begin
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   348
                if Land[y - dx, i] <> Value then inc(FillCircleLines);
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   349
                Land[y - dx, i]:= Value;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   350
            end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   351
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   352
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   353
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   354
var dx, dy, d: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   355
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   356
FillRoundInLand:= 0;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   357
dx:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   358
dy:= Radius;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   359
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
   360
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
   361
    begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   362
    inc(FillRoundInLand, FillCircleLines(x, y, dx, dy, Value));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   363
    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
   364
        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
   365
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   366
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   367
        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
   368
        dec(dy)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   369
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   370
    inc(dx)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   371
    end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   372
if (dx = dy) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
   373
    inc(FillRoundInLand, FillCircleLines(x, y, dx, dy, Value));
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   374
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   375
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   376
procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet, isCurrent, isHH: boolean);
504
13b6ebc53627 Fix collision info artifacts in Land array when two objects intersect
unc0rr
parents: 495
diff changeset
   377
begin
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   378
if not doSet and isCurrent then
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   379
    FillRoundInLandFT(X, Y, Radius, removeCurrentHog)
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   380
else if (not doSet) and (not IsCurrent) and isHH then
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   381
    FillRoundInLandFT(X, Y, Radius, removeHH)
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   382
else if (not doSet) and (not IsCurrent) and (not isHH) then
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   383
    FillRoundInLandFT(X, Y, Radius, removeNotHHObj)
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   384
else if doSet and IsCurrent then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   385
    FillRoundInLandFT(X, Y, Radius, setCurrentHog)
11594
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   386
else if doSet and (not IsCurrent) and isHH then
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   387
    FillRoundInLandFT(X, Y, Radius, addHH)
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   388
else if doSet and (not IsCurrent) and (not isHH) then
c453620cc6d6 Break up the hog/object collision. Currently is $7F, allowing 128 overlapping objects accurately. Breaking it up into 15 for hogs, 7 for other objects. I'm thinking the overall accuracy should be just fine as far as people noticing even with a ton of overlapping hogs, and this way we can tell the difference between a hog and "something else". For experiment and rope-breaking purposes, make rope pass through hogs.
nemo
parents: 11593
diff changeset
   389
    FillRoundInLandFT(X, Y, Radius, addNotHHObj);
8583
f2edd6d5f958 Change shape of ice to round
Urbertar@gmail.com
parents: 8579
diff changeset
   390
end;
f2edd6d5f958 Change shape of ice to round
Urbertar@gmail.com
parents: 8579
diff changeset
   391
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   392
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint);
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   393
var
10582
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   394
    i, j, iceL, iceR, IceT, iceB: LongInt;
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   395
    landRect: TSDL_Rect;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   396
begin
10582
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   397
// figure out bottom/left/right/top coords of ice to draw
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   398
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   399
// determine absolute limits first
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   400
iceT:= 0;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   401
iceB:= min(cWaterLine, LAND_HEIGHT - 1);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   402
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   403
iceL:= 0;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   404
iceR:= LAND_WIDTH - 1;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   405
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   406
if WorldEdge <> weNone then
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   407
    begin
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   408
    iceL:= max(leftX,  iceL);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   409
    iceR:= min(rightX, iceR);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   410
    end;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   411
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   412
// adjust based on location but without violating absolute limits
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   413
if y >= cWaterLine then
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   414
    begin
10582
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   415
    iceL:= max(x - iceRadius, iceL);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   416
    iceR:= min(x + iceRadius, iceR);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   417
    iceT:= max(cWaterLine - iceHeight, iceT);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   418
    end
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   419
else {if WorldEdge = weSea then}
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   420
    begin
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   421
    iceT:= max(y - iceRadius, iceT);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   422
    iceB:= min(y + iceRadius, iceB);
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   423
    if x <= leftX then
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   424
        iceR:= min(leftX + iceHeight, iceR)
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   425
    else {if x >= rightX then}
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
   426
        iceL:= max(rightX - iceHeight, iceL);
10582
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   427
    end;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   428
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   429
// don't continue if all ice is outside land array
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   430
if (iceL > iceR) or (iceT > iceB) then
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   431
    exit();
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   432
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   433
for i := iceL to iceR do
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   434
    begin
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   435
    for j := iceT to iceB do
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   436
        begin
8624
12bdc51a6790 tweaks to sea ice appearance
nemo
parents: 8612
diff changeset
   437
        if Land[j, i] = 0 then
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   438
            begin
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   439
            Land[j, i] := lfIce;
10099
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   440
            if (cReducedQuality and rqBlurryLand) = 0 then
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   441
                fillPixelFromIceSprite(i, j)
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   442
            else
67b7bc539639 fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents: 10040
diff changeset
   443
                fillPixelFromIceSprite(i div 2, j div 2);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   444
            end;
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   445
        end;
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   446
    end;
10582
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   447
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   448
landRect.x := iceL;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   449
landRect.y := iceT;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   450
landRect.w := iceR - IceL + 1;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   451
landRect.h := iceB - iceT + 1;
672e7028b1b6 give sea world edges some icegun love
sheepluva
parents: 10541
diff changeset
   452
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   453
UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
8602
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   454
end;
f510cca2b988 Draw ice on water
Urbertar@gmail.com
parents: 8601
diff changeset
   455
3689
e2be39ee19f0 Engine:
smaxx
parents: 3608
diff changeset
   456
function DrawExplosion(X, Y, Radius: LongInt): Longword;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   457
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   458
    tx, ty, dx, dy: Longint;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   459
begin
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   460
    DrawExplosion := FillRoundInLandFT(x, y, Radius, backgroundPixel);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   461
    if Radius > 20 then
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   462
        FillRoundInLandFT(x, y, Radius - 15, nullPixel);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   463
    FillRoundInLand(X, Y, Radius, 0);
9876
641c334eab46 Be friendly with pas2c
unc0rr
parents: 9768
diff changeset
   464
    FillRoundInLandFT(x, y, Radius + 4, ebcPixel);
8828
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   465
    tx:= Max(X - Radius - 5, 0);
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   466
    dx:= Min(X + Radius + 5, LAND_WIDTH) - tx;
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   467
    ty:= Max(Y - Radius - 5, 0);
4ae5233abe76 Hey, there was inc(Radius, 4)
unc0rr
parents: 8795
diff changeset
   468
    dy:= Min(Y + Radius + 5, LAND_HEIGHT) - ty;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   469
    UpdateLandTexture(tx, dx, ty, dy, false);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   470
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   471
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 358
diff changeset
   472
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
   473
var tx, ty, by, bx,  i: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   474
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   475
for i:= 0 to Pred(Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   476
    begin
13572
8f9b84d6991d Fix DrawHLinesExplosions setting invalid map pixels if called at wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents: 13468
diff changeset
   477
    for ty:= Max(y - Radius, 0) to Min(y + Radius, TopY) do
8f9b84d6991d Fix DrawHLinesExplosions setting invalid map pixels if called at wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents: 13468
diff changeset
   478
        for tx:= Max(LeftX, ar^[i].Left - Radius) to Min(RightX, ar^[i].Right + Radius) do
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 (Land[ty, tx] and lfIndestructible) = 0 then
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   481
                begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   482
                if (cReducedQuality and rqBlurryLand) = 0 then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   483
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   484
                    by:= ty; bx:= tx;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   485
                    end
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   486
                else
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   487
                    begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   488
                    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
   489
                    end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   490
                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
   491
                    LandPixels[by, bx]:= LandBackPixel(tx, ty)
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   492
                else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   493
                    LandPixels[by, bx]:= LandPixels[by, bx] and (not AMASK)
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   494
                end
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   495
            end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   496
    inc(y, dY)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   497
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   498
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   499
inc(Radius, 4);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   500
dec(y, Count * dY);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   501
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   502
for i:= 0 to Pred(Count) do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   503
    begin
13572
8f9b84d6991d Fix DrawHLinesExplosions setting invalid map pixels if called at wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents: 13468
diff changeset
   504
    for ty:= Max(y - Radius, 0) to Min(y + Radius, TopY) do
8f9b84d6991d Fix DrawHLinesExplosions setting invalid map pixels if called at wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents: 13468
diff changeset
   505
        for tx:= Max(LeftX, ar^[i].Left - Radius) to Min(RightX, ar^[i].Right + Radius) do
4690
490cf71b436a revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents: 4688
diff changeset
   506
            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
   507
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   508
                 if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   509
                    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
   510
                else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   511
                    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
   512
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   513
                Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
3596
51062794ed01 Store some calcs to speed up uLandGraphics a tad
nemo
parents: 3595
diff changeset
   514
                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
   515
                end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   516
    inc(y, dY)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   517
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   518
818
635e58295079 Fix drill bug
unc0rr
parents: 772
diff changeset
   519
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   520
UpdateLandTexture(0, LAND_WIDTH, 0, LAND_HEIGHT, false)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   521
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   522
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   523
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   524
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   525
procedure DrawExplosionBorder(X, Y, dx, dy:hwFloat;  despeckle : Boolean);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   526
var
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   527
    t, tx, ty :Longint;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   528
begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   529
for t:= 0 to 7 do
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   530
    begin
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   531
    X:= X + dX;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   532
    Y:= Y + dY;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   533
    tx:= hwRound(X);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   534
    ty:= hwRound(Y);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   535
    if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   536
    or ((Land[ty, tx] and lfObject) <> 0)) then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   537
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   538
        Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   539
        if despeckle then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   540
            LandDirty[ty div 32, tx div 32]:= 1;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   541
        if (cReducedQuality and rqBlurryLand) = 0 then
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   542
            LandPixels[ty, tx]:= ExplosionBorderColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   543
        else
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   544
            LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   545
        end
8795
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces?
koda
parents: 8783 8774
diff changeset
   546
    end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   547
end;
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   548
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   549
type TWrapNeeded = (wnNone, wnLeft, wnRight);
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   550
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   551
//
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   552
//  - (dX, dY) - direction, vector of length = 0.5
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   553
//
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   554
function DrawTunnel_real(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt): TWrapNeeded;
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   555
var nx, ny, dX8, dY8: hwFloat;
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   556
    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
   557
    despeckle : Boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   558
begin  // (-dY, dX) is (dX, dY) rotated by PI/2
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   559
DrawTunnel_real:= wnNone;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   560
772
e8d530ca77be Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents: 769
diff changeset
   561
stY:= hwRound(Y);
1809
77923087a1ce Some optimization of land texture updating
unc0rr
parents: 1807
diff changeset
   562
stX:= hwRound(X);
772
e8d530ca77be Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents: 769
diff changeset
   563
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   564
despeckle:= HalfWidth > 1;
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   565
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   566
nx:= X + dY * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   567
ny:= Y - dX * (HalfWidth + 8);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   568
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   569
dX8:= dX * 8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   570
dY8:= dY * 8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   571
for i:= 0 to 7 do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   572
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   573
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   574
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   575
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   576
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   577
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   578
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   579
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   580
    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
   581
    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
   582
    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
   583
    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
   584
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   585
        Land[ty, tx]:= Land[ty, tx] and (not lfIce);
7492
3188794b9d87 Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents: 7270
diff changeset
   586
        if despeckle then
5887
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   587
            begin
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   588
            Land[ty, tx]:= Land[ty, tx] or lfDamaged;
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   589
            LandDirty[ty div 32, tx div 32]:= 1
7d69b76ce923 Don't set lfDamaged for small tunnels
nemo
parents: 5885
diff changeset
   590
            end;
5332
b29d60c7cac7 Use an ifdef instead, add despeckling of tunnels
nemo
parents: 5322
diff changeset
   591
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   592
            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
   593
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   594
            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
   595
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   596
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   597
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   598
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   599
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   600
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   601
for i:= -HalfWidth to HalfWidth do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   602
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   603
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   604
    Y:= ny - dY8;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   605
    DrawExplosionBorder(X, Y, dx, dy, despeckle);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   606
    X:= nx;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   607
    Y:= ny;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   608
    for t:= 0 to ticks do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   609
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   610
        X:= X + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   611
        Y:= Y + dY;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   612
        tx:= hwRound(X);
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 345
diff changeset
   613
        ty:= hwRound(Y);
3519
56cbc035b74b rename flags
nemo
parents: 3518
diff changeset
   614
        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
   615
            begin
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   616
            if (cReducedQuality and rqBlurryLand) = 0 then
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   617
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   618
                by:= ty; bx:= tx;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   619
                end
4690
490cf71b436a revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents: 4688
diff changeset
   620
            else
5480
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   621
                begin
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   622
                by:= ty div 2; bx:= tx div 2;
37bafa5a7016 kill off some speckles, crank up land gun output
nemo
parents: 5386
diff changeset
   623
                end;
6355
734fed7aefd3 Introduce initialization expressions
unc0rr
parents: 6132
diff changeset
   624
            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
   625
                LandPixels[by, bx]:= LandBackPixel(tx, ty)
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
   626
            else if ((Land[ty, tx] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
   627
                LandPixels[by, bx]:= LandPixels[by, bx] and (not AMASK);
6097
db10abae541f Couple more, add back misplaced clearing of Land
nemo
parents: 6096
diff changeset
   628
            Land[ty, tx]:= 0;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2646
diff changeset
   629
            end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   630
        end;
8783
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas
Urbertar
parents: 8773
diff changeset
   631
    DrawExplosionBorder(X, Y, dx, dy, despeckle);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   632
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   633
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   634
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   635
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   636
for i:= 0 to 7 do
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   637
    begin
358
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   638
    X:= nx - dX8;
236bbd12d4d9 - New Land Generator
unc0rr
parents: 351
diff changeset
   639
    Y:= ny - dY8;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   640
    for t:= -8 to ticks + 8 do
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   641
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   642
    X:= X + dX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   643
    Y:= Y + dY;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   644
    tx:= hwRound(X);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
   645
    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
   646
    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
   647
    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
   648
        begin
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
   649
        Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   650
        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
   651
            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
   652
        if (cReducedQuality and rqBlurryLand) = 0 then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   653
            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
   654
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   655
            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
   656
        end
2666
2b8c8f16421e update SDLMain.m/.h to latest version
koda
parents: 2648
diff changeset
   657
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   658
    nx:= nx - dY;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   659
    ny:= ny + dX;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   660
    end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   661
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   662
tx:= stX - HalfWidth * 2 - 4 - abs(hwRound(dX * ticks));
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   663
ddx:= stX + HalfWidth * 2 + 4 + abs(hwRound(dX * ticks));
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   664
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   665
if WorldEdge = weWrap then
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   666
    begin
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   667
    if (tx < leftX) or (ddx < leftX) then
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   668
        DrawTunnel_real:= wnLeft
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   669
    else if (tx > rightX) or (ddx > rightX) then
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   670
        DrawTunnel_real:= wnRight;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   671
    end;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   672
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   673
tx:= Max(tx, 0);
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   674
ty:= Max(stY - HalfWidth * 2 - 4 - abs(hwRound(dY * ticks)), 0);
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   675
ddx:= Min(ddx, LAND_WIDTH) - tx;
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   676
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
   677
7170
84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws
nemo
parents: 7150
diff changeset
   678
UpdateLandTexture(tx, ddx, ty, ddy, false)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   679
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
   680
10674
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   681
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt);
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   682
var wn: TWrapNeeded;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   683
begin
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   684
wn:= DrawTunnel_real(X, Y, dX, dY, ticks, HalfWidth);
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   685
if wn <> wnNone then
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   686
    begin
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   687
    if wn = wnLeft then
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   688
        DrawTunnel_real(X + int2hwFloat(playWidth), Y, dX, dY, ticks, HalfWidth)
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   689
    else
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   690
        DrawTunnel_real(X - int2hwFloat(playWidth), Y, dX, dY, ticks, HalfWidth);
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   691
    end;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   692
end;
fddbab2eecea Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents: 10601
diff changeset
   693
10295
ec6b68241575 fix some pas2c related overloading issue
sheepluva
parents: 10287
diff changeset
   694
function TryPlaceOnLandSimple(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline;
10296
fbc5f217f291 I misscounted
sheepluva
parents: 10295
diff changeset
   695
var lf: Word;
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   696
begin
10286
1940e937fc08 fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)
sheepluva
parents: 10253
diff changeset
   697
if indestructible then
1940e937fc08 fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)
sheepluva
parents: 10253
diff changeset
   698
    lf:= lfIndestructible
1940e937fc08 fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)
sheepluva
parents: 10253
diff changeset
   699
else
1940e937fc08 fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)
sheepluva
parents: 10253
diff changeset
   700
    lf:= 0;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   701
TryPlaceOnLandSimple:= TryPlaceOnLand(cpX, cpY, Obj, Frame, doPlace, false, false, false, false, false, lf, $FFFFFFFF);
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   702
end;
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   703
10296
fbc5f217f291 I misscounted
sheepluva
parents: 10295
diff changeset
   704
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; LandFlags: Word): boolean; inline;
10253
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   705
begin
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   706
TryPlaceOnLand:= TryPlaceOnLand(cpX, cpY, Obj, Frame, doPlace, false, false, false, false, false, LandFlags, $FFFFFFFF);
10253
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   707
end;
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   708
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   709
function ForcePlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; LandFlags: Word; Tint: LongWord; Behind, flipHoriz, flipVert: boolean): boolean; inline;
10368
7ebb71a36e95 Forced sprites placing mode, exposed to scripts (not tested at all)
unc0rr
parents: 10296
diff changeset
   710
begin
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   711
    ForcePlaceOnLand:= TryPlaceOnLand(cpX, cpY, Obj, Frame, true, false, true, behind, flipHoriz, flipVert, LandFlags, Tint)
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9460
diff changeset
   712
end;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   713
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, outOfMap, force, behind, flipHoriz, flipVert: boolean; LandFlags: Word; Tint: LongWord): 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
   714
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   715
    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
   716
    Image: PSDL_Surface;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   717
    pixel: LongWord;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   718
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
   719
TryPlaceOnLand:= false;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   720
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   721
10253
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   722
if outOfMap then doPlace:= false; // just using for a check
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   723
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   724
if checkFails(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true) then exit;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   725
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   726
Image:= SpritesData[Obj].Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   727
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
   728
h:= SpritesData[Obj].Height;
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   729
if flipVert then flipSurface(Image, true);
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   730
if flipHoriz then flipSurface(Image, false);
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   731
row:= Frame mod numFramesFirstCol;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   732
col:= Frame div numFramesFirstCol;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   733
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   734
if SDL_MustLock(Image) then
11512
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   735
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'TryPlaceOnLand', true) then exit;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   736
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   737
bpp:= Image^.format^.BytesPerPixel;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   738
if checkFails(bpp = 4, 'It should be 32 bpp sprite', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   739
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   740
    if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   741
        SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   742
    exit
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   743
end;
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   744
// Check that sprite fits free space
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   745
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   746
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
   747
    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
   748
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   749
        for x:= 0 to Pred(w) do
10138
1a71d28392cb Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents: 10131
diff changeset
   750
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
   751
                if (outOfMap and
10368
7ebb71a36e95 Forced sprites placing mode, exposed to scripts (not tested at all)
unc0rr
parents: 10296
diff changeset
   752
                   ((cpY + y) < LAND_HEIGHT) and ((cpY + y) >= 0) and
7ebb71a36e95 Forced sprites placing mode, exposed to scripts (not tested at all)
unc0rr
parents: 10296
diff changeset
   753
                   ((cpX + x) < LAND_WIDTH) and ((cpX + x) >= 0) and
10374
unc0rr
parents: 10368
diff changeset
   754
                   ((not force) and (Land[cpY + y, cpX + x] <> 0))) or
10253
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   755
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   756
                   (not outOfMap and
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
   757
                       (((cpY + y) <= topY) or ((cpY + y) >= LAND_HEIGHT) or
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
   758
                       ((cpX + x) <= leftX) or ((cpX + x) >= rightX) or
10374
unc0rr
parents: 10368
diff changeset
   759
                       ((not force) and (Land[cpY + y, cpX + x] <> 0)))) then
10253
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   760
                   begin
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   761
                   if SDL_MustLock(Image) then
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   762
                       SDL_UnlockSurface(Image);
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   763
                   exit
ea57f2f2b98d allow teleporting outside Land[]
nemo
parents: 10251
diff changeset
   764
                   end;
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   765
        p:= PByteArray(@(p^[Image^.pitch]))
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   766
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   767
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   768
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   769
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
   770
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
   771
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   772
    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
   773
        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
   774
    exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   775
    end;
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   776
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   777
// Checked, now place
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   778
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   779
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
   780
    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
   781
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   782
        for x:= 0 to Pred(w) do
10138
1a71d28392cb Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents: 10131
diff changeset
   783
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
11593
7c8fd2f66e9b fix and/or screwup that was causing girders in tunnels to erase the tunnel. also a little bit of indentation/case fixing
nemo
parents: 11537
diff changeset
   784
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   785
                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
   786
                    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   787
                    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
   788
                    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
   789
                    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   790
                else
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   791
                    begin
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   792
                    gX:= (cpX + x) div 2;
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   793
                    gY:= (cpY + y) div 2;
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   794
                    end;
11595
8d1cfedfaf1f fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents: 11594
diff changeset
   795
                if (not behind) or (Land[cpY + y, cpX + x] and lfLandMask = 0) then
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   796
                    begin
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   797
                    if (LandFlags and lfBasic <> 0) or 
11593
7c8fd2f66e9b fix and/or screwup that was causing girders in tunnels to erase the tunnel. also a little bit of indentation/case fixing
nemo
parents: 11537
diff changeset
   798
                       ((LandPixels[gY, gX] and AMask shr AShift > 128) and  // This test assumes lfBasic and lfObject differ only graphically
13410
4c813650fe17 make the mine slippery too since it has the ice finish - add a gmDelete to the gear if you want it to *not* explode when hit ☺
nemo
parents: 11595
diff changeset
   799
                         (LandFlags and (lfObject or lfIce) = 0)) then
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   800
                         Land[cpY + y, cpX + x]:= lfBasic or LandFlags
13410
4c813650fe17 make the mine slippery too since it has the ice finish - add a gmDelete to the gear if you want it to *not* explode when hit ☺
nemo
parents: 11595
diff changeset
   801
                    else if (LandFlags and lfIce = 0) then
4c813650fe17 make the mine slippery too since it has the ice finish - add a gmDelete to the gear if you want it to *not* explode when hit ☺
nemo
parents: 11595
diff changeset
   802
						 Land[cpY + y, cpX + x]:= lfObject or LandFlags
4c813650fe17 make the mine slippery too since it has the ice finish - add a gmDelete to the gear if you want it to *not* explode when hit ☺
nemo
parents: 11595
diff changeset
   803
					else Land[cpY + y, cpX + x]:= LandFlags
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   804
                    end;
11595
8d1cfedfaf1f fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents: 11594
diff changeset
   805
                if (not behind) or (LandPixels[gY, gX] = 0) then
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   806
                    begin
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   807
                    if tint = $FFFFFFFF then
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   808
                        LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   809
                    else 
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   810
                        begin
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   811
                        pixel:= PLongword(@(p^[x * 4]))^;
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   812
                        LandPixels[gY, gX]:= 
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   813
                           ceil((pixel shr RShift and $FF) * ((tint shr 24) / 255)) shl RShift or
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   814
                           ceil((pixel shr GShift and $FF) * ((tint shr 16 and $ff) / 255)) shl GShift or
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   815
                           ceil((pixel shr BShift and $FF) * ((tint shr  8 and $ff) / 255)) shl BShift or
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   816
                           ceil((pixel shr AShift and $FF) * ((tint and $ff) / 255)) shl AShift;
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   817
                        end
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   818
                    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   819
                end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   820
        p:= PByteArray(@(p^[Image^.pitch]));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   821
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   822
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   823
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
   824
    SDL_UnlockSurface(Image);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   825
10897
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   826
if flipVert then flipSurface(Image, true);
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   827
if flipHoriz then flipSurface(Image, false);
8ea636ce120a Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents: 10878
diff changeset
   828
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   829
x:= Max(cpX, leftX);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   830
w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   831
y:= Max(cpY, topY);
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4367
diff changeset
   832
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
10541
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   833
UpdateLandTexture(x, w, y, h, true);
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   834
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   835
ScriptCall('onSpritePlacement', ord(Obj), cpX + w div 2, cpY + h div 2);
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   836
if Obj = sprAmGirder then
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   837
    ScriptCall('onGirderPlacement', frame, cpX + w div 2, cpY + h div 2)
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   838
else if Obj = sprAmRubber then
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   839
    ScriptCall('onRubberPlacement', frame, cpX + w div 2, cpY + h div 2);
7b74aa1bb58d Lua API:
sheepluva
parents: 10510
diff changeset
   840
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   841
end;
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   842
10903
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   843
procedure EraseLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; LandFlags: Word; eraseOnLFMatch, onlyEraseLF, flipHoriz, flipVert: 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
   844
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   845
    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
   846
    Image: PSDL_Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   847
begin
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   848
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   849
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   850
if checkFails(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true) then exit;
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   851
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   852
Image:= SpritesData[Obj].Surface;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   853
w:= SpritesData[Obj].Width;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   854
h:= SpritesData[Obj].Height;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   855
if flipVert then flipSurface(Image, true);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   856
if flipHoriz then flipSurface(Image, false);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   857
row:= Frame mod numFramesFirstCol;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   858
col:= Frame div numFramesFirstCol;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   859
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   860
if SDL_MustLock(Image) then
11512
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   861
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'EraseLand', true) then exit;
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   862
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   863
bpp:= Image^.format^.BytesPerPixel;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   864
if checkFails(bpp = 4, 'It should be 32 bpp sprite', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   865
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   866
    if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   867
        SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   868
    exit
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   869
end;
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   870
// Check that sprite fits free space
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   871
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   872
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   873
    for y:= 0 to Pred(h) do
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   874
        begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   875
        for x:= 0 to Pred(w) do
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   876
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
   877
                if ((cpY + y) <= topY) or ((cpY + y) >= LAND_HEIGHT) or
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
   878
                   ((cpX + x) <= leftX) or ((cpX + x) >= rightX) then
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   879
                   begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   880
                   if SDL_MustLock(Image) then
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   881
                       SDL_UnlockSurface(Image);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   882
                   exit
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   883
                   end;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   884
        p:= PByteArray(@(p^[Image^.pitch]))
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   885
        end;
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   886
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   887
// Checked, now place
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   888
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]));
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   889
    for y:= 0 to Pred(h) do
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   890
        begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   891
        for x:= 0 to Pred(w) do
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   892
            if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   893
                   begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   894
                if (cReducedQuality and rqBlurryLand) = 0 then
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   895
                    begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   896
                    gX:= cpX + x;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   897
                    gY:= cpY + y;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   898
                    end
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   899
                else
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   900
                    begin
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   901
                    gX:= (cpX + x) div 2;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   902
                    gY:= (cpY + y) div 2;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   903
                    end;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   904
                if (not eraseOnLFMatch or (Land[cpY + y, cpX + x] and LandFlags <> 0)) and
10909
594f59bd1751 Silly fixes for silly pas2c
unc0rr
parents: 10903
diff changeset
   905
                    ((PLongword(@(p^[x * 4]))^) and AMask <> 0) then
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   906
                    begin
10903
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   907
                    if not onlyEraseLF then
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   908
                        begin
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   909
                        LandPixels[gY, gX]:= 0;
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   910
                        Land[cpY + y, cpX + x]:= 0
c9a0cdee4267 tweak erase
nemo
parents: 10901
diff changeset
   911
                        end
10909
594f59bd1751 Silly fixes for silly pas2c
unc0rr
parents: 10903
diff changeset
   912
                    else Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] and (not LandFlags)
10901
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   913
                    end
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   914
                end;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   915
        p:= PByteArray(@(p^[Image^.pitch]));
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   916
        end;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   917
if SDL_MustLock(Image) then
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   918
    SDL_UnlockSurface(Image);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   919
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   920
if flipVert then flipSurface(Image, true);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   921
if flipHoriz then flipSurface(Image, false);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   922
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   923
x:= Max(cpX, leftX);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   924
w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   925
y:= Max(cpY, topY);
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   926
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   927
UpdateLandTexture(x, w, y, h, true)
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   928
end;
fbf6fbe66092 also erase
nemo
parents: 10897
diff changeset
   929
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   930
function GetPlaceCollisionTex(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt): PTexture;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   931
var X, Y, bpp, h, w, row, col, numFramesFirstCol: LongInt;
10677
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   932
    p, pt: PLongWordArray;
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   933
    Image, finalSurface: PSDL_Surface;
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   934
begin
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   935
GetPlaceCollisionTex:= nil;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   936
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   937
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   938
checkFails(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true);
769
788efc1d649f - Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents: 768
diff changeset
   939
Image:= SpritesData[Obj].Surface;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   940
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
   941
h:= SpritesData[Obj].Height;
2235
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   942
row:= Frame mod numFramesFirstCol;
79c9542c1058 multi-column support
nemo
parents: 2167
diff changeset
   943
col:= Frame div numFramesFirstCol;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   944
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   945
if SDL_MustLock(Image) then
11512
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   946
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   947
        exit;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   948
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   949
bpp:= Image^.format^.BytesPerPixel;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   950
checkFails(bpp = 4, 'It should be 32 bpp sprite', true);
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   951
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   952
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   953
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   954
finalSurface:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   955
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   956
checkFails(finalSurface <> nil, 'GetPlaceCollisionTex: fail to create surface', true);
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   957
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   958
if SDL_MustLock(finalSurface) then
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   959
    SDLCheck(SDL_LockSurface(finalSurface) >= 0, 'GetPlaceCollisionTex', true);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   960
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   961
if not allOK then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   962
    begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   963
    if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   964
        SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   965
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   966
    if SDL_MustLock(finalSurface) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   967
        SDL_UnlockSurface(finalSurface);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   968
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   969
    if finalSurface <> nil then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   970
        SDL_FreeSurface(finalSurface);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   971
    end;
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   972
10677
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   973
p:= PLongWordArray(@(PLongWordArray(Image^.pixels)^[ (Image^.pitch div 4) * row * h + col * w ]));
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   974
pt:= PLongWordArray(finalSurface^.pixels);
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   975
10677
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   976
for y:= 0 to Pred(h) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   977
    begin
10677
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   978
    for x:= 0 to Pred(w) do
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   979
        if ((p^[x] and AMask) <> 0)
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
   980
            and (((cpY + y) < topY) or ((cpY + y) >= LAND_HEIGHT) or
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
   981
            ((cpX + x) < leftX) or ((cpX + x) > rightX) or (Land[cpY + y, cpX + x] <> 0)) then
10677
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   982
                pt^[x]:= cWhiteColor
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   983
        else
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   984
            (pt^[x]):= cWhiteColor and (not AMask);
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   985
    p:= PLongWordArray(@(p^[Image^.pitch div 4]));
328f526c95b6 small code tweak
sheepluva
parents: 10674
diff changeset
   986
    pt:= PLongWordArray(@(pt^[finalSurface^.pitch div 4]));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
   987
    end;
520
e83dfb7ffead Teleportation tool
unc0rr
parents: 511
diff changeset
   988
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   989
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
   990
    SDL_UnlockSurface(Image);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   991
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   992
if SDL_MustLock(finalSurface) then
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   993
    SDL_UnlockSurface(finalSurface);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   994
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   995
GetPlaceCollisionTex:= Surface2Tex(finalSurface, true);
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   996
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
   997
SDL_FreeSurface(finalSurface);
409
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   998
end;
4f1841929ccc Construction tool
unc0rr
parents: 393
diff changeset
   999
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10246
diff changeset
  1000
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
  1001
function Despeckle(X, Y: LongInt): boolean;
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
  1002
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
  1003
    pixelsweep: boolean;
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1004
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
  1005
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
  1006
    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
  1007
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
  1008
    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
  1009
    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
  1010
        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
  1011
        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
  1012
    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
  1013
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1014
    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
  1015
        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
  1016
        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
  1017
    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
  1018
11593
7c8fd2f66e9b fix and/or screwup that was causing girders in tunnels to erase the tunnel. also a little bit of indentation/case fixing
nemo
parents: 11537
diff changeset
  1019
    pixelsweep:= (Land[Y, X] <= lfAllObjMask) and ((LandPixels[yy, xx] and AMask) <> 0);
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6982
diff changeset
  1020
    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
  1021
    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
  1022
        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
  1023
        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
  1024
            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
  1025
                if (i <> 0) or (j <> 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1026
                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
  1027
                    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
  1028
                    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
  1029
                    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
  1030
                    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
  1031
                        if pixelsweep then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
  1032
                        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
  1033
                            if ((cReducedQuality and rqBlurryLand) <> 0) then
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
  1034
                            begin
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1035
                                ny:= Y div 2 + i;
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1036
                                nx:= X div 2 + j;
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1037
                                if ((ny and (LAND_HEIGHT_MASK div 2)) = 0) and ((nx and (LAND_WIDTH_MASK div 2)) = 0) then
10600
e28d86fc393e fix despeckle
sheepluva
parents: 10582
diff changeset
  1038
                                    if (LandPixels[ny, nx] and AMASK) <> 0 then
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1039
                                        inc(c);
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1040
                            end
10600
e28d86fc393e fix despeckle
sheepluva
parents: 10582
diff changeset
  1041
                            else if (LandPixels[ny, nx] and AMASK)  <> 0 then
10023
fa9674c94c4f fix despeckle mutilating blurry land
sheepluva
parents: 9998
diff changeset
  1042
                                    inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
  1043
                        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1044
                    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
  1045
                        inc(c);
4695
ac2cb3b99d70 add a disabling for landback, set it if flakes are enabled
nemo
parents: 4690
diff changeset
  1046
                    end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1047
                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
  1048
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
  1049
        if c < 4 then // 0-3 neighbours
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1050
        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
  1051
            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
  1052
                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
  1053
            else
10152
15e9bb6fcab2 fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents: 10138
diff changeset
  1054
                LandPixels[yy, xx]:= LandPixels[yy, xx] and (not AMASK);
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3554
diff changeset
  1055
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
  1056
            if not pixelsweep then
6681
nemo
parents: 6580
diff changeset
  1057
            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
  1058
                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
  1059
                exit
6681
nemo
parents: 6580
diff changeset
  1060
            end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1061
        end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1062
    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
  1063
    Despeckle:= false
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
  1064
end;
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
  1065
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1066
// a bit of AA for explosions
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
  1067
procedure Smooth(X, Y: LongInt);
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1068
var c, r, g, b, a, i: integer;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1069
    nx, ny: LongInt;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1070
    pixel: LongWord;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1071
begin
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1072
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1073
// only AA inwards
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1074
if (Land[Y, X] and lfDamaged) = 0 then
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1075
    exit;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1076
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1077
// check location
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
  1078
if (Y <= topY + 1) or (Y >= LAND_HEIGHT-2)
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
  1079
or (X <= leftX + 1) or (X >= rightX - 1) then
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1080
    exit;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1081
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1082
// counter for neighbor pixels that are not known to be undamaged
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1083
c:= 8;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1084
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1085
// accumalating rgba value of relevant pixels here
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1086
r:= 0;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1087
g:= 0;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1088
b:= 0;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1089
a:= 0;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1090
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1091
// iterate over all neighbor pixels (also itself, will be skipped anyway)
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1092
for nx:= X-1 to X+1 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1093
    for ny:= Y-1 to Y+1 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1094
        // only consider undamaged neighbors (also leads to skipping itself)
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1095
        if (Land[ny, nx] and lfDamaged) = 0 then
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1096
            begin
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1097
            pixel:= LandPixels[ny, nx];
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1098
            inc(r, (pixel and RMask) shr RShift);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1099
            inc(g, (pixel and GMask) shr GShift);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1100
            inc(b, (pixel and BMask) shr BShift);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1101
            inc(a, (pixel and AMask) shr AShift);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1102
            dec(c);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1103
            end;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1104
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1105
// nothing do to if all neighbors damaged
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1106
if c < 1 then
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1107
    exit;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1108
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1109
// use explosion color for damaged pixels
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1110
for i:= 1 to c do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1111
    begin
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1112
    inc(r, ExplosionBorderColorR);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1113
    inc(g, ExplosionBorderColorG);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1114
    inc(b, ExplosionBorderColorB);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1115
    inc(a, 255);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1116
    end;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1117
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1118
// set resulting color value based on average of all neighbors
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1119
r:= r div 8;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1120
g:= g div 8;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1121
b:= b div 8;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1122
a:= a div 8;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1123
LandPixels[y,x]:= (r shl RShift) or (g shl GShift) or (b shl BShift) or (a shl AShift);
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1124
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1125
end;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1126
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1127
procedure Smooth_oldImpl(X, Y: LongInt);
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
  1128
begin
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
  1129
// a bit of AA for explosions
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
  1130
if (Land[Y, X] = 0) and (Y > topY + 1) and
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13572
diff changeset
  1131
    (Y < LAND_HEIGHT-2) and (X > leftX + 1) and (X < rightX - 1) then
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
  1132
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1133
    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
  1134
    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
  1135
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1136
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1137
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1138
            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
  1139
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (128 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1140
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1141
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1142
                                (((((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
  1143
                                (((((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
  1144
                                (((((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
  1145
            end;
10864
9cf20f487ee9 don't modify collision data when applying visual edge smoothing
sheepluva
parents: 10677
diff changeset
  1146
{
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1147
        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
  1148
            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
  1149
        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
  1150
            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
  1151
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1152
            Land[y,x]:= lfBasic;
10864
9cf20f487ee9 don't modify collision data when applying visual edge smoothing
sheepluva
parents: 10677
diff changeset
  1153
}
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
  1154
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1155
    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
  1156
    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
  1157
    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
  1158
    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
  1159
    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
  1160
    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
  1161
    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
  1162
    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
  1163
        begin
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1164
        if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1165
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1166
            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
  1167
                LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (64 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1168
            else
941da059472b Avoid desyncing on blurry land
nemo
parents: 5267
diff changeset
  1169
                LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1170
                                (((((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
  1171
                                (((((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
  1172
                                (((((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
  1173
            end;
10864
9cf20f487ee9 don't modify collision data when applying visual edge smoothing
sheepluva
parents: 10677
diff changeset
  1174
{
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1175
        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
  1176
            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
  1177
        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
  1178
            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
  1179
        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
  1180
            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
  1181
        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
  1182
        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
  1183
        else Land[y,x]:= lfBasic
10864
9cf20f487ee9 don't modify collision data when applying visual edge smoothing
sheepluva
parents: 10677
diff changeset
  1184
}
5261
2db030882bc9 More AA - try smoothing explosions a bit
nemo
parents: 5179
diff changeset
  1185
        end
5267
e9ae019e9bb4 move smoothing into separate function, adjust call order
nemo
parents: 5266
diff changeset
  1186
    end
10490
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10378
diff changeset
  1187
else if ((cReducedQuality and rqBlurryLand) = 0) and ((LandPixels[Y, X] and AMask) = AMask)
8598
9d21bab30893 Apologies if jaree had done something similar, but didn't see anything in repo pull. This removes Land[] mixed w/ LandPixels[] and streamlines things a little
nemo
parents: 8596
diff changeset
  1188
and (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic)
14291
7a7c090f96f6 topY too
nemo
parents: 14287
diff changeset
  1189
and (Y > topY + 1) and (Y < LAND_HEIGHT-2) and (X > leftX + 1) and (X < rightX - 1) then
6130
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
  1190
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1191
    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
  1192
    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
  1193
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
  1194
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1195
                        (((((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
  1196
                        (((((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
  1197
                        (((((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
  1198
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1199
    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
  1200
    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
  1201
    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
  1202
    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
  1203
    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
  1204
    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
  1205
    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
  1206
    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
  1207
        begin
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
  1208
        LandPixels[y,x]:=
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1209
                        (((((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
  1210
                        (((((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
  1211
                        (((((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
  1212
        end
026fd01a5e2c Blend the outter side too
nemo
parents: 6097
diff changeset
  1213
    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
  1214
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
  1215
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
  1216
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
  1217
var x, y, xx, yy, ty, tx: LongInt;
10601
3f4964eeaf01 update land texture /after/ smoothing
sheepluva
parents: 10600
diff changeset
  1218
    bRes, 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
  1219
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
  1220
bRes:= false;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1221
reCheck:= true;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
  1222
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1223
while recheck do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1224
    begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1225
    recheck:= false;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1226
    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
  1227
        begin
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1228
        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
  1229
            begin
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1230
            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
  1231
                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
  1232
                resweep:= true;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
  1233
                ty:= y * 32;
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
  1234
                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
  1235
                while(resweep) do
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1236
                    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
  1237
                    resweep:= false;
3602
99c93fa258d6 Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents: 3601
diff changeset
  1238
                    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
  1239
                        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
  1240
                            if Despeckle(xx, yy) then
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1241
                                begin
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1242
                                bRes:= 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
  1243
                                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
  1244
                                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
  1245
                                    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
  1246
                                    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
  1247
                                    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
  1248
                                    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
  1249
                                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
  1250
                                    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
  1251
                                    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
  1252
                                    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
  1253
                                    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
  1254
                                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
  1255
                                    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
  1256
                                    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
  1257
                                    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
  1258
                                    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
  1259
                                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
  1260
                                    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
  1261
                                    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
  1262
                                    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
  1263
                                    end
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1264
                                end;
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1265
                    end;
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
  1266
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1267
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2741
diff changeset
  1268
        end;
3554
066faceb977d Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents: 3521
diff changeset
  1269
     end;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1761
diff changeset
  1270
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1271
// smooth explosion borders (except if land is blurry)
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1272
if (cReducedQuality and rqBlurryLand) = 0 then
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1273
    for y:= 0 to LAND_HEIGHT div 32 - 1 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1274
        for x:= 0 to LAND_WIDTH div 32 - 1 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1275
            if LandDirty[y, x] <> 0 then
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1276
                begin
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1277
                ty:= y * 32;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1278
                tx:= x * 32;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1279
                for yy:= ty to ty + 31 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1280
                    for xx:= tx to tx + 31 do
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1281
                        Smooth(xx,yy)
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10864
diff changeset
  1282
                end;
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1283
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1284
for y:= 0 to LAND_HEIGHT div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1285
    for x:= 0 to LAND_WIDTH div 32 - 1 do
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1286
        if LandDirty[y, x] <> 0 then
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1287
            begin
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1288
            LandDirty[y, x]:= 0;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1289
            ty:= y * 32;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1290
            tx:= x * 32;
10601
3f4964eeaf01 update land texture /after/ smoothing
sheepluva
parents: 10600
diff changeset
  1291
            UpdateLandTexture(tx, 32, ty, 32, false);
5895
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1292
            end;
212d3b459658 smoothing should be after despeckling
nemo
parents: 5887
diff changeset
  1293
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2666
diff changeset
  1294
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
  1295
end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
  1296
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
  1297
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
  1298
// 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
  1299
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
  1300
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1301
    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
  1302
end;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1303
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6081
diff changeset
  1304
function LandBackPixel(x, y: LongInt): LongWord; inline;
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1305
var p: PLongWordArray;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1306
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1307
    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
  1308
        LandBackPixel:= 0
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1309
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1310
        begin
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1311
        p:= LandBackSurface^.pixels;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1312
        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
  1313
        end
4367
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1314
end;
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1315
f4a0ec067601 uLand isn't that important to them
unc0rr
parents: 4359
diff changeset
  1316
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1317
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1318
var
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1319
  eX, eY, dX, dY: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1320
  i, sX, sY, x, y, d: LongInt;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1321
begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1322
eX:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1323
eY:= 0;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1324
dX:= X2 - X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1325
dY:= Y2 - Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1326
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1327
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
  1328
    sX:= 1
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1329
else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1330
    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
  1331
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1332
        sX:= -1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1333
        dX:= -dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1334
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1335
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1336
        sX:= dX;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1337
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1338
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
  1339
    sY:= 1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1340
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1341
    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
  1342
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1343
        sY:= -1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1344
        dY:= -dY
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1345
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1346
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1347
        sY:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1348
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1349
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
  1350
    d:= dX
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1351
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1352
    d:= dY;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1353
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1354
x:= X1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1355
y:= Y1;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1356
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1357
for i:= 0 to d do
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1358
    begin
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1359
    inc(eX, dX);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1360
    inc(eY, dY);
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1361
    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
  1362
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1363
        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
  1364
        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
  1365
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1366
    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
  1367
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6490
diff changeset
  1368
        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
  1369
        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
  1370
        end;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1371
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1372
    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
  1373
        Land[y, x]:= Color;
6490
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1374
    end
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1375
end;
531bf083e8db - Give uLand more modularity
unc0rr
parents: 6453
diff changeset
  1376
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1377
function DrawDots(x, y, xx, yy: Longint; Color: Longword): Longword; inline;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1378
begin
10246
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
  1379
    DrawDots:= 0;
8da91cd7a32a Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode
unc0rr
parents: 10244
diff changeset
  1380
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1381
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) and (Land[y + yy, x + xx] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1382
        begin inc(DrawDots); Land[y + yy, x + xx]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1383
    if (((x + xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) and (Land[y - yy, x + xx] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1384
        begin inc(DrawDots); Land[y - yy, x + xx]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1385
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y + yy) and LAND_HEIGHT_MASK) = 0) and (Land[y + yy, x - xx] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1386
        begin inc(DrawDots); Land[y + yy, x - xx]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1387
    if (((x - xx) and LAND_WIDTH_MASK) = 0) and (((y - yy) and LAND_HEIGHT_MASK) = 0) and (Land[y - yy, x - xx] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1388
        begin inc(DrawDots); Land[y - yy, x - xx]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1389
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) and (Land[y + xx, x + yy] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1390
        begin inc(DrawDots); Land[y + xx, x + yy]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1391
    if (((x + yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) and (Land[y - xx, x + yy] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1392
        begin inc(DrawDots); Land[y - xx, x + yy]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1393
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y + xx) and LAND_HEIGHT_MASK) = 0) and (Land[y + xx, x - yy] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1394
        begin inc(DrawDots); Land[y + xx, x - yy]:= Color; end;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10490
diff changeset
  1395
    if (((x - yy) and LAND_WIDTH_MASK) = 0) and (((y - xx) and LAND_HEIGHT_MASK) = 0) and (Land[y - xx, x - yy] <> Color) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1396
        begin inc(DrawDots); Land[y - xx, x - yy]:= Color; end;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1397
end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1398
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1399
function DrawLines(X1, Y1, X2, Y2, XX, YY: LongInt; color: Longword): Longword;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1400
var
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1401
  eX, eY, dX, dY: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1402
  i, sX, sY, x, y, d: LongInt;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1403
  f: boolean;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1404
begin
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1405
    eX:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1406
    eY:= 0;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1407
    dX:= X2 - X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1408
    dY:= Y2 - Y1;
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1409
    DrawLines:= 0;
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1410
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1411
    if (dX > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1412
        sX:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1413
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1414
        if (dX < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1415
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1416
            sX:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1417
            dX:= -dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1418
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1419
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1420
            sX:= dX;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1421
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1422
    if (dY > 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1423
        sY:= 1
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1424
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1425
        if (dY < 0) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1426
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1427
            sY:= -1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1428
            dY:= -dY
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1429
            end
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1430
        else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1431
            sY:= dY;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1432
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1433
    if (dX > dY) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1434
        d:= dX
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1435
    else
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1436
        d:= dY;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1437
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1438
    x:= X1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1439
    y:= Y1;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1440
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1441
    for i:= 0 to d do
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1442
        begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1443
        inc(eX, dX);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1444
        inc(eY, dY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1445
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1446
        f:= eX > d;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1447
        if f then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1448
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1449
            dec(eX, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1450
            inc(x, sX);
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1451
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1452
            end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1453
        if (eY > d) then
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1454
            begin
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1455
            dec(eY, d);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1456
            inc(y, sY);
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1457
            f:= true;
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1458
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1459
            end;
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1460
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1461
        if not f then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1462
            inc(DrawLines, DrawDots(x, y, xx, yy, color))
7150
fba3b14ff746 This should make drawn maps rendering even more faster
unc0rr
parents: 7147
diff changeset
  1463
        end
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1464
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1465
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1466
function DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword): Longword;
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1467
var dx, dy, d: LongInt;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1468
begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1469
    DrawThickLine:= 0;
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1470
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1471
    dx:= 0;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1472
    dy:= Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1473
    d:= 3 - 2 * Radius;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1474
    while (dx < dy) do
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1475
        begin
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1476
        inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color));
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1477
        if (d < 0) then
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1478
            d:= d + 4 * dx + 6
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1479
        else
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1480
            begin
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1481
            d:= d + 4 * (dx - dy) + 10;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1482
            dec(dy)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1483
            end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1484
        inc(dx)
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1485
        end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1486
    if (dx = dy) then
10244
f7b5b4b88171 Count number of pixels changed during draw
unc0rr
parents: 10152
diff changeset
  1487
        inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color));
7147
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1488
end;
11b7b12e2b85 Render drawn maps 10-500 times faster
unc0rr
parents: 7035
diff changeset
  1489
7268
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1490
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1491
procedure DumpLandToLog(x, y, r: LongInt);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1492
var xx, yy, dx: LongInt;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1493
    s: shortstring;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1494
begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1495
    s[0]:= char(r * 2 + 1);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1496
    for yy:= y - r to y + r do
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1497
        begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1498
        for dx:= 0 to r*2 do
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1499
            begin
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1500
            xx:= dx - r + x;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1501
            if (xx = x) and (yy = y) then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1502
                s[dx + 1]:= 'X'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1503
            else if Land[yy, xx] > 255 then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1504
                s[dx + 1]:= 'O'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1505
            else if Land[yy, xx] > 0 then
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1506
                s[dx + 1]:= '*'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1507
            else
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1508
                s[dx + 1]:= '.'
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1509
            end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1510
        AddFileLog('Land dump: ' + s);
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1511
        end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1512
end;
3a61c53346a8 - Fix cake bug introduced in r2ccfc93c6b5e
unc0rr
parents: 7170
diff changeset
  1513
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 109
diff changeset
  1514
end.