author | Star |
Wed, 07 Sep 2011 20:13:14 -0400 | |
changeset 5802 | f0f0943e1f8e |
parent 5689 | 48ef34701751 |
child 5832 | f730c8a9777b |
permissions | -rw-r--r-- |
184 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2004-2011 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; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
28 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
29 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
184 | 30 |
|
31 |
implementation |
|
4850 | 32 |
uses uStore, uConsts, uConsole, uRandom, uSound, GLunit, |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
33 |
uTypes, uVariables, uUtils, uDebug, sysutils; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
34 |
|
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
35 |
const MaxRects = 512; |
184 | 36 |
MAXOBJECTRECTS = 16; |
37 |
MAXTHEMEOBJECTS = 32; |
|
38 |
||
39 |
type PRectArray = ^TRectsArray; |
|
40 |
TRectsArray = array[0..MaxRects] of TSDL_Rect; |
|
41 |
TThemeObject = record |
|
42 |
Surf: PSDL_Surface; |
|
43 |
inland: TSDL_Rect; |
|
44 |
outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
|
45 |
rectcnt: Longword; |
|
46 |
Width, Height: Longword; |
|
47 |
Maxcnt: Longword; |
|
48 |
end; |
|
49 |
TThemeObjects = record |
|
371 | 50 |
Count: LongInt; |
184 | 51 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject; |
52 |
end; |
|
53 |
TSprayObject = record |
|
54 |
Surf: PSDL_Surface; |
|
55 |
Width, Height: Longword; |
|
56 |
Maxcnt: Longword; |
|
57 |
end; |
|
58 |
TSprayObjects = record |
|
371 | 59 |
Count: LongInt; |
184 | 60 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject |
61 |
end; |
|
62 |
||
63 |
var Rects: PRectArray; |
|
64 |
RectCount: Longword; |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
65 |
ThemeObjects: TThemeObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
66 |
SprayObjects: TSprayObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
67 |
|
184 | 68 |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
69 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); |
1182
e2e13aa055c1
Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents:
1181
diff
changeset
|
70 |
var p: PLongwordArray; |
184 | 71 |
x, y: Longword; |
371 | 72 |
bpp: LongInt; |
184 | 73 |
begin |
74 |
WriteToConsole('Generating collision info... '); |
|
75 |
||
76 |
if SDL_MustLock(Image) then |
|
77 |
SDLTry(SDL_LockSurface(Image) >= 0, true); |
|
78 |
||
351 | 79 |
bpp:= Image^.format^.BytesPerPixel; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
80 |
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
|
81 |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
82 |
if Width = 0 then Width:= Image^.w; |
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
83 |
|
351 | 84 |
p:= Image^.pixels; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
85 |
for y:= 0 to Pred(Image^.h) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
86 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
87 |
for x:= 0 to Pred(Width) do |
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
|
88 |
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
|
89 |
if (cReducedQuality and rqBlurryLand) = 0 then |
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
|
90 |
begin |
5225 | 91 |
if (LandPixels[cpY + y, cpX + x] = 0) or |
92 |
(((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
|
93 |
LandPixels[cpY + y, cpX + x]:= 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
|
94 |
end |
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
|
95 |
else |
5226 | 96 |
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
|
97 |
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
|
98 |
|
3697 | 99 |
if ((Land[cpY + y, cpX + x] and $FF00) = 0) and ((p^[x] and AMask) <> 0) then |
3519 | 100 |
Land[cpY + y, cpX + x]:= lfObject |
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
|
101 |
end; |
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
|
102 |
p:= @(p^[Image^.pitch shr 2]) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
103 |
end; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
104 |
|
184 | 105 |
if SDL_MustLock(Image) then |
106 |
SDL_UnlockSurface(Image); |
|
107 |
WriteLnToConsole(msgOK) |
|
108 |
end; |
|
109 |
||
371 | 110 |
procedure AddRect(x1, y1, w1, h1: LongInt); |
184 | 111 |
begin |
351 | 112 |
with Rects^[RectCount] do |
184 | 113 |
begin |
114 |
x:= x1; |
|
115 |
y:= y1; |
|
116 |
w:= w1; |
|
117 |
h:= h1 |
|
118 |
end; |
|
119 |
inc(RectCount); |
|
120 |
TryDo(RectCount < MaxRects, 'AddRect: overflow', true) |
|
121 |
end; |
|
122 |
||
123 |
procedure InitRects; |
|
124 |
begin |
|
125 |
RectCount:= 0; |
|
126 |
New(Rects) |
|
127 |
end; |
|
128 |
||
129 |
procedure FreeRects; |
|
130 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
131 |
Dispose(rects) |
184 | 132 |
end; |
133 |
||
371 | 134 |
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean; |
184 | 135 |
var i: Longword; |
2695 | 136 |
res: boolean = false; |
184 | 137 |
begin |
2695 | 138 |
|
184 | 139 |
i:= 0; |
140 |
if RectCount > 0 then |
|
141 |
repeat |
|
351 | 142 |
with Rects^[i] do |
2695 | 143 |
res:= (x < x1 + w1) and (x1 < x + w) and |
184 | 144 |
(y < y1 + h1) and (y1 < y + h); |
145 |
inc(i) |
|
2695 | 146 |
until (i = RectCount) or (res); |
147 |
CheckIntersect:= res; |
|
184 | 148 |
end; |
149 |
||
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
150 |
function AddGirder(gX: LongInt): boolean; |
184 | 151 |
var tmpsurf: PSDL_Surface; |
371 | 152 |
x1, x2, y, k, i: LongInt; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
153 |
rr: TSDL_Rect; |
2695 | 154 |
bRes: boolean; |
184 | 155 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
156 |
function CountNonZeroz(x, y: LongInt): Longword; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
157 |
var i: LongInt; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
158 |
lRes: Longword; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
159 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
160 |
lRes:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
161 |
for i:= y to y + 15 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
162 |
if Land[i, x] <> 0 then inc(lRes); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
163 |
CountNonZeroz:= lRes; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
164 |
end; |
184 | 165 |
|
166 |
begin |
|
1792 | 167 |
y:= topY+150; |
184 | 168 |
repeat |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
169 |
inc(y, 24); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
170 |
x1:= gX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
171 |
x2:= gX; |
2376 | 172 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
173 |
while (x1 > Longint(leftX)+150) and (CountNonZeroz(x1, y) = 0) do dec(x1, 2); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
174 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
175 |
i:= x1 - 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
176 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
177 |
dec(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
178 |
k:= CountNonZeroz(x1, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
179 |
until (x1 < Longint(leftX)+150) or (k = 0) or (k = 16) or (x1 < i); |
2376 | 180 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
181 |
inc(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
182 |
if k = 16 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
183 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
184 |
while (x2 < (rightX-150)) and (CountNonZeroz(x2, y) = 0) do inc(x2, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
185 |
i:= x2 + 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
186 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
187 |
inc(x2, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
188 |
k:= CountNonZeroz(x2, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
189 |
until (x2 >= (rightX-150)) or (k = 0) or (k = 16) or (x2 > i) or (x2 - x1 >= 768); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
190 |
if (x2 < (rightX - 150)) and (k = 16) and (x2 - x1 > 250) and (x2 - x1 < 768) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
191 |
and not CheckIntersect(x1 - 32, y - 64, x2 - x1 + 64, 144) then break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
192 |
end; |
184 | 193 |
x1:= 0; |
1753 | 194 |
until y > (LAND_HEIGHT-125); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
195 |
|
184 | 196 |
if x1 > 0 then |
2695 | 197 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
198 |
bRes:= true; |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
199 |
tmpsurf:= LoadImage(UserPathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
200 |
if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
201 |
if tmpsurf = nil then tmpsurf:= LoadImage(UserPathz[ptGraphics] + '/Girder', ifTransparent or ifIgnoreCaps); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
202 |
if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptGraphics] + '/Girder', ifCritical or ifTransparent or ifIgnoreCaps); |
2376 | 203 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
204 |
rr.x:= x1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
205 |
while rr.x < x2 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
206 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
207 |
BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
208 |
inc(rr.x, tmpsurf^.w); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
209 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
210 |
SDL_FreeSurface(tmpsurf); |
2376 | 211 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
212 |
AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80); |
2695 | 213 |
end |
214 |
else bRes:= false; |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
215 |
|
2695 | 216 |
AddGirder:= bRes; |
184 | 217 |
end; |
218 |
||
219 |
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
|
220 |
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt; |
2695 | 221 |
bRes: boolean = true; |
184 | 222 |
begin |
223 |
inc(rect.x, dX); |
|
224 |
inc(rect.y, dY); |
|
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
225 |
bx:= rect.x + rect.w; |
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
226 |
by:= rect.y + rect.h; |
184 | 227 |
{$WARNINGS OFF} |
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
228 |
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
|
229 |
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
|
230 |
while (tmpx <= bx - rect.w div 2 - 1) and bRes do |
184 | 231 |
begin |
4639
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
232 |
bRes:= ((rect.y and LAND_HEIGHT_MASK) = 0) and ((by and LAND_HEIGHT_MASK) = 0) and |
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
233 |
((tmpx and LAND_WIDTH_MASK) = 0) and ((tmpx2 and LAND_WIDTH_MASK) = 0) and |
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
234 |
(Land[rect.y, tmpx] = Color) and (Land[by, tmpx] = Color) and |
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
|
235 |
(Land[rect.y, tmpx2] = Color) and (Land[by, tmpx2] = Color); |
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
|
236 |
inc(tmpx); |
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 |
dec(tmpx2) |
184 | 238 |
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
|
239 |
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
|
240 |
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
|
241 |
while (tmpy <= by - rect.h div 2 - 1) and bRes do |
184 | 242 |
begin |
4639
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
243 |
bRes:= ((tmpy and LAND_HEIGHT_MASK) = 0) and ((tmpy2 and LAND_HEIGHT_MASK) = 0) and |
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
244 |
((rect.x and LAND_WIDTH_MASK) = 0) and ((bx and LAND_WIDTH_MASK) = 0) and |
6de386a42fae
apparently some sanity checks are needed here. christmas theme object dimensions are crashing placement
nemo
parents:
4619
diff
changeset
|
245 |
(Land[tmpy, rect.x] = Color) and (Land[tmpy, bx] = Color) and |
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 |
(Land[tmpy2, rect.x] = Color) and (Land[tmpy2, bx] = Color); |
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 |
inc(tmpy); |
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
|
248 |
dec(tmpy2) |
184 | 249 |
end; |
250 |
{$WARNINGS ON} |
|
2695 | 251 |
CheckLand:= bRes; |
184 | 252 |
end; |
253 |
||
254 |
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean; |
|
255 |
var i: Longword; |
|
2695 | 256 |
bRes: boolean; |
184 | 257 |
begin |
258 |
with Obj do |
|
3519 | 259 |
if CheckLand(inland, x, y, lfBasic) then |
184 | 260 |
begin |
2695 | 261 |
bRes:= true; |
184 | 262 |
i:= 1; |
2695 | 263 |
while bRes and (i <= rectcnt) do |
184 | 264 |
begin |
2695 | 265 |
bRes:= CheckLand(outland[i], x, y, 0); |
184 | 266 |
inc(i) |
267 |
end; |
|
2695 | 268 |
if bRes then |
269 |
bRes:= not CheckIntersect(x, y, Width, Height) |
|
184 | 270 |
end else |
2695 | 271 |
bRes:= false; |
272 |
CheckCanPlace:= bRes; |
|
184 | 273 |
end; |
274 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
275 |
function TryPut(var Obj: TThemeObject): boolean; overload; |
184 | 276 |
const MaxPointsIndex = 2047; |
277 |
var x, y: Longword; |
|
278 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
279 |
cnt, i: Longword; |
|
2695 | 280 |
bRes: boolean; |
184 | 281 |
begin |
282 |
cnt:= 0; |
|
283 |
with Obj do |
|
284 |
begin |
|
285 |
if Maxcnt = 0 then |
|
351 | 286 |
exit(false); |
184 | 287 |
x:= 0; |
288 |
repeat |
|
1792 | 289 |
y:= topY+32; // leave room for a hedgie to teleport in |
184 | 290 |
repeat |
291 |
if CheckCanPlace(x, y, Obj) then |
|
292 |
begin |
|
293 |
ar[cnt].x:= x; |
|
294 |
ar[cnt].y:= y; |
|
295 |
inc(cnt); |
|
296 |
if cnt > MaxPointsIndex then // buffer is full, do not check the rest land |
|
297 |
begin |
|
298 |
y:= 5000; |
|
299 |
x:= 5000; |
|
300 |
end |
|
301 |
end; |
|
302 |
inc(y, 3); |
|
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
303 |
until y >= LAND_HEIGHT - Height; |
184 | 304 |
inc(x, getrandom(6) + 3) |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
305 |
until x >= LAND_WIDTH - Width; |
2695 | 306 |
bRes:= cnt <> 0; |
307 |
if bRes then |
|
184 | 308 |
begin |
309 |
i:= getrandom(cnt); |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
310 |
BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf); |
184 | 311 |
AddRect(ar[i].x, ar[i].y, Width, Height); |
312 |
dec(Maxcnt) |
|
313 |
end else Maxcnt:= 0 |
|
351 | 314 |
end; |
2695 | 315 |
TryPut:= bRes; |
184 | 316 |
end; |
317 |
||
318 |
function TryPut(var Obj: TSprayObject; Surface: PSDL_Surface): boolean; overload; |
|
319 |
const MaxPointsIndex = 8095; |
|
320 |
var x, y: Longword; |
|
321 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
322 |
cnt, i: Longword; |
|
323 |
r: TSDL_Rect; |
|
2695 | 324 |
bRes: boolean; |
184 | 325 |
begin |
326 |
cnt:= 0; |
|
327 |
with Obj do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
328 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
329 |
if Maxcnt = 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
330 |
exit(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
331 |
x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
332 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
333 |
r.y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
334 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
335 |
r.h:= Height + 16; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
336 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
337 |
y:= 8; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
338 |
repeat |
3519 | 339 |
if CheckLand(r, x, y - 8, lfBasic) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
340 |
and not CheckIntersect(x, y, Width, Height) then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
341 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
342 |
ar[cnt].x:= x; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
343 |
ar[cnt].y:= y; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
344 |
inc(cnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
345 |
if cnt > MaxPointsIndex then // buffer is full, do not check the rest land |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
346 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
347 |
y:= 5000; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
348 |
x:= 5000; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
349 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
350 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
351 |
inc(y, 12); |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
352 |
until y >= LAND_HEIGHT - Height - 8; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
353 |
inc(x, getrandom(12) + 12) |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
354 |
until x >= LAND_WIDTH - Width; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
355 |
bRes:= cnt <> 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
356 |
if bRes then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
357 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
358 |
i:= getrandom(cnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
359 |
r.x:= ar[i].X; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
360 |
r.y:= ar[i].Y; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
361 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
362 |
r.h:= Height; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
363 |
SDL_UpperBlit(Obj.Surf, nil, Surface, @r); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
364 |
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
|
365 |
dec(Maxcnt) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
366 |
end else Maxcnt:= 0 |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
367 |
end; |
2695 | 368 |
TryPut:= bRes; |
184 | 369 |
end; |
370 |
||
371 |
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
|
372 |
var s, key: shortstring; |
184 | 373 |
f: textfile; |
5179
8d64dcb566ea
Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents:
5166
diff
changeset
|
374 |
i: LongInt; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
375 |
ii, t: Longword; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
376 |
c1, c2: TSDL_Color; |
1277 | 377 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
378 |
procedure CheckRect(Width, Height, x, y, w, h: LongWord); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
379 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
380 |
if (x + w > Width) then OutError('Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
381 |
if (y + h > Height) then OutError('Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
382 |
end; |
1277 | 383 |
|
184 | 384 |
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
|
385 |
|
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
|
386 |
AddProgress; |
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
|
387 |
|
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
388 |
s:= UserPathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
389 |
if not FileExists(s) then s:= Pathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
184 | 390 |
WriteLnToConsole('Reading objects info...'); |
351 | 391 |
Assign(f, s); |
184 | 392 |
{$I-} |
2747 | 393 |
filemode:= 0; // readonly |
184 | 394 |
Reset(f); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
395 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
396 |
ThemeObjects.Count:= 0; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
397 |
SprayObjects.Count:= 0; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
398 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
399 |
while not eof(f) do |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
400 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
401 |
Readln(f, s); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
402 |
if Length(s) = 0 then continue; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
403 |
if s[1] = ';' then continue; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
404 |
|
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
405 |
i:= Pos('=', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
406 |
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
|
407 |
Delete(s, 1, i); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
408 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
409 |
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
|
410 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
411 |
i:= Pos(',', s); |
5654 | 412 |
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
|
413 |
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
|
414 |
i:= Pos(',', s); |
5654 | 415 |
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
|
416 |
Delete(s, 1, i); |
5654 | 417 |
SkyColor.b:= StrToInt(Trim(s)); |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
418 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
419 |
begin |
5654 | 420 |
t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE); |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
421 |
if t > 255 then t:= 255; |
5654 | 422 |
SkyColor.r:= t; |
423 |
SkyColor.g:= t; |
|
424 |
SkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
425 |
end; |
5654 | 426 |
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
|
427 |
SDSkyColor.r:= SkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
428 |
SDSkyColor.g:= SkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
429 |
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
|
430 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
431 |
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
|
432 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
433 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
434 |
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
|
435 |
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
|
436 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
437 |
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
|
438 |
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
|
439 |
c2.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
|
440 |
cExplosionBorderColor:= c2.value or AMask; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
441 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
442 |
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
|
443 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
444 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
445 |
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
|
446 |
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
|
447 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
448 |
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
|
449 |
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
|
450 |
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
|
451 |
WaterColorArray[0].a := 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
452 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
453 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
454 |
t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
455 |
if t > 255 then t:= 255; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
456 |
WaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
457 |
WaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
458 |
WaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
459 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
460 |
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
|
461 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
462 |
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
|
463 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
464 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
465 |
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
|
466 |
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
|
467 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
468 |
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
|
469 |
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
|
470 |
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
|
471 |
WaterColorArray[2].a := 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
472 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
473 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
474 |
t:= round(WaterColorArray[2].r * RGB_LUMINANCE_RED + WaterColorArray[2].g * RGB_LUMINANCE_GREEN + WaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
475 |
if t > 255 then t:= 255; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
476 |
WaterColorArray[2].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
477 |
WaterColorArray[2].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
478 |
WaterColorArray[2].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
479 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
480 |
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
|
481 |
end |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
482 |
else if key = 'water-opacity' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
483 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
484 |
cWaterOpacity:= StrToInt(Trim(s)); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
485 |
cSDWaterOpacity:= cWaterOpacity |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
486 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
487 |
else if key = 'music' then MusicFN:= 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
|
488 |
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
|
489 |
begin |
5179
8d64dcb566ea
Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents:
5166
diff
changeset
|
490 |
cCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div LAND_WIDTH; |
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
|
491 |
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
|
492 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
493 |
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
|
494 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
495 |
inc(ThemeObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
496 |
with ThemeObjects.objs[Pred(ThemeObjects.Count)] do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
497 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
498 |
i:= Pos(',', s); |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
499 |
Surf:= LoadImage(UserPathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
5240 | 500 |
if Surf = nil then Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or ifTransparent or ifIgnoreCaps); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
501 |
Width:= Surf^.w; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
502 |
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
|
503 |
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
|
504 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
505 |
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
|
506 |
Delete(s, 1, i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
507 |
if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then OutError('Object''s max count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
508 |
with inland do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
509 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
510 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
511 |
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
|
512 |
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
|
513 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
514 |
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
|
515 |
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
|
516 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
517 |
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
|
518 |
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
|
519 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
520 |
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
|
521 |
Delete(s, 1, i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
522 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
523 |
end; |
4782
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 |
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
|
526 |
Delete(s, 1, i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
527 |
for ii:= 1 to rectcnt do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
528 |
with outland[ii] do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
529 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
530 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
531 |
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
|
532 |
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
|
533 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
534 |
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
|
535 |
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
|
536 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
537 |
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
|
538 |
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
|
539 |
if ii = rectcnt then h:= StrToInt(Trim(s)) |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
540 |
else |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
541 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
542 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
543 |
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
|
544 |
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
|
545 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
546 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
547 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
548 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
549 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
550 |
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
|
551 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
552 |
inc(SprayObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
553 |
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
|
554 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
555 |
i:= Pos(',', s); |
5238
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
556 |
Surf:= LoadImage(UserPathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
46ddaf14509d
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo
parents:
5226
diff
changeset
|
557 |
if Surf = nil then Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or 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
|
558 |
Width:= Surf^.w; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
559 |
Height:= Surf^.h; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
560 |
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
|
561 |
Maxcnt:= StrToInt(Trim(s)); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
562 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
563 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
564 |
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
|
565 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
566 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
567 |
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
|
568 |
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
|
569 |
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
|
570 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
571 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
572 |
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
|
573 |
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
|
574 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
575 |
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
|
576 |
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
|
577 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
578 |
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
|
579 |
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
|
580 |
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
|
581 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
582 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
583 |
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
|
584 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
585 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
586 |
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
|
587 |
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
|
588 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
589 |
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
|
590 |
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
|
591 |
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
|
592 |
SDWaterColorArray[0].a := 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
593 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
594 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
595 |
t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
596 |
if t > 255 then t:= 255; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
597 |
SDWaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
598 |
SDWaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
599 |
SDWaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
600 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
601 |
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
|
602 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
603 |
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
|
604 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
605 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
606 |
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
|
607 |
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
|
608 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
609 |
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
|
610 |
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
|
611 |
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
|
612 |
SDWaterColorArray[2].a := 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
613 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
614 |
begin |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
615 |
t:= round(SDWaterColorArray[2].r * RGB_LUMINANCE_RED + SDWaterColorArray[2].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
616 |
if t > 255 then t:= 255; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
617 |
SDWaterColorArray[2].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
618 |
SDWaterColorArray[2].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
619 |
SDWaterColorArray[2].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
620 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
621 |
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
|
622 |
end |
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
|
623 |
else if key = 'sd-water-opacity' then cSDWaterOpacity:= StrToInt(Trim(s)) |
5179
8d64dcb566ea
Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents:
5166
diff
changeset
|
624 |
else if key = 'sd-clouds' then cSDCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div LAND_WIDTH |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
625 |
else if key = 'sd-flakes' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
626 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
627 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
628 |
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
|
629 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
630 |
if vobSDCount > 0 then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
631 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
632 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
633 |
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
|
634 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
635 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
636 |
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
|
637 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
638 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
639 |
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
|
640 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
641 |
vobSDFallSpeed:= StrToInt(Trim(s)); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
642 |
end; |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
643 |
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
|
644 |
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
|
645 |
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
|
646 |
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
|
647 |
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
|
648 |
i:= Pos(',', s); |
5654 | 649 |
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
|
650 |
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
|
651 |
i:= Pos(',', s); |
5654 | 652 |
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
|
653 |
Delete(s, 1, i); |
5654 | 654 |
RQSkyColor.b:= StrToInt(Trim(s)); |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
655 |
if cGrayScale then |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
656 |
begin |
5654 | 657 |
t:= round(RQSkyColor.r * RGB_LUMINANCE_RED + RQSkyColor.g * RGB_LUMINANCE_GREEN + RQSkyColor.b * RGB_LUMINANCE_BLUE); |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
658 |
if t > 255 then t:= 255; |
5654 | 659 |
RQSkyColor.r:= t; |
660 |
RQSkyColor.g:= t; |
|
661 |
RQSkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
662 |
end; |
5654 | 663 |
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
|
664 |
SDSkyColor.r:= RQSkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
665 |
SDSkyColor.g:= RQSkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
666 |
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
|
667 |
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
|
668 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
669 |
end; |
184 | 670 |
|
351 | 671 |
Close(f); |
184 | 672 |
{$I+} |
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
|
673 |
TryDo(IOResult = 0, 'Bad data or cannot access file ' + cThemeCFGFilename, true); |
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
|
674 |
AddProgress; |
184 | 675 |
end; |
676 |
||
2870 | 677 |
procedure AddThemeObjects(var ThemeObjects: TThemeObjects); |
371 | 678 |
var i, ii, t: LongInt; |
184 | 679 |
b: boolean; |
680 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
681 |
if ThemeObjects.Count = 0 then exit; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
682 |
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
|
683 |
|
3697 | 684 |
for i:=0 to ThemeObjects.Count do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
685 |
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 | 686 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
687 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
688 |
t := getrandom(ThemeObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
689 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
690 |
for i:=0 to ThemeObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
691 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
692 |
ii := (i+t) mod ThemeObjects.Count; |
3697 | 693 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
694 |
if ThemeObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
695 |
b := b or TryPut(ThemeObjects.objs[ii]) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
696 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
697 |
until not b; |
184 | 698 |
end; |
699 |
||
2870 | 700 |
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects); |
701 |
var i, ii, t: LongInt; |
|
184 | 702 |
b: boolean; |
703 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
704 |
if SprayObjects.Count = 0 then exit; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
705 |
WriteLnToConsole('Adding spray objects...'); |
2870 | 706 |
|
3697 | 707 |
for i:=0 to SprayObjects.Count do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
708 |
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 | 709 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
710 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
711 |
t := getrandom(SprayObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
712 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
713 |
for i:=0 to SprayObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
714 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
715 |
ii := (i+t) mod SprayObjects.Count; |
3697 | 716 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
717 |
if SprayObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
718 |
b := b or TryPut(SprayObjects.objs[ii], Surface) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
719 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
720 |
until not b; |
184 | 721 |
end; |
722 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
723 |
procedure AddObjects(); |
1792 | 724 |
var i, int: Longword; |
184 | 725 |
begin |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
726 |
InitRects; |
1776 | 727 |
if hasGirders then |
728 |
begin |
|
1792 | 729 |
int:= max(playWidth div 8, 256); |
730 |
i:=leftX+int; |
|
731 |
repeat |
|
732 |
AddGirder(i); |
|
733 |
i:=i+int; |
|
734 |
until (i>rightX-int); |
|
1776 | 735 |
end; |
3936
0b982d340633
bug #83 - move test of disabled land objects into AddObjects
nemo
parents:
3764
diff
changeset
|
736 |
if (GameFlags and gfDisableLandObjects) = 0 then AddThemeObjects(ThemeObjects); |
2705
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
737 |
AddProgress(); |
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
738 |
FreeRects(); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
739 |
end; |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
740 |
|
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
741 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
742 |
begin |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
743 |
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
|
744 |
//AddSprayObjects(Surface, SprayObjects, 12); |
2870 | 745 |
AddSprayObjects(Surface, SprayObjects); |
1186
bf5af791d234
Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents:
1185
diff
changeset
|
746 |
FreeRects |
184 | 747 |
end; |
748 |
||
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
749 |
procedure LoadThemeConfig; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
750 |
begin |
3463 | 751 |
ReadThemeInfo(ThemeObjects, SprayObjects) |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
752 |
end; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
753 |
|
3053 | 754 |
procedure FreeLandObjects(); |
755 |
var i: Longword; |
|
756 |
begin |
|
3463 | 757 |
for i:= 0 to Pred(MAXTHEMEOBJECTS) do |
758 |
begin |
|
759 |
if ThemeObjects.objs[i].Surf <> nil then |
|
760 |
SDL_FreeSurface(ThemeObjects.objs[i].Surf); |
|
761 |
if SprayObjects.objs[i].Surf <> nil then |
|
762 |
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
|
763 |
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
|
764 |
SprayObjects.objs[i].Surf:= nil; |
3463 | 765 |
end; |
3053 | 766 |
end; |
767 |
||
184 | 768 |
end. |