author | koda |
Wed, 23 Jun 2010 21:39:14 +0200 | |
changeset 3545 | b07ee704f35d |
parent 3524 | 8d0783d2a0ff |
child 3595 | 341e407e3754 |
permissions | -rw-r--r-- |
184 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
3236
4ab3917d7d44
Update (c) lines to 2010 as unc0rr requested - they all had varying values so I just took the first year mentioned, then tacked on -2010
nemo
parents:
3165
diff
changeset
|
3 |
* Copyright (c) 2005-2010 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 |
|
3407 | 32 |
uses uLand, uStore, uConsts, uMisc, uConsole, uRandom, uVisualGears, uSound, GLunit; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
33 |
|
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
34 |
const MaxRects = 512; |
184 | 35 |
MAXOBJECTRECTS = 16; |
36 |
MAXTHEMEOBJECTS = 32; |
|
37 |
||
38 |
type PRectArray = ^TRectsArray; |
|
39 |
TRectsArray = array[0..MaxRects] of TSDL_Rect; |
|
40 |
TThemeObject = record |
|
41 |
Surf: PSDL_Surface; |
|
42 |
inland: TSDL_Rect; |
|
43 |
outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
|
44 |
rectcnt: Longword; |
|
45 |
Width, Height: Longword; |
|
46 |
Maxcnt: Longword; |
|
47 |
end; |
|
48 |
TThemeObjects = record |
|
371 | 49 |
Count: LongInt; |
184 | 50 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject; |
51 |
end; |
|
52 |
TSprayObject = record |
|
53 |
Surf: PSDL_Surface; |
|
54 |
Width, Height: Longword; |
|
55 |
Maxcnt: Longword; |
|
56 |
end; |
|
57 |
TSprayObjects = record |
|
371 | 58 |
Count: LongInt; |
184 | 59 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject |
60 |
end; |
|
61 |
||
62 |
var Rects: PRectArray; |
|
63 |
RectCount: Longword; |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
64 |
ThemeObjects: TThemeObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
65 |
SprayObjects: TSprayObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
66 |
|
184 | 67 |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
68 |
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
|
69 |
var p: PLongwordArray; |
184 | 70 |
x, y: Longword; |
371 | 71 |
bpp: LongInt; |
184 | 72 |
begin |
73 |
WriteToConsole('Generating collision info... '); |
|
74 |
||
75 |
if SDL_MustLock(Image) then |
|
76 |
SDLTry(SDL_LockSurface(Image) >= 0, true); |
|
77 |
||
351 | 78 |
bpp:= Image^.format^.BytesPerPixel; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
79 |
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
|
80 |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
81 |
if Width = 0 then Width:= Image^.w; |
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
82 |
|
351 | 83 |
p:= Image^.pixels; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
84 |
for y:= 0 to Pred(Image^.h) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
85 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
86 |
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
|
87 |
begin |
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 |
{$IFDEF DOWNSCALE} |
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
|
89 |
if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then |
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
|
90 |
LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x]; |
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
|
91 |
{$ELSE} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
92 |
if LandPixels[cpY + y, cpX + x] = 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
93 |
LandPixels[cpY + y, cpX + x]:= p^[x]; |
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
|
94 |
{$ENDIF} |
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
|
95 |
if ((Land[cpY + y, cpX + x] and $FF00) = 0) and ((p^[x] and AMask) <> 0) then |
3519 | 96 |
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
|
97 |
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
|
98 |
p:= @(p^[Image^.pitch shr 2]) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
99 |
end; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
100 |
|
184 | 101 |
if SDL_MustLock(Image) then |
102 |
SDL_UnlockSurface(Image); |
|
103 |
WriteLnToConsole(msgOK) |
|
104 |
end; |
|
105 |
||
371 | 106 |
procedure AddRect(x1, y1, w1, h1: LongInt); |
184 | 107 |
begin |
351 | 108 |
with Rects^[RectCount] do |
184 | 109 |
begin |
110 |
x:= x1; |
|
111 |
y:= y1; |
|
112 |
w:= w1; |
|
113 |
h:= h1 |
|
114 |
end; |
|
115 |
inc(RectCount); |
|
116 |
TryDo(RectCount < MaxRects, 'AddRect: overflow', true) |
|
117 |
end; |
|
118 |
||
119 |
procedure InitRects; |
|
120 |
begin |
|
121 |
RectCount:= 0; |
|
122 |
New(Rects) |
|
123 |
end; |
|
124 |
||
125 |
procedure FreeRects; |
|
126 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
127 |
Dispose(rects) |
184 | 128 |
end; |
129 |
||
371 | 130 |
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean; |
184 | 131 |
var i: Longword; |
2695 | 132 |
res: boolean = false; |
184 | 133 |
begin |
2695 | 134 |
|
184 | 135 |
i:= 0; |
136 |
if RectCount > 0 then |
|
137 |
repeat |
|
351 | 138 |
with Rects^[i] do |
2695 | 139 |
res:= (x < x1 + w1) and (x1 < x + w) and |
184 | 140 |
(y < y1 + h1) and (y1 < y + h); |
141 |
inc(i) |
|
2695 | 142 |
until (i = RectCount) or (res); |
143 |
CheckIntersect:= res; |
|
184 | 144 |
end; |
145 |
||
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
146 |
function AddGirder(gX: LongInt): boolean; |
184 | 147 |
var tmpsurf: PSDL_Surface; |
371 | 148 |
x1, x2, y, k, i: LongInt; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
149 |
rr: TSDL_Rect; |
2695 | 150 |
bRes: boolean; |
184 | 151 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
152 |
function CountNonZeroz(x, y: LongInt): Longword; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
153 |
var i: LongInt; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
154 |
lRes: Longword; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
155 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
156 |
lRes:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
157 |
for i:= y to y + 15 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
158 |
if Land[i, x] <> 0 then inc(lRes); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
159 |
CountNonZeroz:= lRes; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
160 |
end; |
184 | 161 |
|
162 |
begin |
|
1792 | 163 |
y:= topY+150; |
184 | 164 |
repeat |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
165 |
inc(y, 24); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
166 |
x1:= gX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
167 |
x2:= gX; |
2376 | 168 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
169 |
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
|
170 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
171 |
i:= x1 - 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
172 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
173 |
dec(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
174 |
k:= CountNonZeroz(x1, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
175 |
until (x1 < Longint(leftX)+150) or (k = 0) or (k = 16) or (x1 < i); |
2376 | 176 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
177 |
inc(x1, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
178 |
if k = 16 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
179 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
180 |
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
|
181 |
i:= x2 + 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
182 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
183 |
inc(x2, 2); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
184 |
k:= CountNonZeroz(x2, y) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
185 |
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
|
186 |
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
|
187 |
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
|
188 |
end; |
184 | 189 |
x1:= 0; |
1753 | 190 |
until y > (LAND_HEIGHT-125); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
191 |
|
184 | 192 |
if x1 > 0 then |
2695 | 193 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
194 |
bRes:= true; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
195 |
tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
196 |
if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptGraphics] + '/Girder', ifCritical or ifTransparent or ifIgnoreCaps); |
2376 | 197 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
198 |
rr.x:= x1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
199 |
while rr.x < x2 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
200 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
201 |
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
|
202 |
inc(rr.x, tmpsurf^.w); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
203 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
204 |
SDL_FreeSurface(tmpsurf); |
2376 | 205 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
206 |
AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80); |
2695 | 207 |
end |
208 |
else bRes:= false; |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
209 |
|
2695 | 210 |
AddGirder:= bRes; |
184 | 211 |
end; |
212 |
||
213 |
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
|
214 |
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt; |
2695 | 215 |
bRes: boolean = true; |
184 | 216 |
begin |
217 |
inc(rect.x, dX); |
|
218 |
inc(rect.y, dY); |
|
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
219 |
bx:= rect.x + rect.w; |
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
220 |
by:= rect.y + rect.h; |
184 | 221 |
{$WARNINGS OFF} |
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
222 |
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
|
223 |
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
|
224 |
while (tmpx <= bx - rect.w div 2 - 1) and bRes do |
184 | 225 |
begin |
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
|
226 |
bRes:= (Land[rect.y, tmpx] = Color) and (Land[by, tmpx] = Color) and |
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
|
227 |
(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
|
228 |
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
|
229 |
dec(tmpx2) |
184 | 230 |
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
|
231 |
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
|
232 |
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
|
233 |
while (tmpy <= by - rect.h div 2 - 1) and bRes do |
184 | 234 |
begin |
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 |
bRes:= (Land[tmpy, rect.x] = Color) and (Land[tmpy, bx] = Color) and |
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 |
(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
|
237 |
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
|
238 |
dec(tmpy2) |
184 | 239 |
end; |
240 |
{$WARNINGS ON} |
|
2695 | 241 |
CheckLand:= bRes; |
184 | 242 |
end; |
243 |
||
244 |
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean; |
|
245 |
var i: Longword; |
|
2695 | 246 |
bRes: boolean; |
184 | 247 |
begin |
248 |
with Obj do |
|
3519 | 249 |
if CheckLand(inland, x, y, lfBasic) then |
184 | 250 |
begin |
2695 | 251 |
bRes:= true; |
184 | 252 |
i:= 1; |
2695 | 253 |
while bRes and (i <= rectcnt) do |
184 | 254 |
begin |
2695 | 255 |
bRes:= CheckLand(outland[i], x, y, 0); |
184 | 256 |
inc(i) |
257 |
end; |
|
2695 | 258 |
if bRes then |
259 |
bRes:= not CheckIntersect(x, y, Width, Height) |
|
184 | 260 |
end else |
2695 | 261 |
bRes:= false; |
262 |
CheckCanPlace:= bRes; |
|
184 | 263 |
end; |
264 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
265 |
function TryPut(var Obj: TThemeObject): boolean; overload; |
184 | 266 |
const MaxPointsIndex = 2047; |
267 |
var x, y: Longword; |
|
268 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
269 |
cnt, i: Longword; |
|
2695 | 270 |
bRes: boolean; |
184 | 271 |
begin |
272 |
cnt:= 0; |
|
273 |
with Obj do |
|
274 |
begin |
|
275 |
if Maxcnt = 0 then |
|
351 | 276 |
exit(false); |
184 | 277 |
x:= 0; |
278 |
repeat |
|
1792 | 279 |
y:= topY+32; // leave room for a hedgie to teleport in |
184 | 280 |
repeat |
281 |
if CheckCanPlace(x, y, Obj) then |
|
282 |
begin |
|
283 |
ar[cnt].x:= x; |
|
284 |
ar[cnt].y:= y; |
|
285 |
inc(cnt); |
|
286 |
if cnt > MaxPointsIndex then // buffer is full, do not check the rest land |
|
287 |
begin |
|
288 |
y:= 5000; |
|
289 |
x:= 5000; |
|
290 |
end |
|
291 |
end; |
|
292 |
inc(y, 3); |
|
1773 | 293 |
until y > LAND_HEIGHT - 1 - Height; |
184 | 294 |
inc(x, getrandom(6) + 3) |
1773 | 295 |
until x > LAND_WIDTH - 1 - Width; |
2695 | 296 |
bRes:= cnt <> 0; |
297 |
if bRes then |
|
184 | 298 |
begin |
299 |
i:= getrandom(cnt); |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
300 |
BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf); |
184 | 301 |
AddRect(ar[i].x, ar[i].y, Width, Height); |
302 |
dec(Maxcnt) |
|
303 |
end else Maxcnt:= 0 |
|
351 | 304 |
end; |
2695 | 305 |
TryPut:= bRes; |
184 | 306 |
end; |
307 |
||
308 |
function TryPut(var Obj: TSprayObject; Surface: PSDL_Surface): boolean; overload; |
|
309 |
const MaxPointsIndex = 8095; |
|
310 |
var x, y: Longword; |
|
311 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
312 |
cnt, i: Longword; |
|
313 |
r: TSDL_Rect; |
|
2695 | 314 |
bRes: boolean; |
184 | 315 |
begin |
316 |
cnt:= 0; |
|
317 |
with Obj do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
318 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
319 |
if Maxcnt = 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
320 |
exit(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
321 |
x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
322 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
323 |
r.y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
324 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
325 |
r.h:= Height + 16; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
326 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
327 |
y:= 8; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
328 |
repeat |
3519 | 329 |
if CheckLand(r, x, y - 8, lfBasic) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
330 |
and not CheckIntersect(x, y, Width, Height) then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
331 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
332 |
ar[cnt].x:= x; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
333 |
ar[cnt].y:= y; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
334 |
inc(cnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
335 |
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
|
336 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
337 |
y:= 5000; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
338 |
x:= 5000; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
339 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
340 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
341 |
inc(y, 12); |
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
|
342 |
until y > LAND_HEIGHT - 1 - Height - 8; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
343 |
inc(x, getrandom(12) + 12) |
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
|
344 |
until x > LAND_WIDTH - 1 - Width; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
345 |
bRes:= cnt <> 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
346 |
if bRes then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
347 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
348 |
i:= getrandom(cnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
349 |
r.x:= ar[i].X; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
350 |
r.y:= ar[i].Y; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
351 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
352 |
r.h:= Height; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
353 |
SDL_UpperBlit(Obj.Surf, nil, Surface, @r); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
354 |
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
|
355 |
dec(Maxcnt) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
356 |
end else Maxcnt:= 0 |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
357 |
end; |
2695 | 358 |
TryPut:= bRes; |
184 | 359 |
end; |
360 |
||
361 |
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects); |
|
2905 | 362 |
var s: shortstring; |
184 | 363 |
f: textfile; |
371 | 364 |
i, ii: LongInt; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
365 |
c1, c2: TSDL_Color; |
1277 | 366 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
367 |
procedure CheckRect(Width, Height, x, y, w, h: LongWord); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
368 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
369 |
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
|
370 |
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
|
371 |
end; |
1277 | 372 |
|
184 | 373 |
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
|
374 |
|
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
|
375 |
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
|
376 |
|
184 | 377 |
s:= Pathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
378 |
WriteLnToConsole('Reading objects info...'); |
|
351 | 379 |
Assign(f, s); |
184 | 380 |
{$I-} |
2747 | 381 |
filemode:= 0; // readonly |
184 | 382 |
Reset(f); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
383 |
|
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
384 |
// read sky and explosion border colors |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
385 |
Readln(f, c1.r, c1.g, c1. b); |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
386 |
Readln(f, c2.r, c2.g, c2. b); |
1256 | 387 |
// read water gradient colors |
2171
8208946331ba
Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents:
2152
diff
changeset
|
388 |
Readln(f, WaterColorArray[0].r, WaterColorArray[0].g, WaterColorArray[0].b); |
2272
c59656d7b1de
Add water opacity to theme - defaulting to 50% opaque on all themes but Eyes (80%) and Underwater (100%)
nemo
parents:
2171
diff
changeset
|
389 |
Readln(f, WaterColorArray[2].r, WaterColorArray[2].g, WaterColorArray[2].b, cWaterOpacity); |
2171
8208946331ba
Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents:
2152
diff
changeset
|
390 |
WaterColorArray[0].a := 255; |
8208946331ba
Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents:
2152
diff
changeset
|
391 |
WaterColorArray[2].a := 255; |
1911 | 392 |
WaterColorArray[1]:= WaterColorArray[0]; |
393 |
WaterColorArray[3]:= WaterColorArray[2]; |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
394 |
|
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
395 |
glClearColor(c1.r / 255, c1.g / 255, c1.b / 255, 0.99); // sky color |
2592 | 396 |
cExplosionBorderColor:= c2.value or AMask; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
397 |
|
1097 | 398 |
ReadLn(f, s); |
399 |
if MusicFN = '' then MusicFN:= s; |
|
400 |
||
1131
c5b8f2bfa487
- Add ability to choose clouds number in theme config file
unc0rr
parents:
1097
diff
changeset
|
401 |
ReadLn(f, cCloudsNumber); |
c5b8f2bfa487
- Add ability to choose clouds number in theme config file
unc0rr
parents:
1097
diff
changeset
|
402 |
|
1801 | 403 |
// TODO - adjust all the theme cloud numbers. This should not be a permanent fix |
404 |
cCloudsNumber:= cCloudsNumber * (LAND_WIDTH div 2048); |
|
405 |
||
184 | 406 |
Readln(f, ThemeObjects.Count); |
407 |
for i:= 0 to Pred(ThemeObjects.Count) do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
408 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
409 |
Readln(f, s); // filename |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
410 |
with ThemeObjects.objs[i] do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
411 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
412 |
Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + s, ifCritical or ifTransparent or ifIgnoreCaps); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
413 |
Width:= Surf^.w; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
414 |
Height:= Surf^.h; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
415 |
Read(f, Maxcnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
416 |
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
|
417 |
with inland do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
418 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
419 |
Read(f, x, y, w, h); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
420 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
421 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
422 |
Read(f, rectcnt); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
423 |
for ii:= 1 to rectcnt do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
424 |
with outland[ii] do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
425 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
426 |
Read(f, x, y, w, h); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
427 |
CheckRect(Width, Height, x, y, w, h) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
428 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
429 |
ReadLn(f) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
430 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
431 |
end; |
184 | 432 |
|
802
ed5450a89b96
Start implementing 'visual gears' - gears, that don't need to be synchronized (clouds and flakes)
unc0rr
parents:
780
diff
changeset
|
433 |
// sprays |
184 | 434 |
Readln(f, SprayObjects.Count); |
435 |
for i:= 0 to Pred(SprayObjects.Count) do |
|
436 |
begin |
|
437 |
Readln(f, s); // filename |
|
438 |
with SprayObjects.objs[i] do |
|
439 |
begin |
|
2171
8208946331ba
Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents:
2152
diff
changeset
|
440 |
Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + s, ifCritical or ifTransparent or ifIgnoreCaps); |
351 | 441 |
Width:= Surf^.w; |
442 |
Height:= Surf^.h; |
|
184 | 443 |
ReadLn(f, Maxcnt) |
444 |
end; |
|
445 |
end; |
|
802
ed5450a89b96
Start implementing 'visual gears' - gears, that don't need to be synchronized (clouds and flakes)
unc0rr
parents:
780
diff
changeset
|
446 |
|
ed5450a89b96
Start implementing 'visual gears' - gears, that don't need to be synchronized (clouds and flakes)
unc0rr
parents:
780
diff
changeset
|
447 |
// snowflakes |
805 | 448 |
Readln(f, vobCount); |
449 |
if vobCount > 0 then |
|
450 |
Readln(f, vobFramesCount, vobFrameTicks, vobVelocity, vobFallSpeed); |
|
451 |
||
452 |
for i:= 0 to Pred(vobCount) do |
|
1869 | 453 |
AddVisualGear( -cScreenWidth + random(cScreenWidth * 2 + LAND_WIDTH), random(1024+200) - 100 + LAND_HEIGHT, vgtFlake); |
805 | 454 |
|
351 | 455 |
Close(f); |
184 | 456 |
{$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
|
457 |
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
|
458 |
AddProgress; |
184 | 459 |
end; |
460 |
||
2870 | 461 |
procedure AddThemeObjects(var ThemeObjects: TThemeObjects); |
371 | 462 |
var i, ii, t: LongInt; |
184 | 463 |
b: boolean; |
464 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
465 |
if ThemeObjects.Count = 0 then exit; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
466 |
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
|
467 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
468 |
for i:=0 to ThemeObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
469 |
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 |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
470 |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
471 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
472 |
t := getrandom(ThemeObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
473 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
474 |
for i:=0 to ThemeObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
475 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
476 |
ii := (i+t) mod ThemeObjects.Count; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
477 |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
478 |
if ThemeObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
479 |
b := b or TryPut(ThemeObjects.objs[ii]) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
480 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
481 |
until not b; |
184 | 482 |
end; |
483 |
||
2870 | 484 |
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects); |
485 |
var i, ii, t: LongInt; |
|
184 | 486 |
b: boolean; |
487 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
488 |
if SprayObjects.Count = 0 then exit; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
489 |
WriteLnToConsole('Adding spray objects...'); |
2870 | 490 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
491 |
for i:=0 to SprayObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
492 |
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 |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
493 |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
494 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
495 |
t := getrandom(SprayObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
496 |
b := false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
497 |
for i:=0 to SprayObjects.Count do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
498 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
499 |
ii := (i+t) mod SprayObjects.Count; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
500 |
|
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
501 |
if SprayObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
502 |
b := b or TryPut(SprayObjects.objs[ii], Surface) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
503 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
504 |
until not b; |
184 | 505 |
end; |
506 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
507 |
procedure AddObjects(); |
1792 | 508 |
var i, int: Longword; |
184 | 509 |
begin |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
510 |
InitRects; |
1776 | 511 |
if hasGirders then |
512 |
begin |
|
1792 | 513 |
int:= max(playWidth div 8, 256); |
514 |
i:=leftX+int; |
|
515 |
repeat |
|
516 |
AddGirder(i); |
|
517 |
i:=i+int; |
|
518 |
until (i>rightX-int); |
|
1776 | 519 |
end; |
2870 | 520 |
AddThemeObjects(ThemeObjects); |
2705
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
521 |
AddProgress(); |
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
522 |
FreeRects(); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
523 |
end; |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
524 |
|
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
525 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
526 |
begin |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
527 |
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
|
528 |
//AddSprayObjects(Surface, SprayObjects, 12); |
2870 | 529 |
AddSprayObjects(Surface, SprayObjects); |
1186
bf5af791d234
Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents:
1185
diff
changeset
|
530 |
FreeRects |
184 | 531 |
end; |
532 |
||
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
533 |
procedure LoadThemeConfig; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
534 |
begin |
3463 | 535 |
ReadThemeInfo(ThemeObjects, SprayObjects) |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
536 |
end; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
537 |
|
3053 | 538 |
procedure FreeLandObjects(); |
539 |
var i: Longword; |
|
540 |
begin |
|
3463 | 541 |
for i:= 0 to Pred(MAXTHEMEOBJECTS) do |
542 |
begin |
|
543 |
if ThemeObjects.objs[i].Surf <> nil then |
|
544 |
SDL_FreeSurface(ThemeObjects.objs[i].Surf); |
|
545 |
if SprayObjects.objs[i].Surf <> nil then |
|
546 |
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
|
547 |
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
|
548 |
SprayObjects.objs[i].Surf:= nil; |
3463 | 549 |
end; |
3053 | 550 |
end; |
551 |
||
184 | 552 |
end. |