author | Wuzzy <Wuzzy2@mail.ru> |
Thu, 19 Jul 2018 19:35:28 +0200 (2018-07-19) | |
changeset 13518 | d8462cc9d42d |
parent 13506 | bdac56fb6f1a |
child 13838 | 664935d80668 |
permissions | -rw-r--r-- |
184 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 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 |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10015
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
184 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
184 | 21 |
unit uLandObjects; |
22 |
interface |
|
23 |
uses SDLh; |
|
24 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
25 |
procedure AddObjects(); |
3053 | 26 |
procedure FreeLandObjects(); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
27 |
procedure LoadThemeConfig; |
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
28 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline; |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
29 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word); inline; |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
30 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word; Flip: boolean); |
13396 | 31 |
procedure BlitOverlayAndGenerateCollisionInfo(cpX, cpY: Longword; Image: PSDL_Surface); |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
32 |
procedure BlitImageUsingMask(cpX, cpY: Longword; Image, Mask: PSDL_Surface); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
33 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
34 |
procedure SetLand(var LandWord: Word; Pixel: LongWord); inline; |
184 | 35 |
|
36 |
implementation |
|
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
37 |
uses uStore, uConsts, uConsole, uRandom, uSound |
11829 | 38 |
, uTypes, uVariables, uDebug, uUtils |
12847 | 39 |
, uPhysFSLayer, adler32, uRenderUtils; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
40 |
|
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
41 |
const MaxRects = 512; |
184 | 42 |
MAXOBJECTRECTS = 16; |
43 |
MAXTHEMEOBJECTS = 32; |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8028
diff
changeset
|
44 |
cThemeCFGFilename = 'theme.cfg'; |
184 | 45 |
|
13396 | 46 |
type PLongWord = ^LongWord; |
47 |
TRectsArray = array[0..MaxRects] of TSDL_Rect; |
|
7035 | 48 |
PRectArray = ^TRectsArray; |
13396 | 49 |
TThemeObjectOverlay = record |
50 |
Position: TPoint; |
|
51 |
Surf: PSDL_Surface; |
|
52 |
Width, Height: LongWord; |
|
53 |
end; |
|
184 | 54 |
TThemeObject = record |
13396 | 55 |
Name: ShortString; |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
56 |
Surf, Mask: PSDL_Surface; |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
57 |
inland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
58 |
outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
13396 | 59 |
anchors: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect; |
60 |
overlays: array[0..Pred(MAXOBJECTRECTS)] of TThemeObjectOverlay; |
|
61 |
inrectcnt: LongInt; |
|
62 |
outrectcnt: LongInt; |
|
63 |
anchorcnt: LongInt; |
|
64 |
overlaycnt: LongInt; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
65 |
Width, Height: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
66 |
Maxcnt: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
67 |
end; |
184 | 68 |
TThemeObjects = record |
371 | 69 |
Count: LongInt; |
184 | 70 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject; |
71 |
end; |
|
72 |
TSprayObject = record |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
73 |
Surf: PSDL_Surface; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
74 |
Width, Height: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
75 |
Maxcnt: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
76 |
end; |
184 | 77 |
TSprayObjects = record |
371 | 78 |
Count: LongInt; |
184 | 79 |
objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject |
80 |
end; |
|
81 |
||
82 |
var Rects: PRectArray; |
|
83 |
RectCount: Longword; |
|
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
84 |
ThemeObjects: TThemeObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
85 |
SprayObjects: TSprayObjects; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
86 |
|
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
87 |
procedure SetLand(var LandWord: Word; Pixel: LongWord); inline; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
88 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
89 |
// this an if instead of masking colours to avoid confusing map creators |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
90 |
if ((AMask and Pixel) = 0) then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
91 |
LandWord:= 0 |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
92 |
else if Pixel = $FFFFFFFF then // white |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
93 |
LandWord:= lfObject |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
94 |
else if Pixel = AMask then // black |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
95 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
96 |
LandWord:= lfBasic; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
97 |
disableLandBack:= false |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
98 |
end |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
99 |
else if Pixel = (AMask or RMask) then // red |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
100 |
LandWord:= lfIndestructible |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
101 |
else if Pixel = (AMask or BMask) then // blue |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
102 |
LandWord:= lfObject or lfIce |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
103 |
else if Pixel = (AMask or GMask) then // green |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
104 |
LandWord:= lfObject or lfBouncy |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
105 |
end; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
106 |
|
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
107 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline; |
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
108 |
begin |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
109 |
BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, 0, false); |
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
110 |
end; |
10015 | 111 |
|
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
112 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word); inline; |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
113 |
begin |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
114 |
BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, LandFlags, false); |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
115 |
end; |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
116 |
|
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
117 |
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word; Flip: boolean); |
1182
e2e13aa055c1
Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents:
1181
diff
changeset
|
118 |
var p: PLongwordArray; |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
119 |
px, x, y: Longword; |
371 | 120 |
bpp: LongInt; |
184 | 121 |
begin |
122 |
WriteToConsole('Generating collision info... '); |
|
123 |
||
124 |
if SDL_MustLock(Image) then |
|
11512 | 125 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit; |
184 | 126 |
|
351 | 127 |
bpp:= Image^.format^.BytesPerPixel; |
11537 | 128 |
if checkFails(bpp = 4, 'Land object should be 32bit', true) then |
129 |
begin |
|
130 |
if SDL_MustLock(Image) then |
|
131 |
SDL_UnlockSurface(Image); |
|
132 |
end; |
|
1182
e2e13aa055c1
Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents:
1181
diff
changeset
|
133 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
134 |
if Width = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
135 |
Width:= Image^.w; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
136 |
|
351 | 137 |
p:= Image^.pixels; |
13396 | 138 |
|
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
139 |
for y:= 0 to Pred(Image^.h) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
140 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
141 |
for x:= 0 to Pred(Width) do |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
142 |
begin |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
143 |
// map image pixels per line backwards if in flip mode |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
144 |
if Flip then |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
145 |
px:= Pred(Image^.w) - x |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
146 |
else |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
147 |
px:= x; |
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
148 |
|
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
149 |
if (p^[px] and AMask) <> 0 then |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
150 |
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
|
151 |
if (cReducedQuality and rqBlurryLand) = 0 then |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
152 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
153 |
if (LandPixels[cpY + y, cpX + x] = 0) |
13396 | 154 |
or (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255) then |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
155 |
LandPixels[cpY + y, cpX + x]:= p^[px]; |
6534
e6cb8a41b5f4
Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents:
6492
diff
changeset
|
156 |
end |
3595
341e407e3754
partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents:
3524
diff
changeset
|
157 |
else |
8330 | 158 |
if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
159 |
LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[px]; |
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
|
160 |
|
13396 | 161 |
if Land[cpY + y, cpX + x] <= lfAllObjMask then |
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9721
diff
changeset
|
162 |
Land[cpY + y, cpX + x]:= lfObject or LandFlags |
6081
537bbd5c1a62
Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents:
5832
diff
changeset
|
163 |
end; |
11006
cb06b7985261
don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents:
10941
diff
changeset
|
164 |
end; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
165 |
p:= PLongwordArray(@(p^[Image^.pitch shr 2])) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
166 |
end; |
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
167 |
|
184 | 168 |
if SDL_MustLock(Image) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
169 |
SDL_UnlockSurface(Image); |
184 | 170 |
WriteLnToConsole(msgOK) |
171 |
end; |
|
172 |
||
13396 | 173 |
function LerpByte(src, dst: Byte; l: LongWord): LongWord; inline; |
174 |
begin |
|
175 |
LerpByte:= ((255 - l) * src + l * dst) div 255; |
|
176 |
end; |
|
177 |
||
178 |
procedure BlitOverlayAndGenerateCollisionInfo(cpX, cpY: Longword; Image: PSDL_Surface); |
|
179 |
var p: PLongwordArray; |
|
180 |
pLandColor: PLongWord; |
|
181 |
x, y, alpha, color, landColor: LongWord; |
|
182 |
begin |
|
183 |
WriteToConsole('Generating overlay collision info... '); |
|
184 |
||
185 |
if SDL_MustLock(Image) then |
|
186 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit; |
|
187 |
||
188 |
if checkFails(Image^.format^.BytesPerPixel = 4, 'Land object overlay should be 32bit', true) |
|
189 |
and SDL_MustLock(Image) then |
|
190 |
SDL_UnlockSurface(Image); |
|
191 |
||
192 |
p:= Image^.pixels; |
|
193 |
||
194 |
for y:= 0 to Pred(Image^.h) do |
|
195 |
begin |
|
196 |
for x:= 0 to Pred(Image^.w) do |
|
197 |
begin |
|
198 |
color:= p^[x]; |
|
199 |
if (color and AMask) <> 0 then |
|
200 |
begin |
|
201 |
if (cReducedQuality and rqBlurryLand) = 0 then |
|
202 |
pLandColor:= @LandPixels[cpY + y, cpX + x] |
|
203 |
else |
|
204 |
pLandColor:= @LandPixels[(cpY + y) div 2, (cpX + x) div 2]; |
|
205 |
||
206 |
alpha:= (color and AMask) shr AShift; |
|
207 |
if (alpha <> $FF) and (pLandColor^ <> 0) then |
|
208 |
begin |
|
209 |
landColor:= pLandColor^; |
|
210 |
color:= |
|
211 |
(LerpByte((landColor and RMask) shr RShift, (color and RMask) shr RShift, alpha) shl RShift) |
|
212 |
or (LerpByte((landColor and GMask) shr GShift, (color and GMask) shr GShift, alpha) shl GShift) |
|
213 |
or (LerpByte((landColor and BMask) shr BShift, (color and BMask) shr BShift, alpha) shl BShift) |
|
214 |
or (LerpByte(alpha, 255, (landColor and AMask) shr AShift) shl AShift) |
|
215 |
end; |
|
216 |
pLandColor^:= color; |
|
217 |
||
218 |
if Land[cpY + y, cpX + x] <= lfAllObjMask then |
|
219 |
Land[cpY + y, cpX + x]:= lfObject |
|
220 |
end; |
|
221 |
end; |
|
222 |
p:= PLongwordArray(@(p^[Image^.pitch shr 2])) |
|
223 |
end; |
|
224 |
||
225 |
if SDL_MustLock(Image) then |
|
226 |
SDL_UnlockSurface(Image); |
|
227 |
WriteLnToConsole(msgOK) |
|
228 |
end; |
|
229 |
||
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
230 |
procedure BlitImageUsingMask(cpX, cpY: Longword; Image, Mask: PSDL_Surface); |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
231 |
var p, mp: PLongwordArray; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
232 |
x, y: Longword; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
233 |
bpp: LongInt; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
234 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
235 |
WriteToConsole('Generating collision info... '); |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
236 |
|
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
237 |
if SDL_MustLock(Image) then |
11512 | 238 |
if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit; |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
239 |
|
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
240 |
bpp:= Image^.format^.BytesPerPixel; |
11537 | 241 |
if checkFails(bpp = 4, 'Land object should be 32bit', true) then |
242 |
begin |
|
243 |
if SDL_MustLock(Image) then |
|
244 |
SDL_UnlockSurface(Image); |
|
245 |
end; |
|
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
246 |
|
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
247 |
p:= Image^.pixels; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
248 |
mp:= Mask^.pixels; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
249 |
for y:= 0 to Pred(Image^.h) do |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
250 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
251 |
for x:= 0 to Pred(Image^.w) do |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
252 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
253 |
if (cReducedQuality and rqBlurryLand) = 0 then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
254 |
begin |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
255 |
if (LandPixels[cpY + y, cpX + x] = 0) |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
256 |
or (((p^[x] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
257 |
LandPixels[cpY + y, cpX + x]:= p^[x]; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
258 |
end |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
259 |
else |
10015 | 260 |
if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
261 |
LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x]; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
262 |
|
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
263 |
if (Land[cpY + y, cpX + x] <= lfAllObjMask) or (Land[cpY + y, cpX + x] and lfObject <> 0) then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
264 |
SetLand(Land[cpY + y, cpX + x], mp^[x]); |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
265 |
end; |
10131
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
266 |
p:= PLongwordArray(@(p^[Image^.pitch shr 2])); |
4b4a043111f4
- pas2c recognizes typecasts in initialization expressions
unc0rr
parents:
10108
diff
changeset
|
267 |
mp:= PLongwordArray(@(mp^[Mask^.pitch shr 2])) |
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
268 |
end; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
269 |
|
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
270 |
if SDL_MustLock(Image) then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
271 |
SDL_UnlockSurface(Image); |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
272 |
WriteLnToConsole(msgOK) |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
273 |
end; |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
274 |
|
371 | 275 |
procedure AddRect(x1, y1, w1, h1: LongInt); |
184 | 276 |
begin |
351 | 277 |
with Rects^[RectCount] do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
278 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
279 |
x:= x1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
280 |
y:= y1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
281 |
w:= w1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
282 |
h:= h1 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
283 |
end; |
184 | 284 |
inc(RectCount); |
11537 | 285 |
checkFails(RectCount < MaxRects, 'AddRect: overflow', true) |
184 | 286 |
end; |
287 |
||
288 |
procedure InitRects; |
|
289 |
begin |
|
9688 | 290 |
RectCount:= 0; |
291 |
New(Rects) |
|
184 | 292 |
end; |
293 |
||
294 |
procedure FreeRects; |
|
295 |
begin |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
296 |
Dispose(rects) |
184 | 297 |
end; |
298 |
||
371 | 299 |
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean; |
184 | 300 |
var i: Longword; |
2695 | 301 |
res: boolean = false; |
184 | 302 |
begin |
2695 | 303 |
|
184 | 304 |
i:= 0; |
305 |
if RectCount > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
306 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
307 |
with Rects^[i] do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
308 |
res:= (x < x1 + w1) and (x1 < x + w) and (y < y1 + h1) and (y1 < y + h); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
309 |
inc(i) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
310 |
until (i = RectCount) or (res); |
2695 | 311 |
CheckIntersect:= res; |
184 | 312 |
end; |
313 |
||
6492 | 314 |
|
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
315 |
function CountNonZeroz(x, y, h: LongInt): Longword; |
6492 | 316 |
var i: LongInt; |
317 |
lRes: Longword; |
|
318 |
begin |
|
319 |
lRes:= 0; |
|
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
320 |
for i:= y to Pred(y + h) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
321 |
if Land[i, x] <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
322 |
inc(lRes); |
6492 | 323 |
CountNonZeroz:= lRes; |
324 |
end; |
|
325 |
||
13402 | 326 |
procedure ChecksumLandObjectImage(Image: PSDL_Surface); |
327 |
var y: LongInt; |
|
328 |
begin |
|
329 |
if Image = nil then exit; |
|
330 |
||
331 |
if SDL_MustLock(Image) then |
|
332 |
SDL_LockSurface(Image); |
|
333 |
||
334 |
if checkFails(Image^.format^.BytesPerPixel = 4, 'Land object image should be 32bit', true) then |
|
335 |
begin |
|
336 |
if SDL_MustLock(Image) then |
|
337 |
SDL_UnlockSurface(Image); |
|
338 |
exit |
|
339 |
end; |
|
340 |
||
341 |
for y := 0 to Image^.h-1 do |
|
342 |
syncedPixelDigest:= Adler32Update(syncedPixelDigest, @PByteArray(Image^.pixels)^[y*Image^.pitch], Image^.w*4); |
|
343 |
||
344 |
if SDL_MustLock(Image) then |
|
345 |
SDL_UnlockSurface(Image); |
|
346 |
end; |
|
347 |
||
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
348 |
function AddGirder(gX: LongInt; var girSurf: PSDL_Surface): boolean; |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
349 |
var x1, x2, y, k, i, girderHeight: LongInt; |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
350 |
rr: TSDL_Rect; |
2695 | 351 |
bRes: boolean; |
184 | 352 |
begin |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
353 |
if girSurf = nil then |
12597 | 354 |
girSurf:= LoadDataImageAltPath(ptCurrTheme, ptGraphics, 'Girder', ifCritical or ifColorKey or ifIgnoreCaps); |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
355 |
|
13402 | 356 |
ChecksumLandObjectImage(girsurf); |
12716
20dbb3a03e61
extend land digest to all surfaces that could possibly be loaded into Land[] - i.e. ones that impact sync
nemo
parents:
12598
diff
changeset
|
357 |
|
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
358 |
girderHeight:= girSurf^.h; |
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
359 |
|
1792 | 360 |
y:= topY+150; |
184 | 361 |
repeat |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
362 |
inc(y, 24); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
363 |
x1:= gX; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
364 |
x2:= gX; |
2376 | 365 |
|
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
366 |
while (x1 > Longint(leftX)+150) and (CountNonZeroz(x1, y, girderHeight) = 0) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
367 |
dec(x1, 2); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
368 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
369 |
i:= x1 - 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
370 |
repeat |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
371 |
k:= CountNonZeroz(x1, y, girderHeight); |
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
372 |
dec(x1, 2) |
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
373 |
until (x1 < Longint(leftX) + 100) or (k = 0) or (k = girderHeight) or (x1 < i); |
2376 | 374 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
375 |
inc(x1, 2); |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
376 |
if k = girderHeight then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
377 |
begin |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
378 |
while (x2 < (LongInt(rightX) - 100)) and (CountNonZeroz(x2, y, girderHeight) = 0) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
379 |
inc(x2, 2); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
380 |
i:= x2 + 12; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
381 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
382 |
inc(x2, 2); |
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
383 |
k:= CountNonZeroz(x2, y, girderHeight) |
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
384 |
until (x2 >= (LongInt(rightX)-150)) or (k = 0) or (k = girderHeight) or (x2 > i) or (x2 - x1 >= 900); |
8330 | 385 |
|
10941
6f1b2d0dacdf
- Take girder height into account (fix issue #908)
unc0rr
parents:
10878
diff
changeset
|
386 |
if (x2 < (LongInt(rightX) - 100)) and (k = girderHeight) and (x2 - x1 > 200) and (x2 - x1 < 900) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
387 |
and (not CheckIntersect(x1 - 32, y - 64, x2 - x1 + 64, 144)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
388 |
break; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
389 |
end; |
184 | 390 |
x1:= 0; |
1753 | 391 |
until y > (LAND_HEIGHT-125); |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
392 |
|
184 | 393 |
if x1 > 0 then |
2695 | 394 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
395 |
bRes:= true; |
2376 | 396 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
397 |
rr.x:= x1; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
398 |
while rr.x < x2 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
399 |
begin |
10015 | 400 |
if cIce then |
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
401 |
BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, girSurf^.w), girSurf, lfIce) |
6112
7839a2ae90ae
Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents:
6081
diff
changeset
|
402 |
else |
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
403 |
BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, girSurf^.w), girSurf); |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
404 |
inc(rr.x, girSurf^.w); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
405 |
end; |
2376 | 406 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
407 |
AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80); |
2695 | 408 |
end |
409 |
else bRes:= false; |
|
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
410 |
|
2695 | 411 |
AddGirder:= bRes; |
184 | 412 |
end; |
413 |
||
414 |
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
|
415 |
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt; |
2695 | 416 |
bRes: boolean = true; |
184 | 417 |
begin |
418 |
inc(rect.x, dX); |
|
419 |
inc(rect.y, dY); |
|
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
420 |
bx:= rect.x + rect.w; |
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
421 |
by:= rect.y + rect.h; |
184 | 422 |
{$WARNINGS OFF} |
3521
96a502730e81
Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents:
3519
diff
changeset
|
423 |
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
|
424 |
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
|
425 |
while (tmpx <= bx - rect.w div 2 - 1) and bRes do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
426 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
427 |
bRes:= ((rect.y and LAND_HEIGHT_MASK) = 0) and ((by and LAND_HEIGHT_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
428 |
and ((tmpx and LAND_WIDTH_MASK) = 0) and ((tmpx2 and LAND_WIDTH_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
429 |
and (Land[rect.y, tmpx] = Color) and (Land[by, tmpx] = Color) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
430 |
and (Land[rect.y, tmpx2] = Color) and (Land[by, tmpx2] = Color); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
431 |
inc(tmpx); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
432 |
dec(tmpx2) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
433 |
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
|
434 |
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
|
435 |
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
|
436 |
while (tmpy <= by - rect.h div 2 - 1) and bRes do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
437 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
438 |
bRes:= ((tmpy and LAND_HEIGHT_MASK) = 0) and ((tmpy2 and LAND_HEIGHT_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
439 |
and ((rect.x and LAND_WIDTH_MASK) = 0) and ((bx and LAND_WIDTH_MASK) = 0) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
440 |
and (Land[tmpy, rect.x] = Color) and (Land[tmpy, bx] = Color) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
441 |
and (Land[tmpy2, rect.x] = Color) and (Land[tmpy2, bx] = Color); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
442 |
inc(tmpy); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
443 |
dec(tmpy2) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
444 |
end; |
184 | 445 |
{$WARNINGS ON} |
2695 | 446 |
CheckLand:= bRes; |
184 | 447 |
end; |
448 |
||
13396 | 449 |
function CheckLandAny(rect: TSDL_Rect; dX, dY, LandType: Longword): boolean; |
450 |
var tmpx, tmpy, bx, by: LongInt; |
|
451 |
begin |
|
452 |
inc(rect.x, dX); |
|
453 |
inc(rect.y, dY); |
|
454 |
bx:= rect.x + rect.w - 1; |
|
455 |
by:= rect.y + rect.h - 1; |
|
456 |
CheckLandAny:= false; |
|
457 |
||
458 |
if (((rect.x and LAND_WIDTH_MASK) or (bx and LAND_WIDTH_MASK) or |
|
459 |
(rect.y and LAND_HEIGHT_MASK) or (by and LAND_HEIGHT_MASK)) = 0) then |
|
460 |
begin |
|
461 |
for tmpx := rect.x to bx do |
|
462 |
begin |
|
463 |
if (((Land[rect.y, tmpx] and LandType) or (Land[by, tmpx] and LandType)) <> 0) then |
|
464 |
begin |
|
465 |
CheckLandAny := true; |
|
466 |
exit; |
|
467 |
end |
|
468 |
end; |
|
469 |
for tmpy := rect.y to by do |
|
470 |
begin |
|
471 |
if (((Land[tmpy, rect.x] and LandType) or (Land[tmpy, bx] and LandType)) <> 0) then |
|
472 |
begin |
|
473 |
CheckLandAny := true; |
|
474 |
exit; |
|
475 |
end |
|
476 |
end; |
|
477 |
end; |
|
478 |
end; |
|
479 |
||
184 | 480 |
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean; |
481 |
var i: Longword; |
|
13396 | 482 |
bRes, anchored: boolean; |
483 |
overlayP1, overlayP2: TPoint; |
|
184 | 484 |
begin |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
485 |
with Obj do begin |
2695 | 486 |
bRes:= true; |
13396 | 487 |
i:= 0; |
488 |
while bRes and (i < overlaycnt) do |
|
489 |
begin |
|
490 |
overlayP1.x:= overlays[i].Position.x + x; |
|
491 |
overlayP1.y:= overlays[i].Position.y + y; |
|
492 |
overlayP2.x:= overlayP1.x + overlays[i].Width - 1; |
|
493 |
overlayP2.y:= overlayP1.y + overlays[i].Height - 1; |
|
494 |
bRes:= (((LAND_WIDTH_MASK and overlayP1.x) or (LAND_HEIGHT_MASK and overlayP1.y) or |
|
495 |
(LAND_WIDTH_MASK and overlayP2.x) or (LAND_HEIGHT_MASK and overlayP2.y)) = 0) |
|
496 |
and (not CheckIntersect(overlayP1.x, overlayP1.y, overlays[i].Width, overlays[i].Height)); |
|
497 |
inc(i) |
|
498 |
end; |
|
499 |
||
500 |
i:= 0; |
|
501 |
while bRes and (i < inrectcnt) do |
|
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
502 |
begin |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
503 |
bRes:= CheckLand(inland[i], x, y, lfBasic); |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
504 |
inc(i) |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
505 |
end; |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
506 |
|
13396 | 507 |
i:= 0; |
508 |
while bRes and (i < outrectcnt) do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
509 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
510 |
bRes:= CheckLand(outland[i], x, y, 0); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
511 |
inc(i) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
512 |
end; |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
513 |
|
2695 | 514 |
if bRes then |
13396 | 515 |
begin |
516 |
anchored:= anchorcnt = 0; |
|
517 |
for i:= 1 to anchorcnt do |
|
518 |
begin |
|
519 |
anchored := CheckLandAny(anchors[i], x, y, lfLandMask); |
|
520 |
if anchored then break; |
|
521 |
end; |
|
522 |
bRes:= anchored; |
|
523 |
end; |
|
524 |
||
525 |
if bRes then |
|
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
526 |
bRes:= not CheckIntersect(x, y, Width, Height); |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
527 |
|
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
528 |
CheckCanPlace:= bRes; |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
529 |
end |
184 | 530 |
end; |
531 |
||
9688 | 532 |
function TryPut(var Obj: TThemeObject): boolean; |
184 | 533 |
const MaxPointsIndex = 2047; |
534 |
var x, y: Longword; |
|
535 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
13396 | 536 |
cnt, i, ii: Longword; |
2695 | 537 |
bRes: boolean; |
184 | 538 |
begin |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
539 |
TryPut:= false; |
184 | 540 |
cnt:= 0; |
541 |
with Obj do |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
542 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
543 |
if Maxcnt = 0 then |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
544 |
exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
545 |
x:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
546 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
547 |
y:= topY+32; // leave room for a hedgie to teleport in |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
548 |
repeat |
12173
666e18b1ca32
Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents:
12102
diff
changeset
|
549 |
|
13396 | 550 |
if (inrectcnt > 0) and (inland[0].x = 0) and (inland[0].y = 0) and (inland[0].w = 0) and (inland[0].h = 0) then |
12173
666e18b1ca32
Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents:
12102
diff
changeset
|
551 |
y := LAND_HEIGHT - Height; |
666e18b1ca32
Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents:
12102
diff
changeset
|
552 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
553 |
if CheckCanPlace(x, y, Obj) then |
184 | 554 |
begin |
555 |
ar[cnt].x:= x; |
|
556 |
ar[cnt].y:= y; |
|
9688 | 557 |
if cnt >= MaxPointsIndex then // buffer is full, do not check the rest land |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
558 |
begin |
10490 | 559 |
y:= LAND_HEIGHT; |
560 |
x:= LAND_WIDTH; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
561 |
end |
9688 | 562 |
else inc(cnt); |
184 | 563 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
564 |
inc(y, 3); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
565 |
until y >= LAND_HEIGHT - Height; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
566 |
inc(x, getrandom(6) + 3) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
567 |
until x >= LAND_WIDTH - Width; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
568 |
bRes:= cnt <> 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
569 |
if bRes then |
184 | 570 |
begin |
571 |
i:= getrandom(cnt); |
|
8848
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
572 |
if Obj.Mask <> nil then |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
573 |
BlitImageUsingMask(ar[i].x, ar[i].y, Obj.Surf, Obj.Mask) |
e9ebd63f8a03
So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents:
8751
diff
changeset
|
574 |
else BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf); |
184 | 575 |
AddRect(ar[i].x, ar[i].y, Width, Height); |
13396 | 576 |
|
577 |
ii:= 0; |
|
578 |
while ii < overlaycnt do |
|
579 |
begin |
|
580 |
BlitOverlayAndGenerateCollisionInfo( |
|
581 |
ar[i].x + overlays[ii].Position.X, |
|
582 |
ar[i].y + overlays[ii].Position.Y, overlays[ii].Surf); |
|
583 |
AddRect(ar[i].x + overlays[ii].Position.X, |
|
584 |
ar[i].y + overlays[ii].Position.Y, |
|
585 |
Width, Height); |
|
586 |
inc(ii); |
|
587 |
end; |
|
184 | 588 |
dec(Maxcnt) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
589 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
590 |
else Maxcnt:= 0 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
591 |
end; |
2695 | 592 |
TryPut:= bRes; |
184 | 593 |
end; |
594 |
||
9688 | 595 |
function TryPut2(var Obj: TSprayObject; Surface: PSDL_Surface): boolean; |
184 | 596 |
const MaxPointsIndex = 8095; |
597 |
var x, y: Longword; |
|
598 |
ar: array[0..MaxPointsIndex] of TPoint; |
|
599 |
cnt, i: Longword; |
|
600 |
r: TSDL_Rect; |
|
2695 | 601 |
bRes: boolean; |
184 | 602 |
begin |
9688 | 603 |
TryPut2:= false; |
184 | 604 |
cnt:= 0; |
605 |
with Obj do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
606 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
607 |
if Maxcnt = 0 then |
6990
40e5af28d026
change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents:
6986
diff
changeset
|
608 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
609 |
x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
610 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
611 |
r.y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
612 |
r.w:= Width; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
613 |
r.h:= Height + 16; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
614 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
615 |
y:= 8; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
616 |
repeat |
3519 | 617 |
if CheckLand(r, x, y - 8, lfBasic) |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6305
diff
changeset
|
618 |
and (not CheckIntersect(x, y, Width, Height)) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
619 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
620 |
ar[cnt].x:= x; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
621 |
ar[cnt].y:= y; |
9688 | 622 |
if cnt >= MaxPointsIndex then // buffer is full, do not check the rest land |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
623 |
begin |
9688 | 624 |
y:= $FF000000; |
625 |
x:= $FF000000; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
626 |
end |
9688 | 627 |
else inc(cnt); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
628 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
629 |
inc(y, 12); |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
630 |
until y >= LAND_HEIGHT - Height - 8; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
631 |
inc(x, getrandom(12) + 12) |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
3976
diff
changeset
|
632 |
until x >= LAND_WIDTH - Width; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
633 |
bRes:= cnt <> 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
634 |
if bRes then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
635 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
636 |
i:= getrandom(cnt); |
12847 | 637 |
copyToXY(Obj.Surf, Surface, ar[i].X, ar[i].Y); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
638 |
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
|
639 |
dec(Maxcnt) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
640 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
641 |
else Maxcnt:= 0 |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
642 |
end; |
9688 | 643 |
TryPut2:= bRes; |
184 | 644 |
end; |
645 |
||
6492 | 646 |
|
647 |
procedure CheckRect(Width, Height, x, y, w, h: LongWord); |
|
648 |
begin |
|
8330 | 649 |
if (x + w > Width) then |
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
650 |
OutError('Broken theme. Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true); |
8330 | 651 |
if (y + h > Height) then |
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
652 |
OutError('Broken theme. Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true); |
6492 | 653 |
end; |
654 |
||
13396 | 655 |
procedure ReadRect(var rect: TSDL_Rect; var s: ShortString); |
656 |
var i: LongInt; |
|
657 |
begin |
|
658 |
with rect do |
|
659 |
begin |
|
660 |
i:= Pos(',', s); |
|
661 |
x:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
662 |
Delete(s, 1, i); |
|
663 |
i:= Pos(',', s); |
|
664 |
y:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
665 |
Delete(s, 1, i); |
|
666 |
i:= Pos(',', s); |
|
667 |
w:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
668 |
Delete(s, 1, i); |
|
669 |
i:= Pos(',', s); |
|
670 |
if i = 0 then i:= Succ(Length(S)); |
|
671 |
h:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
672 |
Delete(s, 1, i); |
|
673 |
end; |
|
674 |
end; |
|
675 |
||
676 |
||
677 |
||
678 |
procedure ReadOverlay(var overlay: TThemeObjectOverlay; var s: ShortString); |
|
679 |
var i: LongInt; |
|
680 |
begin |
|
681 |
with overlay do |
|
682 |
begin |
|
683 |
i:= Pos(',', s); |
|
684 |
Position.X:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
685 |
Delete(s, 1, i); |
|
686 |
i:= Pos(',', s); |
|
687 |
Position.Y:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
688 |
Delete(s, 1, i); |
|
689 |
i:= Pos(',', s); |
|
690 |
if i = 0 then i:= Succ(Length(S)); |
|
691 |
Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifColorKey or ifIgnoreCaps or ifCritical); |
|
692 |
Width:= Surf^.w; |
|
693 |
Height:= Surf^.h; |
|
694 |
Delete(s, 1, i); |
|
13402 | 695 |
ChecksumLandObjectImage(Surf); |
13396 | 696 |
end; |
697 |
end; |
|
698 |
||
184 | 699 |
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects); |
13396 | 700 |
var s, key, nameRef: shortstring; |
8028 | 701 |
f: PFSFile; |
13406
40235ccf8d6d
Remove unused variable in uLandObjects
Wuzzy <Wuzzy2@mail.ru>
parents:
13402
diff
changeset
|
702 |
i: LongInt; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
703 |
ii, t: Longword; |
5832
f730c8a9777b
Remove some unused variables and options.inc which uFloat doesn't use, probably should never use, and was getting in the way of my testcase - but most importantly, remove the inline on hwSqrt which was causing very bad math on my compiler/machine. We may have to remove more inlining. A pity.
nemo
parents:
5689
diff
changeset
|
704 |
c2: TSDL_Color; |
184 | 705 |
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
|
706 |
|
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
|
707 |
AddProgress; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
708 |
// Set default water greyscale values |
6982 | 709 |
if GrayScale then |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
710 |
begin |
10325 | 711 |
for i:= Low(SDWaterColorArray) to High(SDWaterColorArray) do |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
712 |
begin |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
713 |
t:= round(SDWaterColorArray[i].r * RGB_LUMINANCE_RED + SDWaterColorArray[i].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[i].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
714 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
715 |
t:= 255; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
716 |
SDWaterColorArray[i].r:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
717 |
SDWaterColorArray[i].g:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
718 |
SDWaterColorArray[i].b:= t |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
719 |
end; |
10325 | 720 |
for i:= Low(WaterColorArray) to High(WaterColorArray) do |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
721 |
begin |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
722 |
t:= round(WaterColorArray[i].r * RGB_LUMINANCE_RED + WaterColorArray[i].g * RGB_LUMINANCE_GREEN + WaterColorArray[i].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
723 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
724 |
t:= 255; |
6305
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
725 |
WaterColorArray[i].r:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
726 |
WaterColorArray[i].g:= t; |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
727 |
WaterColorArray[i].b:= t |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
728 |
end |
5f7480c2a08d
Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents:
6303
diff
changeset
|
729 |
end; |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
730 |
|
8025 | 731 |
s:= cPathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
184 | 732 |
WriteLnToConsole('Reading objects info...'); |
8028 | 733 |
f:= pfsOpenRead(s); |
13489
480ea997036b
Send proper failure error message when image loading has failed
Wuzzy <Wuzzy2@mail.ru>
parents:
13406
diff
changeset
|
734 |
if (f = nil) then |
480ea997036b
Send proper failure error message when image loading has failed
Wuzzy <Wuzzy2@mail.ru>
parents:
13406
diff
changeset
|
735 |
OutError('Error loading theme. File could not be opened: ' + s, true); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
736 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
737 |
ThemeObjects.Count:= 0; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
738 |
SprayObjects.Count:= 0; |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
739 |
|
11544 | 740 |
while (not pfsEOF(f)) and allOK do |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
741 |
begin |
8028 | 742 |
pfsReadLn(f, s); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
743 |
if Length(s) = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
744 |
continue; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
745 |
if s[1] = ';' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
746 |
continue; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
747 |
|
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
748 |
i:= Pos('=', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
749 |
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
|
750 |
Delete(s, 1, i); |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
751 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
752 |
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
|
753 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
754 |
i:= Pos(',', s); |
5654 | 755 |
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
|
756 |
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
|
757 |
i:= Pos(',', s); |
5654 | 758 |
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
|
759 |
Delete(s, 1, i); |
5654 | 760 |
SkyColor.b:= StrToInt(Trim(s)); |
6982 | 761 |
if GrayScale |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
762 |
then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
763 |
begin |
5654 | 764 |
t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
765 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
766 |
t:= 255; |
5654 | 767 |
SkyColor.r:= t; |
768 |
SkyColor.g:= t; |
|
769 |
SkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
770 |
end; |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
771 |
SetSkyColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255); |
5689
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
772 |
SDSkyColor.r:= SkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
773 |
SDSkyColor.g:= SkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
774 |
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
|
775 |
end |
11900
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
776 |
else if key = 'sd-tint' then |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
777 |
begin |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
778 |
i:= Pos(',', s); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
779 |
SDTint.r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
780 |
Delete(s, 1, i); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
781 |
i:= Pos(',', s); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
782 |
SDTint.g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
783 |
Delete(s, 1, i); |
12102
ebe87b6ed182
add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents:
11900
diff
changeset
|
784 |
i:= Pos(',', s); |
ebe87b6ed182
add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents:
11900
diff
changeset
|
785 |
SDTint.b:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
ebe87b6ed182
add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents:
11900
diff
changeset
|
786 |
Delete(s, 1, i); |
ebe87b6ed182
add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents:
11900
diff
changeset
|
787 |
SDTint.a:= StrToInt(Trim(s)); |
11900
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
788 |
if GrayScale |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
789 |
then |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
790 |
begin |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
791 |
t:= round(SDTint.r * RGB_LUMINANCE_RED + SDTint.g * RGB_LUMINANCE_GREEN + SDTint.b * RGB_LUMINANCE_BLUE); |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
792 |
if t > 255 then |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
793 |
t:= 255; |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
794 |
SDTint.r:= t; |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
795 |
SDTint.g:= t; |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
796 |
SDTint.b:= t |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
797 |
end; |
19cb0de79287
Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents:
11876
diff
changeset
|
798 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
799 |
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
|
800 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
801 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
802 |
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
|
803 |
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
|
804 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
805 |
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
|
806 |
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
|
807 |
c2.b:= StrToInt(Trim(s)); |
6982 | 808 |
if GrayScale then |
6303 | 809 |
begin |
810 |
t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
811 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
812 |
t:= 255; |
6303 | 813 |
c2.r:= t; |
814 |
c2.g:= t; |
|
815 |
c2.b:= t |
|
816 |
end; |
|
10877 | 817 |
ExplosionBorderColorR:= c2.r; |
818 |
ExplosionBorderColorG:= c2.g; |
|
819 |
ExplosionBorderColorB:= c2.b; |
|
10878 | 820 |
ExplosionBorderColorNoA:= |
821 |
(c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift); |
|
822 |
ExplosionBorderColor:= ExplosionBorderColorNoA or AMask; |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
823 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
824 |
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
|
825 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
826 |
i:= Pos(',', s); |
10325 | 827 |
WaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
828 |
Delete(s, 1, i); |
|
829 |
i:= Pos(',', s); |
|
830 |
WaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
831 |
Delete(s, 1, i); |
|
832 |
WaterColorArray[1].b:= StrToInt(Trim(s)); |
|
833 |
WaterColorArray[1].a := 255; |
|
834 |
if GrayScale then |
|
835 |
begin |
|
836 |
t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
|
837 |
if t > 255 then |
|
838 |
t:= 255; |
|
839 |
WaterColorArray[1].r:= t; |
|
840 |
WaterColorArray[1].g:= t; |
|
841 |
WaterColorArray[1].b:= t |
|
842 |
end; |
|
843 |
WaterColorArray[3]:= WaterColorArray[1]; |
|
844 |
WaterColorArray[5]:= WaterColorArray[1]; |
|
845 |
WaterColorArray[7]:= WaterColorArray[1]; |
|
846 |
end |
|
847 |
else if key = 'water-bottom' then |
|
848 |
begin |
|
849 |
i:= Pos(',', s); |
|
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
850 |
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
|
851 |
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
|
852 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
853 |
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
|
854 |
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
|
855 |
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
|
856 |
WaterColorArray[0].a := 255; |
6982 | 857 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
858 |
begin |
10325 | 859 |
t:= round(WaterColorArray[2].r * RGB_LUMINANCE_RED + WaterColorArray[2].g * RGB_LUMINANCE_GREEN + WaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
860 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
861 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
862 |
WaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
863 |
WaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
864 |
WaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
865 |
end; |
10325 | 866 |
WaterColorArray[2]:= WaterColorArray[0]; |
867 |
WaterColorArray[4]:= WaterColorArray[0]; |
|
868 |
WaterColorArray[6]:= WaterColorArray[0]; |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
869 |
end |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
870 |
else if key = 'water-opacity' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
871 |
begin |
6982 | 872 |
WaterOpacity:= StrToInt(Trim(s)); |
873 |
SDWaterOpacity:= WaterOpacity |
|
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
874 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
875 |
else if key = 'music' then |
10254 | 876 |
MusicFN:= Trim(s) |
877 |
else if key = 'sd-music' then |
|
878 |
SDMusicFN:= Trim(s) |
|
12920 | 879 |
else if key = 'fallback-music' then |
880 |
FallbackMusicFN:= Trim(s) |
|
881 |
else if key = 'fallback-sd-music' then |
|
882 |
FallbackSDMusicFN:= 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
|
883 |
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
|
884 |
begin |
7543
a0dc770538e1
Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents:
7069
diff
changeset
|
885 |
cCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096; |
4792
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4782
diff
changeset
|
886 |
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
|
887 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
888 |
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
|
889 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
890 |
inc(ThemeObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
891 |
with ThemeObjects.objs[Pred(ThemeObjects.Count)] do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
892 |
begin |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
893 |
i:= Pos(',', s); |
13396 | 894 |
Name:= Trim(Copy(s, 1, Pred(i))); |
895 |
Surf:= LoadDataImage(ptCurrTheme, Name, ifColorKey or ifIgnoreCaps or ifCritical); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
896 |
Width:= Surf^.w; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
897 |
Height:= Surf^.h; |
12597 | 898 |
Mask:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i)))+'_mask', ifColorKey or ifIgnoreCaps); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
899 |
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
|
900 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
901 |
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
|
902 |
Delete(s, 1, i); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
903 |
if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then |
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
904 |
OutError('Broken theme. Object''s max. count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true); |
13402 | 905 |
ChecksumLandObjectImage(Surf); |
906 |
ChecksumLandObjectImage(Mask); |
|
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
907 |
|
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
908 |
inrectcnt := 0; |
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
909 |
|
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
910 |
for ii := 1 to Length(S) do |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
911 |
if S[ii] = ',' then |
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
912 |
inc(inrectcnt); |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
913 |
|
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
914 |
if inrectcnt mod 2 = 0 then |
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
915 |
inrectcnt := 1 |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
916 |
else begin |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
917 |
i:= Pos(',', s); |
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
918 |
inrectcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
919 |
Delete(s, 1, i); |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
920 |
end; |
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
921 |
|
13396 | 922 |
if inrectcnt > MAXOBJECTRECTS then |
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
923 |
OutError('Broken theme. Object''s inland rectangle count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(inrectcnt) +').', true); |
13396 | 924 |
|
925 |
for ii:= 0 to Pred(inrectcnt) do |
|
926 |
ReadRect(inland[ii], s); |
|
11875
b801ff99e52c
support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents:
11829
diff
changeset
|
927 |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
928 |
i:= Pos(',', s); |
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
929 |
outrectcnt:= 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
|
930 |
Delete(s, 1, i); |
13396 | 931 |
|
932 |
if outrectcnt > MAXOBJECTRECTS then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
933 |
OutError('Broken theme. Object''s outland rectangle count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(outrectcnt) +').', true); |
11876
9e0b20330d05
rename variables for better code-readability and fix indentation
sheepluva
parents:
11875
diff
changeset
|
934 |
|
13396 | 935 |
for ii:= 0 to Pred(outrectcnt) do |
936 |
ReadRect(outland[ii], s); |
|
937 |
end; |
|
938 |
end |
|
939 |
else if key = 'anchors' then |
|
940 |
begin |
|
941 |
i:= Pos(',', s); |
|
942 |
nameRef:= Trim(Copy(s, 1, Pred(i))); |
|
943 |
for ii:= 0 to Pred(ThemeObjects.Count) do |
|
944 |
if ThemeObjects.objs[ii].Name = nameRef then with ThemeObjects.objs[ii] do |
|
945 |
begin |
|
946 |
if anchorcnt <> 0 then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
947 |
OutError('Broken theme. Duplicate anchors declaration for object ' + nameRef, true); |
13396 | 948 |
Delete(s, 1, i); |
949 |
i:= Pos(',', s); |
|
950 |
anchorcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
951 |
Delete(s, 1, i); |
|
952 |
if anchorcnt > MAXOBJECTRECTS then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
953 |
OutError('Broken theme. Object''s anchor rectangle count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(anchorcnt) +').', true); |
13396 | 954 |
for t:= 0 to Pred(anchorcnt) do |
955 |
ReadRect(anchors[t], s); |
|
956 |
break |
|
957 |
end; |
|
958 |
end |
|
959 |
else if key = 'overlays' then |
|
960 |
begin |
|
961 |
i:= Pos(',', s); |
|
962 |
nameRef:= Trim(Copy(s, 1, Pred(i))); |
|
963 |
for ii:= 0 to Pred(ThemeObjects.Count) do |
|
964 |
if ThemeObjects.objs[ii].Name = nameRef then with ThemeObjects.objs[ii] do |
|
965 |
begin |
|
966 |
if overlaycnt <> 0 then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
967 |
OutError('Broken theme. Duplicate overlays declaration for object ' + nameRef, true); |
13396 | 968 |
Delete(s, 1, i); |
969 |
i:= Pos(',', s); |
|
970 |
overlaycnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
971 |
Delete(s, 1, i); |
|
972 |
if overlaycnt > MAXOBJECTRECTS then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13489
diff
changeset
|
973 |
OutError('Broken theme. Object''s overlay count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(overlaycnt) +').', true); |
13396 | 974 |
for t:= 0 to Pred(overlaycnt) do |
975 |
ReadOverlay(overlays[t], s); |
|
976 |
break |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
977 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
978 |
end |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
979 |
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
|
980 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
981 |
inc(SprayObjects.Count); |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
982 |
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
|
983 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
984 |
i:= Pos(',', s); |
12598 | 985 |
Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifAlpha or ifIgnoreCaps); |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
986 |
Width:= Surf^.w; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
987 |
Height:= Surf^.h; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
988 |
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
|
989 |
Maxcnt:= StrToInt(Trim(s)); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
990 |
end; |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
991 |
end |
12194 | 992 |
else if key = 'water-animation' then |
993 |
begin |
|
994 |
i:= Pos(',', s); |
|
995 |
watFrames:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
996 |
Delete(s, 1, i); |
|
997 |
i:= Pos(',', s); |
|
998 |
watFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
999 |
Delete(s, 1, i); |
|
12195 | 1000 |
watMove:= StrToInt(Trim(s)); |
12194 | 1001 |
end |
1002 |
else if key = 'sd-water-animation' then |
|
1003 |
begin |
|
1004 |
i:= Pos(',', s); |
|
1005 |
watSDFrames:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
1006 |
Delete(s, 1, i); |
|
1007 |
i:= Pos(',', s); |
|
1008 |
watSDFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
1009 |
Delete(s, 1, i); |
|
12195 | 1010 |
watSDMove:= StrToInt(Trim(s)); |
12194 | 1011 |
end |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1012 |
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
|
1013 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1014 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1015 |
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
|
1016 |
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
|
1017 |
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
|
1018 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1019 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1020 |
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
|
1021 |
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
|
1022 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1023 |
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
|
1024 |
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
|
1025 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1026 |
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
|
1027 |
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
|
1028 |
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
|
1029 |
end; |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1030 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1031 |
else if key = 'flatten-flakes' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1032 |
cFlattenFlakes:= true |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1033 |
else if key = 'flatten-clouds' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1034 |
cFlattenClouds:= true |
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9721
diff
changeset
|
1035 |
else if key = 'ice' then |
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9721
diff
changeset
|
1036 |
cIce:= true |
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9721
diff
changeset
|
1037 |
else if key = 'snow' then |
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9721
diff
changeset
|
1038 |
cSnow:= true |
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1039 |
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
|
1040 |
begin |
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1041 |
i:= Pos(',', s); |
10325 | 1042 |
SDWaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
1043 |
Delete(s, 1, i); |
|
1044 |
i:= Pos(',', s); |
|
1045 |
SDWaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
|
1046 |
Delete(s, 1, i); |
|
1047 |
SDWaterColorArray[1].b:= StrToInt(Trim(s)); |
|
1048 |
SDWaterColorArray[1].a := 255; |
|
1049 |
if GrayScale then |
|
1050 |
begin |
|
1051 |
t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE); |
|
1052 |
if t > 255 then |
|
1053 |
t:= 255; |
|
1054 |
SDWaterColorArray[1].r:= t; |
|
1055 |
SDWaterColorArray[1].g:= t; |
|
1056 |
SDWaterColorArray[1].b:= t |
|
1057 |
end; |
|
1058 |
SDWaterColorArray[3]:= SDWaterColorArray[1]; |
|
1059 |
SDWaterColorArray[5]:= SDWaterColorArray[1]; |
|
1060 |
SDWaterColorArray[7]:= SDWaterColorArray[1]; |
|
1061 |
end |
|
1062 |
else if key = 'sd-water-bottom' then |
|
1063 |
begin |
|
1064 |
i:= Pos(',', s); |
|
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1065 |
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
|
1066 |
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
|
1067 |
i:= Pos(',', s); |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1068 |
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
|
1069 |
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
|
1070 |
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
|
1071 |
SDWaterColorArray[0].a := 255; |
6982 | 1072 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1073 |
begin |
10325 | 1074 |
t:= round(SDWaterColorArray[2].r * RGB_LUMINANCE_RED + SDWaterColorArray[2].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[2].b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1075 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1076 |
t:= 255; |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1077 |
SDWaterColorArray[0].r:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1078 |
SDWaterColorArray[0].g:= t; |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1079 |
SDWaterColorArray[0].b:= t |
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1080 |
end; |
10325 | 1081 |
SDWaterColorArray[2]:= SDWaterColorArray[0]; |
1082 |
SDWaterColorArray[4]:= SDWaterColorArray[0]; |
|
1083 |
SDWaterColorArray[6]:= SDWaterColorArray[0]; |
|
4782
603916ddf4b6
added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents:
4669
diff
changeset
|
1084 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1085 |
else if key = 'sd-water-opacity' then |
6982 | 1086 |
SDWaterOpacity:= StrToInt(Trim(s)) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1087 |
else if key = 'sd-clouds' then |
7543
a0dc770538e1
Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents:
7069
diff
changeset
|
1088 |
cSDCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096 |
4806
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1089 |
else if key = 'sd-flakes' then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1090 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1091 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1092 |
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
|
1093 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1094 |
if vobSDCount > 0 then |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1095 |
begin |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1096 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1097 |
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
|
1098 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1099 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1100 |
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
|
1101 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1102 |
i:= Pos(',', s); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1103 |
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
|
1104 |
Delete(s, 1, i); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1105 |
vobSDFallSpeed:= StrToInt(Trim(s)); |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1106 |
end; |
48c1a395f0a7
added flake configuration also in sudden death and SDClouds for underwater
Henek
parents:
4792
diff
changeset
|
1107 |
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
|
1108 |
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
|
1109 |
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
|
1110 |
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
|
1111 |
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
|
1112 |
i:= Pos(',', s); |
5654 | 1113 |
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
|
1114 |
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
|
1115 |
i:= Pos(',', s); |
5654 | 1116 |
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
|
1117 |
Delete(s, 1, i); |
5654 | 1118 |
RQSkyColor.b:= StrToInt(Trim(s)); |
6982 | 1119 |
if GrayScale then |
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1120 |
begin |
5654 | 1121 |
t:= round(RQSkyColor.r * RGB_LUMINANCE_RED + RQSkyColor.g * RGB_LUMINANCE_GREEN + RQSkyColor.b * RGB_LUMINANCE_BLUE); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1122 |
if t > 255 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1123 |
t:= 255; |
5654 | 1124 |
RQSkyColor.r:= t; |
1125 |
RQSkyColor.g:= t; |
|
1126 |
RQSkyColor.b:= t |
|
5441
39962b855540
Add grayscale option for 3d, helps with colour clashing
nemo
parents:
5240
diff
changeset
|
1127 |
end; |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9080
diff
changeset
|
1128 |
SetSkyColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255); |
5689
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
1129 |
SDSkyColor.r:= RQSkyColor.r; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
1130 |
SDSkyColor.g:= RQSkyColor.g; |
48ef34701751
Fix rounding error in sky colour causing visible lines
nemo
parents:
5654
diff
changeset
|
1131 |
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
|
1132 |
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
|
1133 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1134 |
end; |
184 | 1135 |
|
8028 | 1136 |
pfsClose(f); |
2671
7e0f88013fe8
smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents:
2647
diff
changeset
|
1137 |
AddProgress; |
184 | 1138 |
end; |
1139 |
||
2870 | 1140 |
procedure AddThemeObjects(var ThemeObjects: TThemeObjects); |
371 | 1141 |
var i, ii, t: LongInt; |
184 | 1142 |
b: boolean; |
1143 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1144 |
if ThemeObjects.Count = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1145 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1146 |
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
|
1147 |
|
9688 | 1148 |
for i:=0 to Pred(ThemeObjects.Count) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1149 |
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 | 1150 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1151 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1152 |
t := getrandom(ThemeObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1153 |
b := false; |
9688 | 1154 |
for i:= 0 to Pred(ThemeObjects.Count) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1155 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1156 |
ii := (i+t) mod ThemeObjects.Count; |
3697 | 1157 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1158 |
if ThemeObjects.objs[ii].Maxcnt <> 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1159 |
b := b or TryPut(ThemeObjects.objs[ii]) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1160 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1161 |
until not b; |
184 | 1162 |
end; |
1163 |
||
2870 | 1164 |
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects); |
1165 |
var i, ii, t: LongInt; |
|
184 | 1166 |
b: boolean; |
1167 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1168 |
if SprayObjects.Count = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1169 |
exit; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1170 |
WriteLnToConsole('Adding spray objects...'); |
2870 | 1171 |
|
9688 | 1172 |
for i:= 0 to Pred(SprayObjects.Count) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1173 |
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 | 1174 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1175 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1176 |
t := getrandom(SprayObjects.Count); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1177 |
b := false; |
9688 | 1178 |
for i:= 0 to Pred(SprayObjects.Count) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1179 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1180 |
ii := (i+t) mod SprayObjects.Count; |
3697 | 1181 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1182 |
if SprayObjects.objs[ii].Maxcnt <> 0 then |
9688 | 1183 |
b := b or TryPut2(SprayObjects.objs[ii], Surface) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1184 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
1185 |
until not b; |
184 | 1186 |
end; |
1187 |
||
1180
e56317fdf78d
Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents:
1156
diff
changeset
|
1188 |
procedure AddObjects(); |
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1189 |
var girSurf: PSDL_Surface; |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1190 |
i, g: Longword; |
184 | 1191 |
begin |
1183
540cea859395
Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents:
1182
diff
changeset
|
1192 |
InitRects; |
1776 | 1193 |
if hasGirders then |
1194 |
begin |
|
7069 | 1195 |
g:= max(playWidth div 8, 256); |
1196 |
i:= leftX + g; |
|
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1197 |
girSurf:= nil; |
1792 | 1198 |
repeat |
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1199 |
AddGirder(i, girSurf); |
7069 | 1200 |
i:=i + g; |
1201 |
until (i > rightX - g); |
|
10261
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1202 |
// free girder surface |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1203 |
if girSurf <> nil then |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1204 |
begin |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1205 |
SDL_FreeSurface(girSurf); |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1206 |
girSurf:= nil; |
c81125782cf6
load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents:
10254
diff
changeset
|
1207 |
end; |
1776 | 1208 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1209 |
if (GameFlags and gfDisableLandObjects) = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6534
diff
changeset
|
1210 |
AddThemeObjects(ThemeObjects); |
2705
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
1211 |
AddProgress(); |
2b5625c4ec16
fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents:
2699
diff
changeset
|
1212 |
FreeRects(); |
1190
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
1213 |
end; |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
1214 |
|
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
1215 |
procedure AddOnLandObjects(Surface: PSDL_Surface); |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
1216 |
begin |
73ec31d8bb6f
Enable back rendering objects that are put on top of land texture
unc0rr
parents:
1186
diff
changeset
|
1217 |
InitRects; |
2870 | 1218 |
AddSprayObjects(Surface, SprayObjects); |
1186
bf5af791d234
Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents:
1185
diff
changeset
|
1219 |
FreeRects |
184 | 1220 |
end; |
1221 |
||
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
1222 |
procedure LoadThemeConfig; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
1223 |
begin |
3463 | 1224 |
ReadThemeInfo(ThemeObjects, SprayObjects) |
1085
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
1225 |
end; |
0b82870073b5
Load flakes information from theme.cfg when playing painted map
unc0rr
parents:
1066
diff
changeset
|
1226 |
|
3053 | 1227 |
procedure FreeLandObjects(); |
13396 | 1228 |
var i, ii: Longword; |
3053 | 1229 |
begin |
3463 | 1230 |
for i:= 0 to Pred(MAXTHEMEOBJECTS) do |
1231 |
begin |
|
1232 |
if ThemeObjects.objs[i].Surf <> nil then |
|
1233 |
SDL_FreeSurface(ThemeObjects.objs[i].Surf); |
|
1234 |
if SprayObjects.objs[i].Surf <> nil then |
|
1235 |
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
|
1236 |
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
|
1237 |
SprayObjects.objs[i].Surf:= nil; |
13396 | 1238 |
|
1239 |
ii:= 0; |
|
1240 |
while ii < ThemeObjects.objs[i].overlaycnt do |
|
1241 |
begin |
|
1242 |
if ThemeObjects.objs[i].overlays[ii].Surf <> nil then |
|
1243 |
begin |
|
1244 |
SDL_FreeSurface(ThemeObjects.objs[i].overlays[ii].Surf); |
|
1245 |
ThemeObjects.objs[i].overlays[ii].Surf:= nil; |
|
1246 |
end; |
|
1247 |
inc(ii); |
|
1248 |
end; |
|
3463 | 1249 |
end; |
3053 | 1250 |
end; |
1251 |
||
184 | 1252 |
end. |