author | Wuzzy <almikes@aol.com> |
Sat, 09 Apr 2016 11:15:14 +0200 | |
changeset 12012 | ad7205e66578 |
parent 11595 | 8d1cfedfaf1f |
child 13410 | 4c813650fe17 |
permissions | -rw-r--r-- |
393 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
393 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
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 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
184 | 21 |
unit uLandGraphics; |
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 | 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 | 28 |
type TRangeArray = array[0..31] of record |
371 | 29 |
Left, Right: LongInt; |
184 | 30 |
end; |
7035 | 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 | 33 |
|
4791 | 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 | 39 |
function DrawExplosion(X, Y, Radius: LongInt): Longword; |
371 | 40 |
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte); |
41 |
procedure DrawTunnel(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt); |
|
10244 | 42 |
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword; |
9876 | 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 | 45 |
function LandBackPixel(x, y: LongInt): LongWord; |
6490 | 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 | 48 |
procedure DumpLandToLog(x, y, r: LongInt); |
8602 | 49 |
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint); |
10295 | 50 |
function TryPlaceOnLandSimple(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline; |
10296 | 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 | 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 | 56 |
|
184 | 57 |
implementation |
10541 | 58 |
uses SDLh, uLandTexture, uTextures, uVariables, uUtils, uDebug, uScript; |
184 | 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 | 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 | 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 | 92 |
if (Land[landY, landX] and lfIndestructible = 0) and |
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 | 96 |
Land[landY, landX]:= (Land[landY, landX] or lfDamaged) and (not lfIce); |
8795 | 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 | 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 | 103 |
isLandscapeEdge := (weight < 8) and (weight >= 2); |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
104 |
end; |
8795 | 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 | 108 |
i, j, r: Longint; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
109 |
begin |
8841 | 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 | 118 |
exit(9); |
119 |
||
8839 | 120 |
if Land[j, i] and lfLandMask and (not lfIce) = 0 then |
8841 | 121 |
inc(r) |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
122 |
end; |
8841 | 123 |
|
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 | 150 |
else |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
151 |
begin |
8839 | 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 | 155 |
if LandPixels[pixelY, pixelX] and AMask shr AShift = 255 then |
8839 | 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; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
164 |
if isLandscapeEdge(getPixelWeight(landX, landY)) then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
165 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
166 |
if (LandPixels[pixelY, pixelX] and AMask < 255) and (LandPixels[pixelY, pixelX] and AMask > 0) then |
8839 | 167 |
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
|
168 |
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
|
169 |
LandPixels[pixelY, pixelX] := IceEdgeColor |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
170 |
end |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
171 |
else if Land[landY, landX] > 255 then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
172 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
173 |
fillPixelFromIceSprite(pixelX, pixelY); |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
174 |
end; |
8839 | 175 |
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
|
176 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
177 |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
178 |
|
9876 | 179 |
function FillLandCircleLineFT(y, fromPix, toPix: LongInt; fill : fillType): Longword; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
180 |
var px, py, i: LongInt; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
181 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
182 |
//get rid of compiler warning |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
183 |
px := 0; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
184 |
py := 0; |
9876 | 185 |
FillLandCircleLineFT := 0; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
186 |
case fill of |
8795 | 187 |
backgroundPixel: |
9877 | 188 |
for i:= fromPix to toPix do |
189 |
begin |
|
190 |
calculatePixelsCoordinates(i, y, px, py); |
|
191 |
inc(FillLandCircleLineFT, drawPixelBG(i, y, px, py)); |
|
192 |
end; |
|
8795 | 193 |
ebcPixel: |
9877 | 194 |
for i:= fromPix to toPix do |
195 |
begin |
|
196 |
calculatePixelsCoordinates(i, y, px, py); |
|
197 |
drawPixelEBC(i, y, px, py); |
|
198 |
end; |
|
8795 | 199 |
nullPixel: |
9877 | 200 |
for i:= fromPix to toPix do |
201 |
begin |
|
202 |
calculatePixelsCoordinates(i, y, px, py); |
|
203 |
if ((Land[y, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[y, i] > 255)) then |
|
10878 | 204 |
LandPixels[py, px]:= ExplosionBorderColorNoA; |
9877 | 205 |
end; |
8795 | 206 |
icePixel: |
9877 | 207 |
for i:= fromPix to toPix do |
208 |
begin |
|
209 |
calculatePixelsCoordinates(i, y, px, py); |
|
210 |
DrawPixelIce(i, y, px, py); |
|
211 |
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
|
212 |
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
|
213 |
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
|
214 |
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
|
215 |
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
|
216 |
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
|
217 |
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
|
218 |
removeNotHHObj: |
9877 | 219 |
for i:= fromPix to toPix do |
220 |
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
|
221 |
if Land[y, i] and lfNotHHObjMask <> 0 then |
11595
8d1cfedfaf1f
fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents:
11594
diff
changeset
|
222 |
Land[y, i]:= (Land[y, i] and (not lfNotHHObjMask)) or ((Land[y, i] and lfNotHHObjMask shr lfNotHHObjShift - 1) shl lfNotHHObjShift); |
9877 | 223 |
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
|
224 |
addHH: |
9877 | 225 |
for i:= fromPix to toPix do |
226 |
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
|
227 |
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
|
228 |
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
|
229 |
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
|
230 |
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
|
231 |
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
|
232 |
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
|
233 |
if Land[y, i] and lfHHMask > 0 then |
9878 | 234 |
Land[y, i]:= Land[y, i] - 1; |
9877 | 235 |
end; |
8795 | 236 |
setCurrentHog: |
9877 | 237 |
for i:= fromPix to toPix do |
238 |
begin |
|
239 |
Land[y, i]:= Land[y, i] or lfCurrentHog |
|
240 |
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
|
241 |
removeCurrentHog: |
9877 | 242 |
for i:= fromPix to toPix do |
243 |
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
|
244 |
Land[y, i]:= Land[y, i] and lfNotCurrentMask; |
9877 | 245 |
end; |
8795 | 246 |
end; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
247 |
end; |
8795 | 248 |
|
9876 | 249 |
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
|
250 |
begin |
9876 | 251 |
FillLandCircleSegmentFT := 0; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
252 |
if ((y + dy) and LAND_HEIGHT_MASK) = 0 then |
9876 | 253 |
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
|
254 |
if ((y - dy) and LAND_HEIGHT_MASK) = 0 then |
9876 | 255 |
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
|
256 |
if ((y + dx) and LAND_HEIGHT_MASK) = 0 then |
9876 | 257 |
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
|
258 |
if ((y - dx) and LAND_HEIGHT_MASK) = 0 then |
9876 | 259 |
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
|
260 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
261 |
|
9876 | 262 |
function FillRoundInLandFT(X, Y, Radius: LongInt; fill: fillType): Longword; inline; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
263 |
var dx, dy, d: LongInt; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
264 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
265 |
dx:= 0; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
266 |
dy:= Radius; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
267 |
d:= 3 - 2 * Radius; |
9876 | 268 |
FillRoundInLandFT := 0; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
269 |
while (dx < dy) do |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
270 |
begin |
9876 | 271 |
inc(FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill)); |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
272 |
if (d < 0) then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
273 |
d:= d + 4 * dx + 6 |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
274 |
else |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
275 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
276 |
d:= d + 4 * (dx - dy) + 10; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
277 |
dec(dy) |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
278 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
279 |
inc(dx) |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
280 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
281 |
if (dx = dy) then |
9876 | 282 |
inc (FillRoundInLandFT, FillLandCircleSegmentFT(x, y, dx, dy, fill)); |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
283 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
284 |
|
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
285 |
|
4791 | 286 |
function addBgColor(OldColor, NewColor: LongWord): LongWord; |
287 |
// Factor ranges from 0 to 100% NewColor |
|
288 |
var |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
289 |
oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: byte; |
4791 | 290 |
begin |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
291 |
oAlpha := (OldColor shr AShift); |
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
292 |
nAlpha := (NewColor shr AShift); |
5692 | 293 |
// shortcircuit |
294 |
if (oAlpha = 0) or (nAlpha = $FF) then |
|
295 |
begin |
|
296 |
addBgColor:= NewColor; |
|
297 |
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
|
298 |
end; |
4791 | 299 |
// Get colors |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
300 |
oRed := (OldColor shr RShift); |
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
301 |
oGreen := (OldColor shr GShift); |
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
302 |
oBlue := (OldColor shr BShift); |
4791 | 303 |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
304 |
nRed := (NewColor shr RShift); |
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
305 |
nGreen := (NewColor shr GShift); |
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
306 |
nBlue := (NewColor shr BShift); |
4791 | 307 |
|
308 |
// Mix colors |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5895
diff
changeset
|
309 |
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
|
310 |
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
|
311 |
nBlue := min(255,((nBlue*nAlpha) div 255) + ((oBlue*oAlpha*byte(255-nAlpha)) div 65025)); |
4791 | 312 |
nAlpha := min(255, oAlpha + nAlpha); |
313 |
||
5041 | 314 |
addBgColor := (nAlpha shl AShift) or (nRed shl RShift) or (nGreen shl GShift) or (nBlue shl BShift); |
4791 | 315 |
end; |
316 |
||
10244 | 317 |
function FillCircleLines(x, y, dx, dy: LongInt; Value: Longword): Longword; |
371 | 318 |
var i: LongInt; |
184 | 319 |
begin |
10244 | 320 |
FillCircleLines:= 0; |
321 |
||
322 |
if ((y + dy) and LAND_HEIGHT_MASK) = 0 then |
|
323 |
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do |
|
324 |
if (Land[y + dy, i] and lfIndestructible) = 0 then |
|
325 |
begin |
|
326 |
if Land[y + dy, i] <> Value then inc(FillCircleLines); |
|
327 |
Land[y + dy, i]:= Value; |
|
328 |
end; |
|
329 |
if ((y - dy) and LAND_HEIGHT_MASK) = 0 then |
|
330 |
for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do |
|
331 |
if (Land[y - dy, i] and lfIndestructible) = 0 then |
|
332 |
begin |
|
333 |
if Land[y - dy, i] <> Value then inc(FillCircleLines); |
|
334 |
Land[y - dy, i]:= Value; |
|
335 |
end; |
|
336 |
if ((y + dx) and LAND_HEIGHT_MASK) = 0 then |
|
337 |
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do |
|
338 |
if (Land[y + dx, i] and lfIndestructible) = 0 then |
|
339 |
begin |
|
340 |
if Land[y + dx, i] <> Value then inc(FillCircleLines); |
|
341 |
Land[y + dx, i]:= Value; |
|
342 |
end; |
|
343 |
if ((y - dx) and LAND_HEIGHT_MASK) = 0 then |
|
344 |
for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do |
|
345 |
if (Land[y - dx, i] and lfIndestructible) = 0 then |
|
346 |
begin |
|
347 |
if Land[y - dx, i] <> Value then inc(FillCircleLines); |
|
348 |
Land[y - dx, i]:= Value; |
|
349 |
end; |
|
184 | 350 |
end; |
351 |
||
10244 | 352 |
function FillRoundInLand(X, Y, Radius: LongInt; Value: Longword): Longword; |
371 | 353 |
var dx, dy, d: LongInt; |
184 | 354 |
begin |
10244 | 355 |
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
|
356 |
dx:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
357 |
dy:= Radius; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
358 |
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
|
359 |
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
|
360 |
begin |
10244 | 361 |
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
|
362 |
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
|
363 |
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
|
364 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
365 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
366 |
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
|
367 |
dec(dy) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
368 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
369 |
inc(dx) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
370 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
371 |
if (dx = dy) then |
10244 | 372 |
inc(FillRoundInLand, FillCircleLines(x, y, dx, dy, Value)); |
184 | 373 |
end; |
374 |
||
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
|
375 |
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
|
376 |
begin |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
377 |
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
|
378 |
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
|
379 |
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
|
380 |
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
|
381 |
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
|
382 |
FillRoundInLandFT(X, Y, Radius, removeNotHHObj) |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
383 |
else if doSet and IsCurrent then |
9876 | 384 |
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
|
385 |
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
|
386 |
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
|
387 |
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
|
388 |
FillRoundInLandFT(X, Y, Radius, addNotHHObj); |
8583 | 389 |
end; |
390 |
||
8602 | 391 |
procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint); |
392 |
var |
|
10582 | 393 |
i, j, iceL, iceR, IceT, iceB: LongInt; |
8602 | 394 |
landRect: TSDL_Rect; |
395 |
begin |
|
10582 | 396 |
// figure out bottom/left/right/top coords of ice to draw |
397 |
||
398 |
// determine absolute limits first |
|
399 |
iceT:= 0; |
|
400 |
iceB:= min(cWaterLine, LAND_HEIGHT - 1); |
|
401 |
||
402 |
iceL:= 0; |
|
403 |
iceR:= LAND_WIDTH - 1; |
|
404 |
||
405 |
if WorldEdge <> weNone then |
|
406 |
begin |
|
407 |
iceL:= max(leftX, iceL); |
|
408 |
iceR:= min(rightX, iceR); |
|
409 |
end; |
|
410 |
||
411 |
// adjust based on location but without violating absolute limits |
|
412 |
if y >= cWaterLine then |
|
8602 | 413 |
begin |
10582 | 414 |
iceL:= max(x - iceRadius, iceL); |
415 |
iceR:= min(x + iceRadius, iceR); |
|
416 |
iceT:= max(cWaterLine - iceHeight, iceT); |
|
417 |
end |
|
418 |
else {if WorldEdge = weSea then} |
|
419 |
begin |
|
420 |
iceT:= max(y - iceRadius, iceT); |
|
421 |
iceB:= min(y + iceRadius, iceB); |
|
422 |
if x <= leftX then |
|
423 |
iceR:= min(leftX + iceHeight, iceR) |
|
424 |
else {if x >= rightX then} |
|
425 |
iceL:= max(LongInt(rightX) - iceHeight, iceL); |
|
426 |
end; |
|
427 |
||
428 |
// don't continue if all ice is outside land array |
|
429 |
if (iceL > iceR) or (iceT > iceB) then |
|
430 |
exit(); |
|
431 |
||
432 |
for i := iceL to iceR do |
|
433 |
begin |
|
434 |
for j := iceT to iceB do |
|
8602 | 435 |
begin |
8624 | 436 |
if Land[j, i] = 0 then |
8602 | 437 |
begin |
8795 | 438 |
Land[j, i] := lfIce; |
10099
67b7bc539639
fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents:
10040
diff
changeset
|
439 |
if (cReducedQuality and rqBlurryLand) = 0 then |
67b7bc539639
fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents:
10040
diff
changeset
|
440 |
fillPixelFromIceSprite(i, j) |
67b7bc539639
fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents:
10040
diff
changeset
|
441 |
else |
67b7bc539639
fix for Issue 777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)
sheepluva
parents:
10040
diff
changeset
|
442 |
fillPixelFromIceSprite(i div 2, j div 2); |
8602 | 443 |
end; |
8795 | 444 |
end; |
8602 | 445 |
end; |
10582 | 446 |
|
447 |
landRect.x := iceL; |
|
448 |
landRect.y := iceT; |
|
449 |
landRect.w := iceR - IceL + 1; |
|
450 |
landRect.h := iceB - iceT + 1; |
|
451 |
||
8795 | 452 |
UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true); |
8602 | 453 |
end; |
454 |
||
3689 | 455 |
function DrawExplosion(X, Y, Radius: LongInt): Longword; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
456 |
var |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
457 |
tx, ty, dx, dy: Longint; |
184 | 458 |
begin |
9876 | 459 |
DrawExplosion := FillRoundInLandFT(x, y, Radius, backgroundPixel); |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
460 |
if Radius > 20 then |
9876 | 461 |
FillRoundInLandFT(x, y, Radius - 15, nullPixel); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
462 |
FillRoundInLand(X, Y, Radius, 0); |
9876 | 463 |
FillRoundInLandFT(x, y, Radius + 4, ebcPixel); |
8828 | 464 |
tx:= Max(X - Radius - 5, 0); |
465 |
dx:= Min(X + Radius + 5, LAND_WIDTH) - tx; |
|
466 |
ty:= Max(Y - Radius - 5, 0); |
|
467 |
dy:= Min(Y + Radius + 5, LAND_HEIGHT) - ty; |
|
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
468 |
UpdateLandTexture(tx, dx, ty, dy, false); |
184 | 469 |
end; |
470 |
||
371 | 471 |
procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte); |
5480 | 472 |
var tx, ty, by, bx, i: LongInt; |
184 | 473 |
begin |
474 |
for i:= 0 to Pred(Count) do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
475 |
begin |
7509 | 476 |
for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do |
477 |
for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do |
|
5480 | 478 |
begin |
6096
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
479 |
if (Land[ty, tx] and lfIndestructible) = 0 then |
5480 | 480 |
begin |
6096
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
481 |
if (cReducedQuality and rqBlurryLand) = 0 then |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
482 |
begin |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
483 |
by:= ty; bx:= tx; |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
484 |
end |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
485 |
else |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
486 |
begin |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
487 |
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
|
488 |
end; |
6355 | 489 |
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
|
490 |
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
|
491 |
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
|
492 |
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
|
493 |
end |
5480 | 494 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
495 |
inc(y, dY) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
496 |
end; |
184 | 497 |
|
498 |
inc(Radius, 4); |
|
351 | 499 |
dec(y, Count * dY); |
184 | 500 |
|
501 |
for i:= 0 to Pred(Count) do |
|
502 |
begin |
|
7509 | 503 |
for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do |
504 |
for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do |
|
4690
490cf71b436a
revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents:
4688
diff
changeset
|
505 |
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
|
506 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
507 |
if (cReducedQuality and rqBlurryLand) = 0 then |
6982 | 508 |
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
|
509 |
else |
6982 | 510 |
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
|
511 |
|
8839 | 512 |
Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce); |
3596 | 513 |
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
|
514 |
end; |
184 | 515 |
inc(y, dY) |
516 |
end; |
|
517 |
||
818 | 518 |
|
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
|
519 |
UpdateLandTexture(0, LAND_WIDTH, 0, LAND_HEIGHT, false) |
184 | 520 |
end; |
521 |
||
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
522 |
|
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 |
procedure DrawExplosionBorder(X, Y, dx, dy:hwFloat; despeckle : Boolean); |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
525 |
var |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
526 |
t, tx, ty :Longint; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
527 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
528 |
for t:= 0 to 7 do |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
529 |
begin |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
530 |
X:= X + dX; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
531 |
Y:= Y + dY; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
532 |
tx:= hwRound(X); |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
533 |
ty:= hwRound(Y); |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
534 |
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
|
535 |
or ((Land[ty, tx] and lfObject) <> 0)) then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
536 |
begin |
8839 | 537 |
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
|
538 |
if despeckle then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
539 |
LandDirty[ty div 32, tx div 32]:= 1; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
540 |
if (cReducedQuality and rqBlurryLand) = 0 then |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
541 |
LandPixels[ty, tx]:= ExplosionBorderColor |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
542 |
else |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
543 |
LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
544 |
end |
8795 | 545 |
end; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
546 |
end; |
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
547 |
|
10674
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
548 |
type TWrapNeeded = (wnNone, wnLeft, wnRight); |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
549 |
|
184 | 550 |
// |
551 |
// - (dX, dY) - direction, vector of length = 0.5 |
|
552 |
// |
|
10674
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
553 |
function DrawTunnel_real(X, Y, dX, dY: hwFloat; ticks, HalfWidth: LongInt): TWrapNeeded; |
358 | 554 |
var nx, ny, dX8, dY8: hwFloat; |
5480 | 555 |
i, t, tx, ty, by, bx, stX, stY, ddy, ddx: Longint; |
5332 | 556 |
despeckle : Boolean; |
184 | 557 |
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
|
558 |
DrawTunnel_real:= wnNone; |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
559 |
|
772
e8d530ca77be
Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents:
769
diff
changeset
|
560 |
stY:= hwRound(Y); |
1809 | 561 |
stX:= hwRound(X); |
772
e8d530ca77be
Don't update all land texture when drawing tunnel (saves video throughput)
unc0rr
parents:
769
diff
changeset
|
562 |
|
5332 | 563 |
despeckle:= HalfWidth > 1; |
564 |
||
184 | 565 |
nx:= X + dY * (HalfWidth + 8); |
566 |
ny:= Y - dX * (HalfWidth + 8); |
|
567 |
||
358 | 568 |
dX8:= dX * 8; |
569 |
dY8:= dY * 8; |
|
184 | 570 |
for i:= 0 to 7 do |
571 |
begin |
|
358 | 572 |
X:= nx - dX8; |
573 |
Y:= ny - dY8; |
|
184 | 574 |
for t:= -8 to ticks + 8 do |
2666 | 575 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
576 |
X:= X + dX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
577 |
Y:= Y + dY; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
578 |
tx:= hwRound(X); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
579 |
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
|
580 |
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
|
581 |
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
|
582 |
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
|
583 |
begin |
8839 | 584 |
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
|
585 |
if despeckle then |
5887 | 586 |
begin |
587 |
Land[ty, tx]:= Land[ty, tx] or lfDamaged; |
|
588 |
LandDirty[ty div 32, tx div 32]:= 1 |
|
589 |
end; |
|
5332 | 590 |
if (cReducedQuality and rqBlurryLand) = 0 then |
6982 | 591 |
LandPixels[ty, tx]:= ExplosionBorderColor |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
592 |
else |
6982 | 593 |
LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor |
3509
d72c2219595d
Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents:
3236
diff
changeset
|
594 |
end |
2666 | 595 |
end; |
184 | 596 |
nx:= nx - dY; |
597 |
ny:= ny + dX; |
|
598 |
end; |
|
599 |
||
600 |
for i:= -HalfWidth to HalfWidth do |
|
601 |
begin |
|
358 | 602 |
X:= nx - dX8; |
603 |
Y:= ny - dY8; |
|
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
604 |
DrawExplosionBorder(X, Y, dx, dy, despeckle); |
184 | 605 |
X:= nx; |
606 |
Y:= ny; |
|
607 |
for t:= 0 to ticks do |
|
608 |
begin |
|
609 |
X:= X + dX; |
|
610 |
Y:= Y + dY; |
|
351 | 611 |
tx:= hwRound(X); |
612 |
ty:= hwRound(Y); |
|
3519 | 613 |
if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and ((Land[ty, tx] and lfIndestructible) = 0) then |
2647 | 614 |
begin |
5480 | 615 |
if (cReducedQuality and rqBlurryLand) = 0 then |
616 |
begin |
|
617 |
by:= ty; bx:= tx; |
|
618 |
end |
|
4690
490cf71b436a
revert last change. ordinary fire is fine, but HHG screws up.
nemo
parents:
4688
diff
changeset
|
619 |
else |
5480 | 620 |
begin |
621 |
by:= ty div 2; bx:= tx div 2; |
|
622 |
end; |
|
6355 | 623 |
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
|
624 |
LandPixels[by, bx]:= LandBackPixel(tx, ty) |
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
625 |
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
|
626 |
LandPixels[by, bx]:= LandPixels[by, bx] and (not AMASK); |
6097 | 627 |
Land[ty, tx]:= 0; |
2647 | 628 |
end |
184 | 629 |
end; |
8783
f1231a48fc48
Remove some duplicating code from uLandGraphics.pas
Urbertar
parents:
8773
diff
changeset
|
630 |
DrawExplosionBorder(X, Y, dx, dy, despeckle); |
184 | 631 |
nx:= nx - dY; |
632 |
ny:= ny + dX; |
|
633 |
end; |
|
634 |
||
635 |
for i:= 0 to 7 do |
|
636 |
begin |
|
358 | 637 |
X:= nx - dX8; |
638 |
Y:= ny - dY8; |
|
184 | 639 |
for t:= -8 to ticks + 8 do |
2666 | 640 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
641 |
X:= X + dX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
642 |
Y:= Y + dY; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
643 |
tx:= hwRound(X); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
644 |
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
|
645 |
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
|
646 |
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
|
647 |
begin |
8839 | 648 |
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
|
649 |
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
|
650 |
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
|
651 |
if (cReducedQuality and rqBlurryLand) = 0 then |
6982 | 652 |
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
|
653 |
else |
6982 | 654 |
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
|
655 |
end |
2666 | 656 |
end; |
184 | 657 |
nx:= nx - dY; |
658 |
ny:= ny + dX; |
|
659 |
end; |
|
660 |
||
10674
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
661 |
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
|
662 |
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
|
663 |
|
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
664 |
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
|
665 |
begin |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
666 |
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
|
667 |
DrawTunnel_real:= wnLeft |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
668 |
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
|
669 |
DrawTunnel_real:= wnRight; |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
670 |
end; |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
671 |
|
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
672 |
tx:= Max(tx, 0); |
4374 | 673 |
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
|
674 |
ddx:= Min(ddx, LAND_WIDTH) - tx; |
4374 | 675 |
ddy:= Min(stY + HalfWidth * 2 + 4 + abs(hwRound(dY * ticks)), LAND_HEIGHT) - ty; |
1809 | 676 |
|
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
|
677 |
UpdateLandTexture(tx, ddx, ty, ddy, false) |
184 | 678 |
end; |
679 |
||
10674
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
680 |
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
|
681 |
var wn: TWrapNeeded; |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
682 |
begin |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
683 |
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
|
684 |
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
|
685 |
begin |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
686 |
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
|
687 |
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
|
688 |
else |
fddbab2eecea
Issue 852: Using blowtorch to dig through the wrap-around border in caves fails miserably
sheepluva
parents:
10601
diff
changeset
|
689 |
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
|
690 |
end; |
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 |
|
10295 | 693 |
function TryPlaceOnLandSimple(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace, indestructible: boolean): boolean; inline; |
10296 | 694 |
var lf: Word; |
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9460
diff
changeset
|
695 |
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
|
696 |
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
|
697 |
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
|
698 |
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
|
699 |
lf:= 0; |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
700 |
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
|
701 |
end; |
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9460
diff
changeset
|
702 |
|
10296 | 703 |
function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean; LandFlags: Word): boolean; inline; |
10253 | 704 |
begin |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
705 |
TryPlaceOnLand:= TryPlaceOnLand(cpX, cpY, Obj, Frame, doPlace, false, false, false, false, false, LandFlags, $FFFFFFFF); |
10253 | 706 |
end; |
707 |
||
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
708 |
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
|
709 |
begin |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
710 |
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
|
711 |
end; |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
712 |
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
|
713 |
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt; |
409 | 714 |
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
|
715 |
Image: PSDL_Surface; |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
716 |
pixel: LongWord; |
409 | 717 |
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
|
718 |
TryPlaceOnLand:= false; |
2235 | 719 |
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height; |
720 |
||
10253 | 721 |
if outOfMap then doPlace:= false; // just using for a check |
722 |
||
11537 | 723 |
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
|
724 |
|
769
788efc1d649f
- Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents:
768
diff
changeset
|
725 |
Image:= SpritesData[Obj].Surface; |
409 | 726 |
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
|
727 |
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
|
728 |
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
|
729 |
if flipHoriz then flipSurface(Image, false); |
2235 | 730 |
row:= Frame mod numFramesFirstCol; |
731 |
col:= Frame div numFramesFirstCol; |
|
409 | 732 |
|
733 |
if SDL_MustLock(Image) then |
|
11512 | 734 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'TryPlaceOnLand', true) then exit; |
409 | 735 |
|
736 |
bpp:= Image^.format^.BytesPerPixel; |
|
11537 | 737 |
if checkFails(bpp = 4, 'It should be 32 bpp sprite', true) then |
738 |
begin |
|
739 |
if SDL_MustLock(Image) then |
|
740 |
SDL_UnlockSurface(Image); |
|
741 |
exit |
|
742 |
end; |
|
769
788efc1d649f
- Save 8 MB of memory by freeing LandSurface and not using it anymore after game initialization
unc0rr
parents:
768
diff
changeset
|
743 |
// Check that sprite fits free space |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
744 |
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ])); |
409 | 745 |
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
|
746 |
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
|
747 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
748 |
for x:= 0 to Pred(w) do |
10138
1a71d28392cb
Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents:
10131
diff
changeset
|
749 |
if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then |
10510 | 750 |
if (outOfMap and |
10368
7ebb71a36e95
Forced sprites placing mode, exposed to scripts (not tested at all)
unc0rr
parents:
10296
diff
changeset
|
751 |
((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
|
752 |
((cpX + x) < LAND_WIDTH) and ((cpX + x) >= 0) and |
10374 | 753 |
((not force) and (Land[cpY + y, cpX + x] <> 0))) or |
10253 | 754 |
|
755 |
(not outOfMap and |
|
756 |
(((cpY + y) <= Longint(topY)) or ((cpY + y) >= LAND_HEIGHT) or |
|
10510 | 757 |
((cpX + x) <= Longint(leftX)) or ((cpX + x) >= Longint(rightX)) or |
10374 | 758 |
((not force) and (Land[cpY + y, cpX + x] <> 0)))) then |
10253 | 759 |
begin |
760 |
if SDL_MustLock(Image) then |
|
761 |
SDL_UnlockSurface(Image); |
|
762 |
exit |
|
763 |
end; |
|
10901 | 764 |
p:= PByteArray(@(p^[Image^.pitch])) |
765 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
766 |
end; |
409 | 767 |
|
520 | 768 |
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
|
769 |
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
|
770 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
771 |
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
|
772 |
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
|
773 |
exit |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
774 |
end; |
520 | 775 |
|
409 | 776 |
// Checked, now place |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
777 |
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ])); |
409 | 778 |
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
|
779 |
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
|
780 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
781 |
for x:= 0 to Pred(w) do |
10138
1a71d28392cb
Only check alpha channel like BlitImageAndGenerateCollisionInfo does
unc0rr
parents:
10131
diff
changeset
|
782 |
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
|
783 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
784 |
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
|
785 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
786 |
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
|
787 |
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
|
788 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
789 |
else |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
790 |
begin |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
791 |
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
|
792 |
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
|
793 |
end; |
11595
8d1cfedfaf1f
fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents:
11594
diff
changeset
|
794 |
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
|
795 |
begin |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
796 |
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
|
797 |
((LandPixels[gY, gX] and AMask shr AShift > 128) and // This test assumes lfBasic and lfObject differ only graphically |
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 |
(LandFlags and lfObject = 0)) then |
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
799 |
Land[cpY + y, cpX + x]:= lfBasic or LandFlags |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
800 |
else Land[cpY + y, cpX + x]:= lfObject or LandFlags |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
801 |
end; |
11595
8d1cfedfaf1f
fix pas2c breakage caused by recent changes in uLandGraphics
sheepluva
parents:
11594
diff
changeset
|
802 |
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
|
803 |
begin |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
804 |
if tint = $FFFFFFFF then |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
805 |
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
|
806 |
else |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
807 |
begin |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
808 |
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
|
809 |
LandPixels[gY, gX]:= |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
810 |
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
|
811 |
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
|
812 |
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
|
813 |
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
|
814 |
end |
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
815 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
816 |
end; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
817 |
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
|
818 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
819 |
end; |
409 | 820 |
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
|
821 |
SDL_UnlockSurface(Image); |
409 | 822 |
|
10897
8ea636ce120a
Add options to set colouring, behind existing land, and horizontal/vertical flipping to PlaceSprite
nemo
parents:
10878
diff
changeset
|
823 |
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
|
824 |
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
|
825 |
|
4374 | 826 |
x:= Max(cpX, leftX); |
827 |
w:= Min(cpX + Image^.w, LAND_WIDTH) - x; |
|
828 |
y:= Max(cpY, topY); |
|
829 |
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y; |
|
10541 | 830 |
UpdateLandTexture(x, w, y, h, true); |
831 |
||
832 |
ScriptCall('onSpritePlacement', ord(Obj), cpX + w div 2, cpY + h div 2); |
|
833 |
if Obj = sprAmGirder then |
|
834 |
ScriptCall('onGirderPlacement', frame, cpX + w div 2, cpY + h div 2) |
|
835 |
else if Obj = sprAmRubber then |
|
836 |
ScriptCall('onRubberPlacement', frame, cpX + w div 2, cpY + h div 2); |
|
837 |
||
409 | 838 |
end; |
839 |
||
10903 | 840 |
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
|
841 |
var X, Y, bpp, h, w, row, col, gx, gy, numFramesFirstCol: LongInt; |
409 | 842 |
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
|
843 |
Image: PSDL_Surface; |
409 | 844 |
begin |
10901 | 845 |
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height; |
846 |
||
11537 | 847 |
if checkFails(SpritesData[Obj].Surface <> nil, 'Assert SpritesData[Obj].Surface failed', true) then exit; |
10901 | 848 |
|
849 |
Image:= SpritesData[Obj].Surface; |
|
850 |
w:= SpritesData[Obj].Width; |
|
851 |
h:= SpritesData[Obj].Height; |
|
852 |
if flipVert then flipSurface(Image, true); |
|
853 |
if flipHoriz then flipSurface(Image, false); |
|
854 |
row:= Frame mod numFramesFirstCol; |
|
855 |
col:= Frame div numFramesFirstCol; |
|
856 |
||
857 |
if SDL_MustLock(Image) then |
|
11512 | 858 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'EraseLand', true) then exit; |
10901 | 859 |
|
860 |
bpp:= Image^.format^.BytesPerPixel; |
|
11537 | 861 |
if checkFails(bpp = 4, 'It should be 32 bpp sprite', true) then |
862 |
begin |
|
863 |
if SDL_MustLock(Image) then |
|
864 |
SDL_UnlockSurface(Image); |
|
865 |
exit |
|
866 |
end; |
|
10901 | 867 |
// Check that sprite fits free space |
868 |
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ])); |
|
11537 | 869 |
|
870 |
for y:= 0 to Pred(h) do |
|
10901 | 871 |
begin |
872 |
for x:= 0 to Pred(w) do |
|
873 |
if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then |
|
874 |
if ((cpY + y) <= Longint(topY)) or ((cpY + y) >= LAND_HEIGHT) or |
|
875 |
((cpX + x) <= Longint(leftX)) or ((cpX + x) >= Longint(rightX)) then |
|
876 |
begin |
|
877 |
if SDL_MustLock(Image) then |
|
878 |
SDL_UnlockSurface(Image); |
|
879 |
exit |
|
880 |
end; |
|
881 |
p:= PByteArray(@(p^[Image^.pitch])) |
|
11537 | 882 |
end; |
10901 | 883 |
|
884 |
// Checked, now place |
|
885 |
p:= PByteArray(@(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ])); |
|
11537 | 886 |
for y:= 0 to Pred(h) do |
10901 | 887 |
begin |
888 |
for x:= 0 to Pred(w) do |
|
889 |
if ((PLongword(@(p^[x * 4]))^) and AMask) <> 0 then |
|
890 |
begin |
|
891 |
if (cReducedQuality and rqBlurryLand) = 0 then |
|
892 |
begin |
|
893 |
gX:= cpX + x; |
|
894 |
gY:= cpY + y; |
|
895 |
end |
|
896 |
else |
|
897 |
begin |
|
898 |
gX:= (cpX + x) div 2; |
|
899 |
gY:= (cpY + y) div 2; |
|
900 |
end; |
|
11537 | 901 |
if (not eraseOnLFMatch or (Land[cpY + y, cpX + x] and LandFlags <> 0)) and |
10909 | 902 |
((PLongword(@(p^[x * 4]))^) and AMask <> 0) then |
10901 | 903 |
begin |
10903 | 904 |
if not onlyEraseLF then |
905 |
begin |
|
906 |
LandPixels[gY, gX]:= 0; |
|
907 |
Land[cpY + y, cpX + x]:= 0 |
|
908 |
end |
|
10909 | 909 |
else Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] and (not LandFlags) |
10901 | 910 |
end |
911 |
end; |
|
912 |
p:= PByteArray(@(p^[Image^.pitch])); |
|
913 |
end; |
|
914 |
if SDL_MustLock(Image) then |
|
915 |
SDL_UnlockSurface(Image); |
|
916 |
||
917 |
if flipVert then flipSurface(Image, true); |
|
918 |
if flipHoriz then flipSurface(Image, false); |
|
919 |
||
920 |
x:= Max(cpX, leftX); |
|
921 |
w:= Min(cpX + Image^.w, LAND_WIDTH) - x; |
|
922 |
y:= Max(cpY, topY); |
|
923 |
h:= Min(cpY + Image^.h, LAND_HEIGHT) - y; |
|
924 |
UpdateLandTexture(x, w, y, h, true) |
|
925 |
end; |
|
926 |
||
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
|
927 |
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
|
928 |
var X, Y, bpp, h, w, row, col, numFramesFirstCol: LongInt; |
10677 | 929 |
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
|
930 |
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
|
931 |
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
|
932 |
GetPlaceCollisionTex:= nil; |
2235 | 933 |
numFramesFirstCol:= SpritesData[Obj].imageHeight div SpritesData[Obj].Height; |
934 |
||
11537 | 935 |
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
|
936 |
Image:= SpritesData[Obj].Surface; |
409 | 937 |
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
|
938 |
h:= SpritesData[Obj].Height; |
2235 | 939 |
row:= Frame mod numFramesFirstCol; |
940 |
col:= Frame div numFramesFirstCol; |
|
409 | 941 |
|
942 |
if SDL_MustLock(Image) then |
|
11512 | 943 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then |
944 |
exit; |
|
409 | 945 |
|
946 |
bpp:= Image^.format^.BytesPerPixel; |
|
11537 | 947 |
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
|
948 |
|
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
|
949 |
|
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
|
950 |
|
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 |
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
|
952 |
|
11537 | 953 |
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
|
954 |
|
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 |
if SDL_MustLock(finalSurface) then |
11537 | 956 |
SDLCheck(SDL_LockSurface(finalSurface) >= 0, 'GetPlaceCollisionTex', true); |
957 |
||
958 |
if not allOK then |
|
959 |
begin |
|
960 |
if SDL_MustLock(Image) then |
|
961 |
SDL_UnlockSurface(Image); |
|
962 |
||
963 |
if SDL_MustLock(finalSurface) then |
|
964 |
SDL_UnlockSurface(finalSurface); |
|
965 |
||
966 |
if finalSurface <> nil then |
|
967 |
SDL_FreeSurface(finalSurface); |
|
968 |
end; |
|
409 | 969 |
|
10677 | 970 |
p:= PLongWordArray(@(PLongWordArray(Image^.pixels)^[ (Image^.pitch div 4) * row * h + col * w ])); |
971 |
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
|
972 |
|
10677 | 973 |
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
|
974 |
begin |
10677 | 975 |
for x:= 0 to Pred(w) do |
976 |
if ((p^[x] and AMask) <> 0) |
|
977 |
and (((cpY + y) < Longint(topY)) or ((cpY + y) >= LAND_HEIGHT) or |
|
978 |
((cpX + x) < Longint(leftX)) or ((cpX + x) > Longint(rightX)) or (Land[cpY + y, cpX + x] <> 0)) then |
|
979 |
pt^[x]:= cWhiteColor |
|
980 |
else |
|
981 |
(pt^[x]):= cWhiteColor and (not AMask); |
|
982 |
p:= PLongWordArray(@(p^[Image^.pitch div 4])); |
|
983 |
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
|
984 |
end; |
520 | 985 |
|
409 | 986 |
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
|
987 |
SDL_UnlockSurface(Image); |
409 | 988 |
|
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
|
989 |
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
|
990 |
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
|
991 |
|
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 |
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
|
993 |
|
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 |
SDL_FreeSurface(finalSurface); |
409 | 995 |
end; |
996 |
||
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
|
997 |
|
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
|
998 |
function Despeckle(X, Y: LongInt): boolean; |
4695
ac2cb3b99d70
add a disabling for landback, set it if flakes are enabled
nemo
parents:
4690
diff
changeset
|
999 |
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
|
1000 |
pixelsweep: boolean; |
10023 | 1001 |
|
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
|
1002 |
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
|
1003 |
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
|
1004 |
|
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
|
1005 |
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
|
1006 |
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
|
1007 |
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
|
1008 |
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
|
1009 |
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
|
1010 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1011 |
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
|
1012 |
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
|
1013 |
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
|
1014 |
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
|
1015 |
|
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
|
1016 |
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
|
1017 |
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
|
1018 |
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
|
1019 |
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
|
1020 |
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
|
1021 |
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
|
1022 |
if (i <> 0) or (j <> 0) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1023 |
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
|
1024 |
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
|
1025 |
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
|
1026 |
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
|
1027 |
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
|
1028 |
if pixelsweep then |
4695
ac2cb3b99d70
add a disabling for landback, set it if flakes are enabled
nemo
parents:
4690
diff
changeset
|
1029 |
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
|
1030 |
if ((cReducedQuality and rqBlurryLand) <> 0) then |
4695
ac2cb3b99d70
add a disabling for landback, set it if flakes are enabled
nemo
parents:
4690
diff
changeset
|
1031 |
begin |
10023 | 1032 |
ny:= Y div 2 + i; |
1033 |
nx:= X div 2 + j; |
|
1034 |
if ((ny and (LAND_HEIGHT_MASK div 2)) = 0) and ((nx and (LAND_WIDTH_MASK div 2)) = 0) then |
|
10600 | 1035 |
if (LandPixels[ny, nx] and AMASK) <> 0 then |
10023 | 1036 |
inc(c); |
1037 |
end |
|
10600 | 1038 |
else if (LandPixels[ny, nx] and AMASK) <> 0 then |
10023 | 1039 |
inc(c); |
4695
ac2cb3b99d70
add a disabling for landback, set it if flakes are enabled
nemo
parents:
4690
diff
changeset
|
1040 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1041 |
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
|
1042 |
inc(c); |
4695
ac2cb3b99d70
add a disabling for landback, set it if flakes are enabled
nemo
parents:
4690
diff
changeset
|
1043 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1044 |
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
|
1045 |
|
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
|
1046 |
if c < 4 then // 0-3 neighbours |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1047 |
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
|
1048 |
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
|
1049 |
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
|
1050 |
else |
10152
15e9bb6fcab2
fix remaining alpha pixel issues (explosion landbacktex borders etc
sheepluva
parents:
10138
diff
changeset
|
1051 |
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
|
1052 |
|
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
|
1053 |
if not pixelsweep then |
6681 | 1054 |
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
|
1055 |
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
|
1056 |
exit |
6681 | 1057 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1058 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1059 |
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
|
1060 |
Despeckle:= false |
5267
e9ae019e9bb4
move smoothing into separate function, adjust call order
nemo
parents:
5266
diff
changeset
|
1061 |
end; |
e9ae019e9bb4
move smoothing into separate function, adjust call order
nemo
parents:
5266
diff
changeset
|
1062 |
|
10877 | 1063 |
// a bit of AA for explosions |
5267
e9ae019e9bb4
move smoothing into separate function, adjust call order
nemo
parents:
5266
diff
changeset
|
1064 |
procedure Smooth(X, Y: LongInt); |
10877 | 1065 |
var c, r, g, b, a, i: integer; |
1066 |
nx, ny: LongInt; |
|
1067 |
pixel: LongWord; |
|
1068 |
begin |
|
1069 |
||
1070 |
// only AA inwards |
|
1071 |
if (Land[Y, X] and lfDamaged) = 0 then |
|
1072 |
exit; |
|
1073 |
||
1074 |
// check location |
|
1075 |
if (Y <= LongInt(topY) + 1) or (Y >= LAND_HEIGHT-2) |
|
1076 |
or (X <= LongInt(leftX) + 1) or (X >= LongInt(rightX) - 1) then |
|
1077 |
exit; |
|
1078 |
||
1079 |
// counter for neighbor pixels that are not known to be undamaged |
|
1080 |
c:= 8; |
|
1081 |
||
1082 |
// accumalating rgba value of relevant pixels here |
|
1083 |
r:= 0; |
|
1084 |
g:= 0; |
|
1085 |
b:= 0; |
|
1086 |
a:= 0; |
|
1087 |
||
1088 |
// iterate over all neighbor pixels (also itself, will be skipped anyway) |
|
1089 |
for nx:= X-1 to X+1 do |
|
1090 |
for ny:= Y-1 to Y+1 do |
|
1091 |
// only consider undamaged neighbors (also leads to skipping itself) |
|
1092 |
if (Land[ny, nx] and lfDamaged) = 0 then |
|
1093 |
begin |
|
1094 |
pixel:= LandPixels[ny, nx]; |
|
1095 |
inc(r, (pixel and RMask) shr RShift); |
|
1096 |
inc(g, (pixel and GMask) shr GShift); |
|
1097 |
inc(b, (pixel and BMask) shr BShift); |
|
1098 |
inc(a, (pixel and AMask) shr AShift); |
|
1099 |
dec(c); |
|
1100 |
end; |
|
1101 |
||
1102 |
// nothing do to if all neighbors damaged |
|
1103 |
if c < 1 then |
|
1104 |
exit; |
|
1105 |
||
1106 |
// use explosion color for damaged pixels |
|
1107 |
for i:= 1 to c do |
|
1108 |
begin |
|
1109 |
inc(r, ExplosionBorderColorR); |
|
1110 |
inc(g, ExplosionBorderColorG); |
|
1111 |
inc(b, ExplosionBorderColorB); |
|
1112 |
inc(a, 255); |
|
1113 |
end; |
|
1114 |
||
1115 |
// set resulting color value based on average of all neighbors |
|
1116 |
r:= r div 8; |
|
1117 |
g:= g div 8; |
|
1118 |
b:= b div 8; |
|
1119 |
a:= a div 8; |
|
1120 |
LandPixels[y,x]:= (r shl RShift) or (g shl GShift) or (b shl BShift) or (a shl AShift); |
|
1121 |
||
1122 |
end; |
|
1123 |
||
1124 |
procedure Smooth_oldImpl(X, Y: LongInt); |
|
5267
e9ae019e9bb4
move smoothing into separate function, adjust call order
nemo
parents:
5266
diff
changeset
|
1125 |
begin |
5261 | 1126 |
// a bit of AA for explosions |
7492
3188794b9d87
Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
nemo
parents:
7270
diff
changeset
|
1127 |
if (Land[Y, X] = 0) and (Y > LongInt(topY) + 1) and |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1128 |
(Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then |
5261 | 1129 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1130 |
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
|
1131 |
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 | 1132 |
begin |
5274 | 1133 |
if (cReducedQuality and rqBlurryLand) = 0 then |
1134 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1135 |
if ((LandPixels[y,x] and AMask) shr AShift) < 10 then |
6982 | 1136 |
LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (128 shl AShift) |
5274 | 1137 |
else |
1138 |
LandPixels[y,x]:= |
|
6982 | 1139 |
(((((LandPixels[y,x] and RMask shr RShift) div 2)+((ExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or |
1140 |
(((((LandPixels[y,x] and GMask shr GShift) div 2)+((ExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or |
|
1141 |
(((((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 | 1142 |
end; |
10864
9cf20f487ee9
don't modify collision data when applying visual edge smoothing
sheepluva
parents:
10677
diff
changeset
|
1143 |
{ |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1144 |
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
|
1145 |
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
|
1146 |
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
|
1147 |
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
|
1148 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1149 |
Land[y,x]:= lfBasic; |
10864
9cf20f487ee9
don't modify collision data when applying visual edge smoothing
sheepluva
parents:
10677
diff
changeset
|
1150 |
} |
5261 | 1151 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1152 |
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
|
1153 |
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
|
1154 |
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
|
1155 |
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
|
1156 |
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
|
1157 |
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
|
1158 |
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
|
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))) then |
5261 | 1160 |
begin |
5274 | 1161 |
if (cReducedQuality and rqBlurryLand) = 0 then |
1162 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1163 |
if ((LandPixels[y,x] and AMask) shr AShift) < 10 then |
6982 | 1164 |
LandPixels[y,x]:= (ExplosionBorderColor and (not AMask)) or (64 shl AShift) |
5274 | 1165 |
else |
1166 |
LandPixels[y,x]:= |
|
6982 | 1167 |
(((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((ExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or |
1168 |
(((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((ExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or |
|
1169 |
(((((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 | 1170 |
end; |
10864
9cf20f487ee9
don't modify collision data when applying visual edge smoothing
sheepluva
parents:
10677
diff
changeset
|
1171 |
{ |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1172 |
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
|
1173 |
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
|
1174 |
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
|
1175 |
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
|
1176 |
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
|
1177 |
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
|
1178 |
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
|
1179 |
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
|
1180 |
else Land[y,x]:= lfBasic |
10864
9cf20f487ee9
don't modify collision data when applying visual edge smoothing
sheepluva
parents:
10677
diff
changeset
|
1181 |
} |
5261 | 1182 |
end |
5267
e9ae019e9bb4
move smoothing into separate function, adjust call order
nemo
parents:
5266
diff
changeset
|
1183 |
end |
10490 | 1184 |
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
|
1185 |
and (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1186 |
and (Y > LongInt(topY) + 1) and (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then |
6130 | 1187 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1188 |
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
|
1189 |
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 | 1190 |
begin |
1191 |
LandPixels[y,x]:= |
|
6982 | 1192 |
(((((LandPixels[y,x] and RMask shr RShift) div 2)+((ExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or |
1193 |
(((((LandPixels[y,x] and GMask shr GShift) div 2)+((ExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or |
|
1194 |
(((((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 | 1195 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1196 |
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
|
1197 |
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
|
1198 |
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
|
1199 |
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
|
1200 |
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
|
1201 |
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
|
1202 |
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
|
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))) then |
6130 | 1204 |
begin |
1205 |
LandPixels[y,x]:= |
|
6982 | 1206 |
(((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((ExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or |
1207 |
(((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((ExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or |
|
1208 |
(((((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 | 1209 |
end |
1210 |
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
|
1211 |
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
|
1212 |
|
1792 | 1213 |
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
|
1214 |
var x, y, xx, yy, ty, tx: LongInt; |
10601 | 1215 |
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
|
1216 |
begin |
2695 | 1217 |
bRes:= false; |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1218 |
reCheck:= true; |
1792 | 1219 |
|
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1220 |
while recheck do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1221 |
begin |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1222 |
recheck:= false; |
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1223 |
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
|
1224 |
begin |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1225 |
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
|
1226 |
begin |
5895 | 1227 |
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
|
1228 |
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
|
1229 |
resweep:= true; |
3602
99c93fa258d6
Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents:
3601
diff
changeset
|
1230 |
ty:= y * 32; |
99c93fa258d6
Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents:
3601
diff
changeset
|
1231 |
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
|
1232 |
while(resweep) do |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1233 |
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
|
1234 |
resweep:= false; |
3602
99c93fa258d6
Restore prior optimisation with the wildly out-of-bounds tx in LandDirty removed
nemo
parents:
3601
diff
changeset
|
1235 |
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
|
1236 |
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
|
1237 |
if Despeckle(xx, yy) then |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1238 |
begin |
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1239 |
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
|
1240 |
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
|
1241 |
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
|
1242 |
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
|
1243 |
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
|
1244 |
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
|
1245 |
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
|
1246 |
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
|
1247 |
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
|
1248 |
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
|
1249 |
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
|
1250 |
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
|
1251 |
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
|
1252 |
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
|
1253 |
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
|
1254 |
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
|
1255 |
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
|
1256 |
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
|
1257 |
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
|
1258 |
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
|
1259 |
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
|
1260 |
end |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1261 |
end; |
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1262 |
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
|
1263 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1264 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2741
diff
changeset
|
1265 |
end; |
3554
066faceb977d
Extend pixel sweep to recheck neighbours if erasing on edges
nemo
parents:
3521
diff
changeset
|
1266 |
end; |
1792 | 1267 |
|
10877 | 1268 |
// smooth explosion borders (except if land is blurry) |
1269 |
if (cReducedQuality and rqBlurryLand) = 0 then |
|
1270 |
for y:= 0 to LAND_HEIGHT div 32 - 1 do |
|
1271 |
for x:= 0 to LAND_WIDTH div 32 - 1 do |
|
1272 |
if LandDirty[y, x] <> 0 then |
|
1273 |
begin |
|
1274 |
ty:= y * 32; |
|
1275 |
tx:= x * 32; |
|
1276 |
for yy:= ty to ty + 31 do |
|
1277 |
for xx:= tx to tx + 31 do |
|
1278 |
Smooth(xx,yy) |
|
1279 |
end; |
|
5895 | 1280 |
|
1281 |
for y:= 0 to LAND_HEIGHT div 32 - 1 do |
|
1282 |
for x:= 0 to LAND_WIDTH div 32 - 1 do |
|
1283 |
if LandDirty[y, x] <> 0 then |
|
1284 |
begin |
|
1285 |
LandDirty[y, x]:= 0; |
|
1286 |
ty:= y * 32; |
|
1287 |
tx:= x * 32; |
|
10601 | 1288 |
UpdateLandTexture(tx, 32, ty, 32, false); |
5895 | 1289 |
end; |
1290 |
||
2695 | 1291 |
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
|
1292 |
end; |
184 | 1293 |
|
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
|
1294 |
|
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
|
1295 |
// 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
|
1296 |
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
|
1297 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1298 |
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
|
1299 |
end; |
4367 | 1300 |
|
6096
a00dbbf49d6c
Add landbacktex to a few maps, just to see how it looks.
nemo
parents:
6081
diff
changeset
|
1301 |
function LandBackPixel(x, y: LongInt): LongWord; inline; |
4367 | 1302 |
var p: PLongWordArray; |
1303 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1304 |
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
|
1305 |
LandBackPixel:= 0 |
4367 | 1306 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1307 |
begin |
4367 | 1308 |
p:= LandBackSurface^.pixels; |
1309 |
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
|
1310 |
end |
4367 | 1311 |
end; |
1312 |
||
1313 |
||
6490 | 1314 |
procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword); |
1315 |
var |
|
1316 |
eX, eY, dX, dY: LongInt; |
|
1317 |
i, sX, sY, x, y, d: LongInt; |
|
1318 |
begin |
|
1319 |
eX:= 0; |
|
1320 |
eY:= 0; |
|
1321 |
dX:= X2 - X1; |
|
1322 |
dY:= Y2 - Y1; |
|
1323 |
||
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1324 |
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
|
1325 |
sX:= 1 |
6490 | 1326 |
else |
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 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1329 |
sX:= -1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1330 |
dX:= -dX |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1331 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1332 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1333 |
sX:= dX; |
6490 | 1334 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1335 |
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
|
1336 |
sY:= 1 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1337 |
else |
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 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1340 |
sY:= -1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1341 |
dY:= -dY |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1342 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1343 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1344 |
sY:= dY; |
6490 | 1345 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1346 |
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
|
1347 |
d:= dX |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1348 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1349 |
d:= dY; |
6490 | 1350 |
|
1351 |
x:= X1; |
|
1352 |
y:= Y1; |
|
1353 |
||
1354 |
for i:= 0 to d do |
|
1355 |
begin |
|
1356 |
inc(eX, dX); |
|
1357 |
inc(eY, dY); |
|
1358 |
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
|
1359 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1360 |
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
|
1361 |
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
|
1362 |
end; |
6490 | 1363 |
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
|
1364 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6490
diff
changeset
|
1365 |
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
|
1366 |
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
|
1367 |
end; |
6490 | 1368 |
|
1369 |
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
|
1370 |
Land[y, x]:= Color; |
6490 | 1371 |
end |
1372 |
end; |
|
1373 |
||
10244 | 1374 |
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
|
1375 |
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
|
1376 |
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
|
1377 |
|
10510 | 1378 |
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 | 1379 |
begin inc(DrawDots); Land[y + yy, x + xx]:= Color; end; |
10510 | 1380 |
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 | 1381 |
begin inc(DrawDots); Land[y - yy, x + xx]:= Color; end; |
10510 | 1382 |
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 | 1383 |
begin inc(DrawDots); Land[y + yy, x - xx]:= Color; end; |
10510 | 1384 |
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 | 1385 |
begin inc(DrawDots); Land[y - yy, x - xx]:= Color; end; |
10510 | 1386 |
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 | 1387 |
begin inc(DrawDots); Land[y + xx, x + yy]:= Color; end; |
10510 | 1388 |
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 | 1389 |
begin inc(DrawDots); Land[y - xx, x + yy]:= Color; end; |
10510 | 1390 |
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 | 1391 |
begin inc(DrawDots); Land[y + xx, x - yy]:= Color; end; |
10510 | 1392 |
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 | 1393 |
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
|
1394 |
end; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1395 |
|
10244 | 1396 |
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
|
1397 |
var |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1398 |
eX, eY, dX, dY: LongInt; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1399 |
i, sX, sY, x, y, d: LongInt; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1400 |
f: boolean; |
7147 | 1401 |
begin |
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1402 |
eX:= 0; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1403 |
eY:= 0; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1404 |
dX:= X2 - X1; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1405 |
dY:= Y2 - Y1; |
10244 | 1406 |
DrawLines:= 0; |
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1407 |
|
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1408 |
if (dX > 0) then |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1409 |
sX:= 1 |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1410 |
else |
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 |
begin |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1413 |
sX:= -1; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1414 |
dX:= -dX |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1415 |
end |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1416 |
else |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1417 |
sX:= dX; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1418 |
|
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1419 |
if (dY > 0) then |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1420 |
sY:= 1 |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1421 |
else |
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 |
begin |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1424 |
sY:= -1; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1425 |
dY:= -dY |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1426 |
end |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1427 |
else |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1428 |
sY:= dY; |
7147 | 1429 |
|
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1430 |
if (dX > dY) then |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1431 |
d:= dX |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1432 |
else |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1433 |
d:= dY; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1434 |
|
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1435 |
x:= X1; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1436 |
y:= Y1; |
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 |
for i:= 0 to d do |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1439 |
begin |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1440 |
inc(eX, dX); |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1441 |
inc(eY, dY); |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1442 |
|
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1443 |
f:= eX > d; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1444 |
if f then |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1445 |
begin |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1446 |
dec(eX, d); |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1447 |
inc(x, sX); |
10244 | 1448 |
inc(DrawLines, DrawDots(x, y, xx, yy, color)) |
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1449 |
end; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1450 |
if (eY > d) then |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1451 |
begin |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1452 |
dec(eY, d); |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1453 |
inc(y, sY); |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1454 |
f:= true; |
10244 | 1455 |
inc(DrawLines, DrawDots(x, y, xx, yy, color)) |
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1456 |
end; |
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1457 |
|
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1458 |
if not f then |
10244 | 1459 |
inc(DrawLines, DrawDots(x, y, xx, yy, color)) |
7150
fba3b14ff746
This should make drawn maps rendering even more faster
unc0rr
parents:
7147
diff
changeset
|
1460 |
end |
7147 | 1461 |
end; |
1462 |
||
10244 | 1463 |
function DrawThickLine(X1, Y1, X2, Y2, radius: LongInt; color: Longword): Longword; |
7147 | 1464 |
var dx, dy, d: LongInt; |
1465 |
begin |
|
10244 | 1466 |
DrawThickLine:= 0; |
1467 |
||
7147 | 1468 |
dx:= 0; |
1469 |
dy:= Radius; |
|
1470 |
d:= 3 - 2 * Radius; |
|
1471 |
while (dx < dy) do |
|
1472 |
begin |
|
10244 | 1473 |
inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color)); |
7147 | 1474 |
if (d < 0) then |
1475 |
d:= d + 4 * dx + 6 |
|
1476 |
else |
|
1477 |
begin |
|
1478 |
d:= d + 4 * (dx - dy) + 10; |
|
1479 |
dec(dy) |
|
1480 |
end; |
|
1481 |
inc(dx) |
|
1482 |
end; |
|
1483 |
if (dx = dy) then |
|
10244 | 1484 |
inc(DrawThickLine, DrawLines(x1, y1, x2, y2, dx, dy, color)); |
7147 | 1485 |
end; |
1486 |
||
7268 | 1487 |
|
1488 |
procedure DumpLandToLog(x, y, r: LongInt); |
|
1489 |
var xx, yy, dx: LongInt; |
|
1490 |
s: shortstring; |
|
1491 |
begin |
|
1492 |
s[0]:= char(r * 2 + 1); |
|
1493 |
for yy:= y - r to y + r do |
|
1494 |
begin |
|
1495 |
for dx:= 0 to r*2 do |
|
1496 |
begin |
|
1497 |
xx:= dx - r + x; |
|
1498 |
if (xx = x) and (yy = y) then |
|
1499 |
s[dx + 1]:= 'X' |
|
1500 |
else if Land[yy, xx] > 255 then |
|
1501 |
s[dx + 1]:= 'O' |
|
1502 |
else if Land[yy, xx] > 0 then |
|
1503 |
s[dx + 1]:= '*' |
|
1504 |
else |
|
1505 |
s[dx + 1]:= '.' |
|
1506 |
end; |
|
1507 |
AddFileLog('Land dump: ' + s); |
|
1508 |
end; |
|
1509 |
end; |
|
1510 |
||
184 | 1511 |
end. |