author | koda |
Wed, 27 Mar 2013 11:18:00 +0100 | |
changeset 8795 | b5b79a8f9354 |
parent 8751 | 4609823efc94 |
child 8833 | c13ebed437cb |
child 8848 | e9ebd63f8a03 |
permissions | -rw-r--r-- |
184 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
6700 | 3 |
* Copyright (c) 2004-2012 Andrey Korotaev <unC0Rr@gmail.com> |
184 | 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 |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
17 |
*) |
|
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
184 | 21 |
unit uLandObjects; |
22 |
interface |
|
23 |
uses SDLh; |
|
24 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
25 |
procedure AddObjects(); |
3053 | 26 |
procedure FreeLandObjects(); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
27 |
procedure LoadThemeConfig; |
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
28 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline; |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
29 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; extraFlags: Word); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
30 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
184 | 31 |
|
32 |
implementation |
|
8028 | 33 |
uses uStore, uConsts, uConsole, uRandom, uSound, GLunit |
34 |
, uTypes, uVariables, uUtils, uDebug, SysUtils |
|
35 |
, uPhysFSLayer; |
|
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
36 |
|
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
37 |
const MaxRects = 512; |
184 | 38 |
MAXOBJECTRECTS = 16; |
39 |
MAXTHEMEOBJECTS = 32; |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8028
diff
changeset
|
40 |
cThemeCFGFilename = 'theme.cfg'; |
184 | 41 |
|
7035 | 42 |
type TRectsArray = array[0..MaxRects] of TSDL_Rect; |
43 |
PRectArray = ^TRectsArray; |
|
184 | 44 |
TThemeObject = record |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
45 |
Surf: PSDL_Surface; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
46 |
inland: TSDL_Rect; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
47 |
outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
48 |
rectcnt: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
49 |
Width, Height: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
50 |
Maxcnt: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
51 |
end; |
184 | 52 |
TThemeObjects = record |
371 | 53 |
Count: LongInt; |
184 | 54 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject; |
55 |
end; |
|
56 |
TSprayObject = record |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
57 |
Surf: PSDL_Surface; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
58 |
Width, Height: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
59 |
Maxcnt: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
60 |
end; |
184 | 61 |
TSprayObjects = record |
371 | 62 |
Count: LongInt; |
184 | 63 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject |
64 |
end; |
|
65 |
||
66 |
var Rects: PRectArray; |
|
67 |
RectCount: Longword; |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
68 |
ThemeObjects: TThemeObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
69 |
SprayObjects: TSprayObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
70 |
|
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
71 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline; |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
72 |
begin |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
73 |
BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, 0); |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
74 |
end; |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
75 |
|
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
76 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; extraFlags: Word); |
1182
e2e13aa055c1
Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents:
1181
diff
changeset
|
77 |
var p: PLongwordArray; |
184 | 78 |
x, y: Longword; |
371 | 79 |
bpp: LongInt; |
184 | 80 |
begin |
81 |
WriteToConsole('Generating collision info... '); |
|
82 |
||
83 |
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:
6534
diff
changeset
|
84 |
SDLTry(SDL_LockSurface(Image) >= 0, true); |
184 | 85 |
|
351 | 86 |
bpp:= Image^.format^.BytesPerPixel; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
87 |
TryDo(bpp = 4, 'Land object should be 32bit', true); |
1182
e2e13aa055c1
Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents:
1181
diff
changeset
|
88 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
89 |
if Width = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
90 |
Width:= Image^.w; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
91 |
|
351 | 92 |
p:= Image^.pixels; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
93 |
for y:= 0 to Pred(Image^.h) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
94 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
95 |
for x:= 0 to Pred(Width) do |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
96 |
if (p^[x] and AMask) <> 0 then |
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
97 |
begin |
3595
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
98 |
if (cReducedQuality and rqBlurryLand) = 0 then |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
99 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
100 |
if (LandPixels[cpY + y, cpX + x] = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
101 |
or (((p^[x] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then |
3595
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
102 |
LandPixels[cpY + y, cpX + x]:= p^[x]; |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
103 |
end |
3595
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
104 |
else |
5226 | 105 |
if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then |
3595
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
106 |
LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x]; |
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
107 |
|
8751
4609823efc94
More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents:
8145
diff
changeset
|
108 |
if (Land[cpY + y, cpX + x] <= lfAllObjMask) and ((p^[x] and AMask) <> 0) then |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
109 |
begin |
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
110 |
Land[cpY + y, cpX + x]:= lfObject; |
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
111 |
Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or extraFlags |
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
112 |
end; |
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
5832
diff
changeset
|
113 |
end; |
3509
d72c2219595d
Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents:
3463
diff
changeset
|
114 |
p:= @(p^[Image^.pitch shr 2]) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
115 |
end; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
116 |
|
184 | 117 |
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:
6534
diff
changeset
|
118 |
SDL_UnlockSurface(Image); |
184 | 119 |
WriteLnToConsole(msgOK) |
120 |
end; |
|
121 |
||
371 | 122 |
procedure AddRect(x1, y1, w1, h1: LongInt); |
184 | 123 |
begin |
351 | 124 |
with Rects^[RectCount] do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
125 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
126 |
x:= x1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
127 |
y:= y1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
128 |
w:= w1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
129 |
h:= h1 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
130 |
end; |
184 | 131 |
inc(RectCount); |
132 |
TryDo(RectCount < MaxRects, 'AddRect: overflow', true) |
|
133 |
end; |
|
134 |
||
135 |
procedure InitRects; |
|
136 |
begin |
|
137 |
RectCount:= 0; |
|
138 |
New(Rects) |
|
139 |
end; |
|
140 |
||
141 |
procedure FreeRects; |
|
142 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
143 |
Dispose(rects) |
184 | 144 |
end; |
145 |
||
371 | 146 |
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean; |
184 | 147 |
var i: Longword; |
2695 | 148 |
res: boolean = false; |
184 | 149 |
begin |
2695 | 150 |
|
184 | 151 |
i:= 0; |
152 |
if RectCount > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
153 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
154 |
with Rects^[i] do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
155 |
res:= (x < x1 + w1) and (x1 < x + w) and (y < y1 + h1) and (y1 < y + h); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
156 |
inc(i) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
157 |
until (i = RectCount) or (res); |
2695 | 158 |
CheckIntersect:= res; |
184 | 159 |
end; |
160 |
||
6492 | 161 |
|
162 |
function CountNonZeroz(x, y: LongInt): Longword; |
|
163 |
var i: LongInt; |
|
164 |
lRes: Longword; |
|
165 |
begin |
|
166 |
lRes:= 0; |
|
167 |
for i:= y to y + 15 do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
168 |
if Land[i, x] <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
169 |
inc(lRes); |
6492 | 170 |
CountNonZeroz:= lRes; |
171 |
end; |
|
172 |
||
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
173 |
function AddGirder(gX: LongInt): boolean; |
184 | 174 |
var tmpsurf: PSDL_Surface; |
371 | 175 |
x1, x2, y, k, i: LongInt; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
176 |
rr: TSDL_Rect; |
2695 | 177 |
bRes: boolean; |
184 | 178 |
begin |
1792 | 179 |
y:= topY+150; |
184 | 180 |
repeat |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
181 |
inc(y, 24); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
182 |
x1:= gX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
183 |
x2:= gX; |
2376 | 184 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
185 |
while (x1 > Longint(leftX)+150) and (CountNonZeroz(x1, y) = 0) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
186 |
dec(x1, 2); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
187 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
188 |
i:= x1 - 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
189 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
190 |
dec(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
191 |
k:= CountNonZeroz(x1, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
192 |
until (x1 < Longint(leftX)+150) or (k = 0) or (k = 16) or (x1 < i); |
2376 | 193 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
194 |
inc(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
195 |
if k = 16 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
196 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
197 |
while (x2 < (rightX-150)) and (CountNonZeroz(x2, y) = 0) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
198 |
inc(x2, 2); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
199 |
i:= x2 + 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
200 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
201 |
inc(x2, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
202 |
k:= CountNonZeroz(x2, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
203 |
until (x2 >= (rightX-150)) or (k = 0) or (k = 16) or (x2 > i) or (x2 - x1 >= 768); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
204 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
205 |
if (x2 < (rightX - 150)) and (k = 16) and (x2 - x1 > 250) and (x2 - x1 < 768) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
206 |
and (not CheckIntersect(x1 - 32, y - 64, x2 - x1 + 64, 144)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
207 |
break; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
208 |
end; |
184 | 209 |
x1:= 0; |
1753 | 210 |
until y > (LAND_HEIGHT-125); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
211 |
|
184 | 212 |
if x1 > 0 then |
2695 | 213 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
214 |
bRes:= true; |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7555
diff
changeset
|
215 |
tmpsurf:= LoadDataImageAltPath(ptCurrTheme, ptGraphics, 'Girder', ifCritical or ifTransparent or ifIgnoreCaps); |
2376 | 216 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
217 |
rr.x:= x1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
218 |
while rr.x < x2 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
219 |
begin |
6112
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
220 |
// For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun |
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
221 |
if (Theme = 'Snow') or (Theme = 'Christmas') then |
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
222 |
BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf, lfIce) |
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
223 |
else |
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
224 |
BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
225 |
inc(rr.x, tmpsurf^.w); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
226 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
227 |
SDL_FreeSurface(tmpsurf); |
2376 | 228 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
229 |
AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80); |
2695 | 230 |
end |
231 |
else bRes:= false; |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
232 |
|
2695 | 233 |
AddGirder:= bRes; |
184 | 234 |
end; |
235 |
||
236 |
function CheckLand(rect: TSDL_Rect; dX, dY, Color: Longword): boolean; |
|
3524
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
237 |
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt; |
2695 | 238 |
bRes: boolean = true; |
184 | 239 |
begin |
240 |
inc(rect.x, dX); |
|
241 |
inc(rect.y, dY); |
|
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
242 |
bx:= rect.x + rect.w; |
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
243 |
by:= rect.y + rect.h; |
184 | 244 |
{$WARNINGS OFF} |
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
245 |
tmpx:= rect.x; |
3524
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
246 |
tmpx2:= bx; |
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
247 |
while (tmpx <= bx - rect.w div 2 - 1) and bRes do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
248 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
249 |
bRes:= ((rect.y and LAND_HEIGHT_MASK) = 0) and ((by and LAND_HEIGHT_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
250 |
and ((tmpx and LAND_WIDTH_MASK) = 0) and ((tmpx2 and LAND_WIDTH_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
251 |
and (Land[rect.y, tmpx] = Color) and (Land[by, tmpx] = Color) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
252 |
and (Land[rect.y, tmpx2] = Color) and (Land[by, tmpx2] = Color); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
253 |
inc(tmpx); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
254 |
dec(tmpx2) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
255 |
end; |
3524
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
256 |
tmpy:= rect.y+1; |
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
257 |
tmpy2:= by-1; |
8d0783d2a0ff
This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents:
3521
diff
changeset
|
258 |
while (tmpy <= by - rect.h div 2 - 1) and bRes do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
259 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
260 |
bRes:= ((tmpy and LAND_HEIGHT_MASK) = 0) and ((tmpy2 and LAND_HEIGHT_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
261 |
and ((rect.x and LAND_WIDTH_MASK) = 0) and ((bx and LAND_WIDTH_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
262 |
and (Land[tmpy, rect.x] = Color) and (Land[tmpy, bx] = Color) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
263 |
and (Land[tmpy2, rect.x] = Color) and (Land[tmpy2, bx] = Color); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
264 |
inc(tmpy); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
265 |
dec(tmpy2) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
266 |
end; |
184 | 267 |
{$WARNINGS ON} |
2695 | 268 |
CheckLand:= bRes; |
184 | 269 |
end; |
270 |
||
271 |
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean; |
|
272 |
var i: Longword; |
|
2695 | 273 |
bRes: boolean; |
184 | 274 |
begin |
275 |
with Obj do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
276 |
if CheckLand(inland, x, y, lfBasic) then |
184 | 277 |
begin |
2695 | 278 |
bRes:= true; |
184 | 279 |
i:= 1; |
2695 | 280 |
while bRes and (i <= rectcnt) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
281 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
282 |
bRes:= CheckLand(outland[i], x, y, 0); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
283 |
inc(i) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
284 |
end; |
2695 | 285 |
if bRes then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
286 |
bRes:= not CheckIntersect(x, y, Width, Height) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
287 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
288 |
else |
2695 | 289 |
bRes:= false; |
290 |
CheckCanPlace:= bRes; |
|
184 | 291 |
end; |
292 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
293 |
function TryPut(var Obj: TThemeObject): boolean; overload; |
184 | 294 |
const MaxPointsIndex = 2047; |
295 |
var x, y: Longword; |
|
296 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
297 |
cnt, i: Longword; |
|
2695 | 298 |
bRes: boolean; |
184 | 299 |
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:
6986
diff
changeset
|
300 |
TryPut:= false; |
184 | 301 |
cnt:= 0; |
302 |
with Obj do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
303 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
304 |
if Maxcnt = 0 then |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
305 |
exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
306 |
x:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
307 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
308 |
y:= topY+32; // leave room for a hedgie to teleport in |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
309 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
310 |
if CheckCanPlace(x, y, Obj) then |
184 | 311 |
begin |
312 |
ar[cnt].x:= x; |
|
313 |
ar[cnt].y:= y; |
|
314 |
inc(cnt); |
|
315 |
if cnt > MaxPointsIndex then // buffer is full, do not check the rest land |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
316 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
317 |
y:= 5000; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
318 |
x:= 5000; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
319 |
end |
184 | 320 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
321 |
inc(y, 3); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
322 |
until y >= LAND_HEIGHT - Height; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
323 |
inc(x, getrandom(6) + 3) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
324 |
until x >= LAND_WIDTH - Width; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
325 |
bRes:= cnt <> 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
326 |
if bRes then |
184 | 327 |
begin |
328 |
i:= getrandom(cnt); |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
329 |
BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf); |
184 | 330 |
AddRect(ar[i].x, ar[i].y, Width, Height); |
331 |
dec(Maxcnt) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
332 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
333 |
else Maxcnt:= 0 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
334 |
end; |
2695 | 335 |
TryPut:= bRes; |
184 | 336 |
end; |
337 |
||
338 |
function TryPut(var Obj: TSprayObject; Surface: PSDL_Surface): boolean; overload; |
|
339 |
const MaxPointsIndex = 8095; |
|
340 |
var x, y: Longword; |
|
341 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
342 |
cnt, i: Longword; |
|
343 |
r: TSDL_Rect; |
|
2695 | 344 |
bRes: boolean; |
184 | 345 |
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:
6986
diff
changeset
|
346 |
TryPut:= false; |
184 | 347 |
cnt:= 0; |
348 |
with Obj do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
349 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
350 |
if Maxcnt = 0 then |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
351 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
352 |
x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
353 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
354 |
r.y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
355 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
356 |
r.h:= Height + 16; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
357 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
358 |
y:= 8; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
359 |
repeat |
3519 | 360 |
if CheckLand(r, x, y - 8, lfBasic) |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6305
diff
changeset
|
361 |
and (not CheckIntersect(x, y, Width, Height)) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
362 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
363 |
ar[cnt].x:= x; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
364 |
ar[cnt].y:= y; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
365 |
inc(cnt); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
366 |
if cnt > MaxPointsIndex then // buffer is full, do not check the rest land |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
367 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
368 |
y:= 5000; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
369 |
x:= 5000; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
370 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
371 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
372 |
inc(y, 12); |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
373 |
until y >= LAND_HEIGHT - Height - 8; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
374 |
inc(x, getrandom(12) + 12) |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
375 |
until x >= LAND_WIDTH - Width; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
376 |
bRes:= cnt <> 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
377 |
if bRes then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
378 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
379 |
i:= getrandom(cnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
380 |
r.x:= ar[i].X; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
381 |
r.y:= ar[i].Y; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
382 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
383 |
r.h:= Height; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
384 |
SDL_UpperBlit(Obj.Surf, nil, Surface, @r); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
385 |
AddRect(ar[i].x - 32, ar[i].y - 32, Width + 64, Height + 64); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
386 |
dec(Maxcnt) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
387 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
388 |
else Maxcnt:= 0 |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
389 |
end; |
2695 | 390 |
TryPut:= bRes; |
184 | 391 |
end; |
392 |
||
6492 | 393 |
|
394 |
procedure CheckRect(Width, Height, x, y, w, h: LongWord); |
|
395 |
begin |
|
396 |
if (x + w > Width) then |
|
397 |
OutError('Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true); |
|
398 |
if (y + h > Height) then |
|
399 |
OutError('Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true); |
|
400 |
end; |
|
401 |
||
184 | 402 |
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
403 |
var s, key: shortstring; |
8028 | 404 |
f: PFSFile; |
5179
8d64dcb566ea
Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents:
5166
diff
changeset
|
405 |
i: LongInt; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
406 |
ii, t: Longword; |
5832
f730c8a9777b
Remove some unused variables and options.inc which uFloat doesn't use, probably should never use, and was getting in the way of my testcase - but most importantly, remove the inline on hwSqrt which was causing very bad math on my compiler/machine. We may have to remove more inlining. A pity.
nemo
parents:
5689
diff
changeset
|
407 |
c2: TSDL_Color; |
184 | 408 |
begin |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
409 |
|
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
410 |
AddProgress; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
411 |
// Set default water greyscale values |
6982 | 412 |
if GrayScale then |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
413 |
begin |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
414 |
for i:= 0 to 3 do |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
415 |
begin |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
416 |
t:= round(SDWaterColorArray[i].r * RGB_LUMINANCE_RED + SDWaterColorArray[i].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[i].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
417 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
418 |
t:= 255; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
419 |
SDWaterColorArray[i].r:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
420 |
SDWaterColorArray[i].g:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
421 |
SDWaterColorArray[i].b:= t |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
422 |
end; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
423 |
for i:= 0 to 1 do |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
424 |
begin |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
425 |
t:= round(WaterColorArray[i].r * RGB_LUMINANCE_RED + WaterColorArray[i].g * RGB_LUMINANCE_GREEN + WaterColorArray[i].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
426 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
427 |
t:= 255; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
428 |
WaterColorArray[i].r:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
429 |
WaterColorArray[i].g:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
430 |
WaterColorArray[i].b:= t |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
431 |
end |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
432 |
end; |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
433 |
|
8025 | 434 |
s:= cPathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
184 | 435 |
WriteLnToConsole('Reading objects info...'); |
8028 | 436 |
f:= pfsOpenRead(s); |
437 |
TryDo(f <> nil, 'Bad data or cannot access file ' + cThemeCFGFilename, true); |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
438 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
439 |
ThemeObjects.Count:= 0; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
440 |
SprayObjects.Count:= 0; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
441 |
|
8028 | 442 |
while not pfsEOF(f) do |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
443 |
begin |
8028 | 444 |
pfsReadLn(f, s); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
445 |
if Length(s) = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
446 |
continue; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
447 |
if s[1] = ';' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
448 |
continue; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
449 |
|
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
450 |
i:= Pos('=', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
451 |
key:= Trim(Copy(s, 1, Pred(i))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
452 |
Delete(s, 1, i); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
453 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
454 |
if key = 'sky' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
455 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
456 |
i:= Pos(',', s); |
5654 | 457 |
SkyColor.r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
458 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
459 |
i:= Pos(',', s); |
5654 | 460 |
SkyColor.g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
461 |
Delete(s, 1, i); |
5654 | 462 |
SkyColor.b:= StrToInt(Trim(s)); |
6982 | 463 |
if GrayScale |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
464 |
then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
465 |
begin |
5654 | 466 |
t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
467 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
468 |
t:= 255; |
5654 | 469 |
SkyColor.r:= t; |
470 |
SkyColor.g:= t; |
|
471 |
SkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
472 |
end; |
5654 | 473 |
glClearColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255, 0.99); |
5689
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
474 |
SDSkyColor.r:= SkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
475 |
SDSkyColor.g:= SkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
476 |
SDSkyColor.b:= SkyColor.b; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
477 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
478 |
else if key = 'border' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
479 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
480 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
481 |
c2.r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
482 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
483 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
484 |
c2.g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
485 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
486 |
c2.b:= StrToInt(Trim(s)); |
6982 | 487 |
if GrayScale then |
6303 | 488 |
begin |
489 |
t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
490 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
491 |
t:= 255; |
6303 | 492 |
c2.r:= t; |
493 |
c2.g:= t; |
|
494 |
c2.b:= t |
|
495 |
end; |
|
7555 | 496 |
ExplosionBorderColor:= (c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift) or AMask; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
497 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
498 |
else if key = 'water-top' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
499 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
500 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
501 |
WaterColorArray[0].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
502 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
503 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
504 |
WaterColorArray[0].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
505 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
506 |
WaterColorArray[0].b:= StrToInt(Trim(s)); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
507 |
WaterColorArray[0].a := 255; |
6982 | 508 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
509 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
510 |
t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
511 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
512 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
513 |
WaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
514 |
WaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
515 |
WaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
516 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
517 |
WaterColorArray[1]:= WaterColorArray[0]; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
518 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
519 |
else if key = 'water-bottom' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
520 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
521 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
522 |
WaterColorArray[2].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
523 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
524 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
525 |
WaterColorArray[2].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
526 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
527 |
WaterColorArray[2].b:= StrToInt(Trim(s)); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
528 |
WaterColorArray[2].a := 255; |
6982 | 529 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
530 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
531 |
t:= round(WaterColorArray[2].r * RGB_LUMINANCE_RED + WaterColorArray[2].g * RGB_LUMINANCE_GREEN + WaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
532 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
533 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
534 |
WaterColorArray[2].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
535 |
WaterColorArray[2].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
536 |
WaterColorArray[2].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
537 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
538 |
WaterColorArray[3]:= WaterColorArray[2]; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
539 |
end |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
540 |
else if key = 'water-opacity' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
541 |
begin |
6982 | 542 |
WaterOpacity:= StrToInt(Trim(s)); |
543 |
SDWaterOpacity:= WaterOpacity |
|
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
544 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
545 |
else if key = 'music' then |
7053 | 546 |
SetMusicName(Trim(s)) |
4792
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4782
diff
changeset
|
547 |
else if key = 'clouds' then |
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4782
diff
changeset
|
548 |
begin |
7543
a0dc770538e1
Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents:
7069
diff
changeset
|
549 |
cCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096; |
4792
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4782
diff
changeset
|
550 |
cSDCloudsNumber:= cCloudsNumber |
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4782
diff
changeset
|
551 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
552 |
else if key = 'object' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
553 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
554 |
inc(ThemeObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
555 |
with ThemeObjects.objs[Pred(ThemeObjects.Count)] do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
556 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
557 |
i:= Pos(',', s); |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7555
diff
changeset
|
558 |
Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
559 |
Width:= Surf^.w; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
560 |
Height:= Surf^.h; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
561 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
562 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
563 |
Maxcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
564 |
Delete(s, 1, i); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
565 |
if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
566 |
OutError('Object''s max count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
567 |
with inland do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
568 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
569 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
570 |
x:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
571 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
572 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
573 |
y:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
574 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
575 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
576 |
w:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
577 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
578 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
579 |
h:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
580 |
Delete(s, 1, i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
581 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
582 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
583 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
584 |
rectcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
585 |
Delete(s, 1, i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
586 |
for ii:= 1 to rectcnt do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
587 |
with outland[ii] do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
588 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
589 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
590 |
x:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
591 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
592 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
593 |
y:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
594 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
595 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
596 |
w:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
597 |
Delete(s, 1, i); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
598 |
if ii = rectcnt then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
599 |
h:= StrToInt(Trim(s)) |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
600 |
else |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
601 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
602 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
603 |
h:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
604 |
Delete(s, 1, i) |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
605 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
606 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
607 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
608 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
609 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
610 |
else if key = 'spray' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
611 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
612 |
inc(SprayObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
613 |
with SprayObjects.objs[Pred(SprayObjects.Count)] do |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
614 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
615 |
i:= Pos(',', s); |
7640
e9e6b4d740f6
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents:
7555
diff
changeset
|
616 |
Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
617 |
Width:= Surf^.w; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
618 |
Height:= Surf^.h; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
619 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
620 |
Maxcnt:= StrToInt(Trim(s)); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
621 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
622 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
623 |
else if key = 'flakes' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
624 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
625 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
626 |
vobCount:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
627 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
628 |
if vobCount > 0 then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
629 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
630 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
631 |
vobFramesCount:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
632 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
633 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
634 |
vobFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
635 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
636 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
637 |
vobVelocity:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
638 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
639 |
vobFallSpeed:= StrToInt(Trim(s)); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
640 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
641 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
642 |
else if key = 'flatten-flakes' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
643 |
cFlattenFlakes:= true |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
644 |
else if key = 'flatten-clouds' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
645 |
cFlattenClouds:= true |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
646 |
else if key = 'sd-water-top' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
647 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
648 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
649 |
SDWaterColorArray[0].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
650 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
651 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
652 |
SDWaterColorArray[0].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
653 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
654 |
SDWaterColorArray[0].b:= StrToInt(Trim(s)); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
655 |
SDWaterColorArray[0].a := 255; |
6982 | 656 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
657 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
658 |
t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
659 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
660 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
661 |
SDWaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
662 |
SDWaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
663 |
SDWaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
664 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
665 |
SDWaterColorArray[1]:= SDWaterColorArray[0]; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
666 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
667 |
else if key = 'sd-water-bottom' then |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
668 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
669 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
670 |
SDWaterColorArray[2].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
671 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
672 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
673 |
SDWaterColorArray[2].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
674 |
Delete(s, 1, i); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
675 |
SDWaterColorArray[2].b:= StrToInt(Trim(s)); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
676 |
SDWaterColorArray[2].a := 255; |
6982 | 677 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
678 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
679 |
t:= round(SDWaterColorArray[2].r * RGB_LUMINANCE_RED + SDWaterColorArray[2].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
680 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
681 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
682 |
SDWaterColorArray[2].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
683 |
SDWaterColorArray[2].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
684 |
SDWaterColorArray[2].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
685 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
686 |
SDWaterColorArray[3]:= SDWaterColorArray[2]; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
687 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
688 |
else if key = 'sd-water-opacity' then |
6982 | 689 |
SDWaterOpacity:= StrToInt(Trim(s)) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
690 |
else if key = 'sd-clouds' then |
7543
a0dc770538e1
Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents:
7069
diff
changeset
|
691 |
cSDCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096 |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
692 |
else if key = 'sd-flakes' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
693 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
694 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
695 |
vobSDCount:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
696 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
697 |
if vobSDCount > 0 then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
698 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
699 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
700 |
vobSDFramesCount:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
701 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
702 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
703 |
vobSDFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
704 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
705 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
706 |
vobSDVelocity:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
707 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
708 |
vobSDFallSpeed:= StrToInt(Trim(s)); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
709 |
end; |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
710 |
end |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
711 |
else if key = 'rq-sky' then |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
712 |
begin |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
713 |
if ((cReducedQuality and rqNoBackground) <> 0) then |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
714 |
begin |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
715 |
i:= Pos(',', s); |
5654 | 716 |
RQSkyColor.r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
717 |
Delete(s, 1, i); |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
718 |
i:= Pos(',', s); |
5654 | 719 |
RQSkyColor.g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
720 |
Delete(s, 1, i); |
5654 | 721 |
RQSkyColor.b:= StrToInt(Trim(s)); |
6982 | 722 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
723 |
begin |
5654 | 724 |
t:= round(RQSkyColor.r * RGB_LUMINANCE_RED + RQSkyColor.g * RGB_LUMINANCE_GREEN + RQSkyColor.b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
725 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
726 |
t:= 255; |
5654 | 727 |
RQSkyColor.r:= t; |
728 |
RQSkyColor.g:= t; |
|
729 |
RQSkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
730 |
end; |
5654 | 731 |
glClearColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255, 0.99); |
5689
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
732 |
SDSkyColor.r:= RQSkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
733 |
SDSkyColor.g:= RQSkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
734 |
SDSkyColor.b:= RQSkyColor.b; |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
735 |
end |
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4806
diff
changeset
|
736 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
737 |
end; |
184 | 738 |
|
8028 | 739 |
pfsClose(f); |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
740 |
AddProgress; |
184 | 741 |
end; |
742 |
||
2870 | 743 |
procedure AddThemeObjects(var ThemeObjects: TThemeObjects); |
371 | 744 |
var i, ii, t: LongInt; |
184 | 745 |
b: boolean; |
746 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
747 |
if ThemeObjects.Count = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
748 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
749 |
WriteLnToConsole('Adding theme objects...'); |
2783
1532fde15179
Palewolf's patch to allow controlling proportion of various objects in themes. Desert and Nature have non-default values
nemo
parents:
2747
diff
changeset
|
750 |
|
3697 | 751 |
for i:=0 to ThemeObjects.Count do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
752 |
ThemeObjects.objs[i].Maxcnt := max(1, (ThemeObjects.objs[i].Maxcnt * MaxHedgehogs) div 18); // Maxcnt is proportional to map size, but allow objects to span even if we're on a tiny map |
3697 | 753 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
754 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
755 |
t := getrandom(ThemeObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
756 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
757 |
for i:=0 to ThemeObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
758 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
759 |
ii := (i+t) mod ThemeObjects.Count; |
3697 | 760 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
761 |
if ThemeObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
762 |
b := b or TryPut(ThemeObjects.objs[ii]) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
763 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
764 |
until not b; |
184 | 765 |
end; |
766 |
||
2870 | 767 |
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects); |
768 |
var i, ii, t: LongInt; |
|
184 | 769 |
b: boolean; |
770 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
771 |
if SprayObjects.Count = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
772 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
773 |
WriteLnToConsole('Adding spray objects...'); |
2870 | 774 |
|
3697 | 775 |
for i:=0 to SprayObjects.Count do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
776 |
SprayObjects.objs[i].Maxcnt := max(1, (SprayObjects.objs[i].Maxcnt * MaxHedgehogs) div 18); // Maxcnt is proportional to map size, but allow objects to span even if we're on a tiny map |
3697 | 777 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
778 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
779 |
t := getrandom(SprayObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
780 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
781 |
for i:=0 to SprayObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
782 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
783 |
ii := (i+t) mod SprayObjects.Count; |
3697 | 784 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
785 |
if SprayObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
786 |
b := b or TryPut(SprayObjects.objs[ii], Surface) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
787 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
788 |
until not b; |
184 | 789 |
end; |
790 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
791 |
procedure AddObjects(); |
7069 | 792 |
var i, g: Longword; |
184 | 793 |
begin |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
794 |
InitRects; |
1776 | 795 |
if hasGirders then |
796 |
begin |
|
7069 | 797 |
g:= max(playWidth div 8, 256); |
798 |
i:= leftX + g; |
|
1792 | 799 |
repeat |
800 |
AddGirder(i); |
|
7069 | 801 |
i:=i + g; |
802 |
until (i > rightX - g); |
|
1776 | 803 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
804 |
if (GameFlags and gfDisableLandObjects) = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
805 |
AddThemeObjects(ThemeObjects); |
2705
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
806 |
AddProgress(); |
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
807 |
FreeRects(); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
808 |
end; |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
809 |
|
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
810 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
811 |
begin |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
812 |
InitRects; |
2275
3f56c99a70f8
Make all theme numbers proportional to map MaxHedgehogs. This should mean the numbers should be as in past for 18 hedgehog map
nemo
parents:
2272
diff
changeset
|
813 |
//AddSprayObjects(Surface, SprayObjects, 12); |
2870 | 814 |
AddSprayObjects(Surface, SprayObjects); |
1186
bf5af791d234
Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents:
1185
diff
changeset
|
815 |
FreeRects |
184 | 816 |
end; |
817 |
||
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
818 |
procedure LoadThemeConfig; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
819 |
begin |
3463 | 820 |
ReadThemeInfo(ThemeObjects, SprayObjects) |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
821 |
end; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
822 |
|
3053 | 823 |
procedure FreeLandObjects(); |
824 |
var i: Longword; |
|
825 |
begin |
|
3463 | 826 |
for i:= 0 to Pred(MAXTHEMEOBJECTS) do |
827 |
begin |
|
828 |
if ThemeObjects.objs[i].Surf <> nil then |
|
829 |
SDL_FreeSurface(ThemeObjects.objs[i].Surf); |
|
830 |
if SprayObjects.objs[i].Surf <> nil then |
|
831 |
SDL_FreeSurface(SprayObjects.objs[i].Surf); |
|
3513
f589230fa21b
now it's possible to select the scheme file in the ifrontendfix a type about loading an image (iphone file system IS case senstive)
koda
parents:
3509
diff
changeset
|
832 |
ThemeObjects.objs[i].Surf:= nil; |
f589230fa21b
now it's possible to select the scheme file in the ifrontendfix a type about loading an image (iphone file system IS case senstive)
koda
parents:
3509
diff
changeset
|
833 |
SprayObjects.objs[i].Surf:= nil; |
3463 | 834 |
end; |
3053 | 835 |
end; |
836 |
||
184 | 837 |
end. |