hedgewars/uLandObjects.pas
author Wuzzy <Wuzzy2@mail.ru>
Tue, 06 Aug 2019 11:41:38 +0200
changeset 15303 976b3ed9b1fd
parent 15161 84e98f0f7f7b
child 15345 4e91a7050add
permissions -rw-r--r--
Remember maximized state of frontend window
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 883
diff changeset
     2
 * Hedgewars, a free turn based strategy game
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 11006
diff changeset
     3
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     4
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     8
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    12
 * GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    13
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    14
 * You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    17
 *)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    21
unit uLandObjects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    22
interface
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    23
uses SDLh;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    24
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
    25
procedure AddObjects();
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
    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
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    35
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    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
3f1f8f79fcdb implement Trim() in uUtils
sheepluva
parents: 11826
diff changeset
    38
     , uTypes, uVariables, uDebug, uUtils
12847
f72c6f64c94c hate SDL blit...
nemo
parents: 12764
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    42
      MAXOBJECTRECTS = 16;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    45
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    46
type PLongWord = ^LongWord;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    47
     TRectsArray = array[0..MaxRects] of TSDL_Rect;
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 7021
diff changeset
    48
     PRectArray = ^TRectsArray;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    49
     TThemeObjectOverlay = record
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    50
                           Position: TPoint;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    51
                           Surf: PSDL_Surface;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    52
                           Width, Height: LongWord;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    53
                           end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    54
     TThemeObject = record
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    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
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    59
                     anchors: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    60
                     overlays: array[0..Pred(MAXOBJECTRECTS)] of TThemeObjectOverlay;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    61
                     inrectcnt: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    62
                     outrectcnt: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    63
                     anchorcnt: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    68
     TThemeObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    69
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    70
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    71
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    77
     TSprayObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    78
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    79
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    80
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    81
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    82
var Rects: PRectArray;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    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
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   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
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   117
function LerpByte(src, dst: Byte; l: LongWord): LongWord; inline;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   118
begin
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   119
    LerpByte:= ((255 - l) * src + l * dst) div 255;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   120
end;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   121
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
   122
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
   123
var p: PLongwordArray;
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   124
    pLandColor: PLongWord;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   125
    alpha, color, landColor, x, y: LongWord;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   126
    bpp: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   127
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   128
WriteToConsole('Generating collision info... ');
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   129
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   130
if SDL_MustLock(Image) then
11512
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   131
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   132
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   133
bpp:= Image^.format^.BytesPerPixel;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   134
if checkFails(bpp = 4, 'Land object should be 32bit', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   135
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   136
if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   137
    SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   138
end;
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   139
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   140
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
   141
    Width:= Image^.w;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   142
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   143
p:= Image^.pixels;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   144
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   145
for y:= 0 to Pred(Image^.h) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   146
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   147
    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
   148
        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
   149
        // 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
   150
        if Flip then
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   151
            color:= p^[Pred(Image^.w) - x]
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   152
        else
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   153
            color:= p^[x];
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   154
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   155
        if (cReducedQuality and rqBlurryLand) = 0 then
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   156
            pLandColor:= @LandPixels[cpY + y, cpX + x]
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
   157
        else
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   158
            pLandColor:= @LandPixels[(cpY + y) div 2, (cpX + x) div 2];
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
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   160
        landColor:= pLandColor^;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   161
        alpha:= (landColor and AMask) shr AShift;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   162
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   163
        if ((color and AMask) <> 0) and (alpha <> 255)  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
   164
            begin
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   165
            if alpha = 0 then
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   166
                pLandColor^:= color
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
   167
            else
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   168
                pLandColor^:=
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   169
                   (LerpByte((color and RMask) shr RShift, (landColor and RMask) shr RShift, alpha) shl RShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   170
                    or (LerpByte((color and GMask) shr GShift, (landColor and GMask) shr GShift, alpha) shl GShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   171
                    or (LerpByte((color and BMask) shr BShift, (landColor and BMask) shr BShift, alpha) shl BShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   172
                    or (LerpByte(alpha, 255, (color and AMask) shr AShift) shl AShift);
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
   173
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
   174
            end;
15104
07de9e60c305 fix land object placement
alfadur
parents: 15032
diff changeset
   175
07de9e60c305 fix land object placement
alfadur
parents: 15032
diff changeset
   176
        if ((color and AMask) <> 0) and (Land[cpY + y, cpX + x] <= lfAllObjMask) then
07de9e60c305 fix land object placement
alfadur
parents: 15032
diff changeset
   177
            Land[cpY + y, cpX + x]:= lfObject or LandFlags
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
   178
        end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   179
    p:= PLongwordArray(@(p^[Image^.pitch shr 2]))
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   180
    end;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   181
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   182
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
   183
    SDL_UnlockSurface(Image);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   184
WriteLnToConsole(msgOK)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   185
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   186
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   187
procedure BlitOverlayAndGenerateCollisionInfo(cpX, cpY: Longword; Image: PSDL_Surface);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   188
var p: PLongwordArray;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   189
    pLandColor: PLongWord;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   190
    x, y, alpha, color, landColor: LongWord;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   191
begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   192
WriteToConsole('Generating overlay collision info... ');
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   193
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   194
if SDL_MustLock(Image) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   195
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   196
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   197
if checkFails(Image^.format^.BytesPerPixel = 4, 'Land object overlay should be 32bit', true)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   198
   and SDL_MustLock(Image) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   199
    SDL_UnlockSurface(Image);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   200
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   201
p:= Image^.pixels;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   202
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   203
for y:= 0 to Pred(Image^.h) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   204
    begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   205
    for x:= 0 to Pred(Image^.w) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   206
        begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   207
        color:= p^[x];
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   208
        if (color and AMask) <> 0 then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   209
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   210
            if (cReducedQuality and rqBlurryLand) = 0 then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   211
                pLandColor:= @LandPixels[cpY + y, cpX + x]
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   212
            else
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   213
                pLandColor:= @LandPixels[(cpY + y) div 2, (cpX + x) div 2];
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   214
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   215
            alpha:= (color and AMask) shr AShift;
13838
664935d80668 Fix another pas2c hiccup in uLandObjects
Wuzzy <Wuzzy2@mail.ru>
parents: 13506
diff changeset
   216
            if ((alpha <> $FF) and ((pLandColor^) <> 0)) then
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   217
                begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   218
                landColor:= pLandColor^;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   219
                color:=
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   220
                    (LerpByte((landColor and RMask) shr RShift, (color and RMask) shr RShift, alpha) shl RShift)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   221
                 or (LerpByte((landColor and GMask) shr GShift, (color and GMask) shr GShift, alpha) shl GShift)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   222
                 or (LerpByte((landColor and BMask) shr BShift, (color and BMask) shr BShift, alpha) shl BShift)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   223
                 or (LerpByte(alpha, 255, (landColor and AMask) shr AShift) shl AShift)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   224
                end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   225
            pLandColor^:= color;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   226
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   227
            if Land[cpY + y, cpX + x] <= lfAllObjMask then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   228
                Land[cpY + y, cpX + x]:= lfObject
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   229
            end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   230
        end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   231
    p:= PLongwordArray(@(p^[Image^.pitch shr 2]))
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   232
    end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   233
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   234
if SDL_MustLock(Image) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   235
    SDL_UnlockSurface(Image);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   236
WriteLnToConsole(msgOK)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   237
end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   238
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
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
   240
var p, mp: PLongwordArray;
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   241
    pLandColor: PLongWord;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   242
    alpha, color, landColor, x, y: Longword;
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
   243
    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
   244
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
   245
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
   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
if SDL_MustLock(Image) then
11512
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11342
diff changeset
   248
    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
   249
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
bpp:= Image^.format^.BytesPerPixel;
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   251
if checkFails(bpp = 4, 'Land object should be 32bit', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   252
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   253
if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   254
    SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   255
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
   256
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
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
   258
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
   259
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
   260
    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
   261
    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
   262
        begin
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   263
        color:= p^[x];
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   264
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
   265
        if (cReducedQuality and rqBlurryLand) = 0 then
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   266
            pLandColor:= @LandPixels[cpY + y, cpX + x]
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
   267
        else
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   268
            pLandColor:= @LandPixels[(cpY + y) div 2, (cpX + x) div 2];
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   269
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   270
        landColor:= pLandColor^;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   271
        alpha:= (landColor and AMask) shr AShift;
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   272
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   273
        if ((color and AMask) <> 0) and (alpha <> 255)  then
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   274
        begin
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   275
            if alpha = 0 then
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   276
                pLandColor^:= color
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   277
            else
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   278
                pLandColor^:=
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   279
                   (LerpByte((color and RMask) shr RShift, (landColor and RMask) shr RShift, alpha) shl RShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   280
                   or (LerpByte((color and GMask) shr GShift, (landColor and GMask) shr GShift, alpha) shl GShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   281
                   or (LerpByte((color and BMask) shr BShift, (landColor and BMask) shr BShift, alpha) shl BShift)
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   282
                   or (LerpByte(alpha, 255, (color and AMask) shr AShift) shl AShift);
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   283
        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
   284
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
   285
        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
   286
            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
   287
        end;
14952
414924c06704 blend land into land objects
alfadur
parents: 14949
diff changeset
   288
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   289
    p:= PLongwordArray(@(p^[Image^.pitch shr 2]));
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   290
    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
   291
    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
   292
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
   293
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
   294
    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
   295
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
   296
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
   297
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   298
procedure AddRect(x1, y1, w1, h1: LongInt);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   299
begin
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   300
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
   301
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   302
    x:= x1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   303
    y:= y1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   304
    w:= w1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   305
    h:= h1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   306
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   307
inc(RectCount);
11537
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11512
diff changeset
   308
checkFails(RectCount < MaxRects, 'AddRect: overflow', true)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   309
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   310
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   311
procedure InitRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   312
begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   313
    RectCount:= 0;
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   314
    New(Rects)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   315
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   316
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   317
procedure FreeRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   318
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   319
    Dispose(rects)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   320
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   321
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   322
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   323
var i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   324
    res: boolean = false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   325
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   326
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   327
i:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   328
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
   329
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   330
    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
   331
        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
   332
    inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   333
    until (i = RectCount) or (res);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   334
CheckIntersect:= res;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   335
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   336
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   337
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   338
function CountNonZeroz(x, y, h: LongInt): Longword;
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   339
var i: LongInt;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   340
    lRes: Longword;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   341
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   342
    lRes:= 0;
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   343
    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
   344
        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
   345
            inc(lRes);
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   346
    CountNonZeroz:= lRes;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   347
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   348
13402
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   349
procedure ChecksumLandObjectImage(Image: PSDL_Surface);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   350
var y: LongInt;
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   351
begin
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   352
    if Image = nil then exit;
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   353
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   354
    if SDL_MustLock(Image) then
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   355
        SDL_LockSurface(Image);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   356
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   357
    if checkFails(Image^.format^.BytesPerPixel = 4, 'Land object image should be 32bit', true) then
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   358
    begin
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   359
        if SDL_MustLock(Image) then
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   360
            SDL_UnlockSurface(Image);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   361
        exit
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   362
    end;
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   363
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   364
    for y := 0 to Image^.h-1 do
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   365
        syncedPixelDigest:= Adler32Update(syncedPixelDigest, @PByteArray(Image^.pixels)^[y*Image^.pitch], Image^.w*4);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   366
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   367
    if SDL_MustLock(Image) then
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   368
        SDL_UnlockSurface(Image);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   369
end;
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   370
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
   371
function AddGirder(gX: LongInt; var girSurf: PSDL_Surface): boolean;
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   372
var x1, x2, y, k, i, girderHeight: LongInt;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   373
    rr: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   374
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   375
begin
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   376
if girSurf = nil then
12597
00b539e6115d rename ifTransparent to ifColorKey
sheepluva
parents: 12195
diff changeset
   377
    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
   378
13402
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   379
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
   380
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   381
girderHeight:= girSurf^.h;
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   382
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   383
y:= topY+150;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   384
repeat
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   385
    inc(y, 24);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   386
    x1:= gX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   387
    x2:= gX;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   388
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13838
diff changeset
   389
    while (x1 > 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
   390
        dec(x1, 2);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   391
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   392
    i:= x1 - 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   393
    repeat
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   394
        k:= CountNonZeroz(x1, y, girderHeight);
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   395
        dec(x1, 2)
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13838
diff changeset
   396
    until (x1 < leftX + 100) or (k = 0) or (k = girderHeight) or (x1 < i);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   397
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   398
    inc(x1, 2);
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   399
    if k = girderHeight then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   400
        begin
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13838
diff changeset
   401
        while (x2 < (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
   402
            inc(x2, 2);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   403
        i:= x2 + 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   404
        repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   405
        inc(x2, 2);
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   406
        k:= CountNonZeroz(x2, y, girderHeight)
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13838
diff changeset
   407
        until (x2 >= (rightX-150)) or (k = 0) or (k = girderHeight) or (x2 > i) or (x2 - x1 >= 900);
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   408
14287
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 13838
diff changeset
   409
        if (x2 < (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
   410
        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
   411
                break;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   412
        end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   413
x1:= 0;
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1277
diff changeset
   414
until y > (LAND_HEIGHT-125);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   415
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   416
if x1 > 0 then
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   417
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   418
    bRes:= true;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   419
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   420
    rr.x:= x1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   421
    while rr.x < x2 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   422
        begin
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   423
        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
   424
            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
   425
        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
   426
            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
   427
        inc(rr.x, girSurf^.w);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   428
        end;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   429
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   430
    AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   431
end
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   432
else bRes:= false;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   433
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   434
AddGirder:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   435
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   436
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   437
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
   438
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   439
    bRes: boolean = true;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   440
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   441
inc(rect.x, dX);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   442
inc(rect.y, dY);
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   443
bx:= rect.x + rect.w;
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   444
by:= rect.y + rect.h;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   445
{$WARNINGS OFF}
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   446
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
   447
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
   448
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
   449
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   450
    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
   451
    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
   452
    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
   453
    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
   454
    inc(tmpx);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   455
    dec(tmpx2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   456
    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
   457
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
   458
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
   459
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
   460
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   461
    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
   462
    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
   463
    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
   464
    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
   465
    inc(tmpy);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   466
    dec(tmpy2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   467
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   468
{$WARNINGS ON}
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   469
CheckLand:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   470
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   471
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   472
function CheckLandAny(rect: TSDL_Rect; dX, dY, LandType: Longword): boolean;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   473
var tmpx, tmpy, bx, by: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   474
begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   475
    inc(rect.x, dX);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   476
    inc(rect.y, dY);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   477
    bx:= rect.x + rect.w - 1;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   478
    by:= rect.y + rect.h - 1;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   479
    CheckLandAny:= false;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   480
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   481
    if (((rect.x and LAND_WIDTH_MASK) or (bx and LAND_WIDTH_MASK) or
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   482
         (rect.y and LAND_HEIGHT_MASK) or (by and LAND_HEIGHT_MASK)) = 0) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   483
    begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   484
        for tmpx := rect.x to bx do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   485
        begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   486
            if (((Land[rect.y, tmpx] and LandType) or (Land[by, tmpx] and LandType)) <> 0) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   487
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   488
                CheckLandAny := true;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   489
                exit;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   490
            end
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   491
        end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   492
        for tmpy := rect.y to by do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   493
        begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   494
            if (((Land[tmpy, rect.x] and LandType) or (Land[tmpy, bx] and LandType)) <> 0) then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   495
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   496
                CheckLandAny := true;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   497
                exit;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   498
            end
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   499
        end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   500
    end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   501
end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   502
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   503
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   504
var i: Longword;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   505
    bRes, anchored: boolean;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   506
    overlayP1, overlayP2: TPoint;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   507
begin
11875
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   508
    with Obj do begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   509
        bRes:= true;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   510
        i:= 0;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   511
        while bRes and (i < overlaycnt) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   512
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   513
            overlayP1.x:= overlays[i].Position.x + x;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   514
            overlayP1.y:= overlays[i].Position.y + y;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   515
            overlayP2.x:= overlayP1.x + overlays[i].Width - 1;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   516
            overlayP2.y:= overlayP1.y + overlays[i].Height - 1;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   517
            bRes:= (((LAND_WIDTH_MASK and overlayP1.x) or (LAND_HEIGHT_MASK and overlayP1.y) or
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   518
                     (LAND_WIDTH_MASK and overlayP2.x) or (LAND_HEIGHT_MASK and overlayP2.y)) = 0)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   519
                   and (not CheckIntersect(overlayP1.x, overlayP1.y, overlays[i].Width, overlays[i].Height));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   520
            inc(i)
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   521
            end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   522
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   523
        i:= 0;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   524
        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
   525
            begin
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   526
            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
   527
            inc(i)
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   528
            end;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   529
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   530
        i:= 0;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   531
        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
   532
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   533
            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
   534
            inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   535
            end;
11875
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   536
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   537
        if bRes then
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   538
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   539
            anchored:= anchorcnt = 0;
14986
1a2dcea1732a fix anchors
alfadur
parents: 14952
diff changeset
   540
            i:= 0;
1a2dcea1732a fix anchors
alfadur
parents: 14952
diff changeset
   541
            while i < anchorcnt do
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   542
                begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   543
                    anchored := CheckLandAny(anchors[i], x, y, lfLandMask);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   544
                    if anchored then break;
14986
1a2dcea1732a fix anchors
alfadur
parents: 14952
diff changeset
   545
                    inc(i);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   546
                end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   547
            bRes:= anchored;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   548
            end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   549
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   550
        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
   551
            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
   552
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   553
        CheckCanPlace:= bRes;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   554
    end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   555
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   556
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   557
function TryPut(var Obj: TThemeObject): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   558
const MaxPointsIndex = 2047;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   559
var x, y: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   560
    ar: array[0..MaxPointsIndex] of TPoint;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   561
    cnt, i, ii: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   562
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   563
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
   564
TryPut:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   565
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   566
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
   567
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   568
    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
   569
        exit;
15147
d97f0b96e45f Restrict object placement between leftX and rightX
Wuzzy <Wuzzy2@mail.ru>
parents: 15104
diff changeset
   570
    x:= leftX;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   571
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   572
        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
   573
        repeat
12173
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12102
diff changeset
   574
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   575
            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
   576
                y := LAND_HEIGHT - Height;
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12102
diff changeset
   577
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   578
            if CheckCanPlace(x, y, Obj) then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   579
                begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   580
                ar[cnt].x:= x;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   581
                ar[cnt].y:= y;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   582
                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
   583
                    begin
10490
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10325
diff changeset
   584
                    y:= LAND_HEIGHT;
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10325
diff changeset
   585
                    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
   586
                    end
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   587
                    else inc(cnt);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   588
                end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   589
            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
   590
        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
   591
        inc(x, getrandom(6) + 3)
15147
d97f0b96e45f Restrict object placement between leftX and rightX
Wuzzy <Wuzzy2@mail.ru>
parents: 15104
diff changeset
   592
    until x >= rightX - Width;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   593
    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
   594
    if bRes then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   595
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   596
        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
   597
        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
   598
             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
   599
        else BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   600
        AddRect(ar[i].x, ar[i].y, Width, Height);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   601
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   602
        ii:= 0;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   603
        while ii < overlaycnt do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   604
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   605
            BlitOverlayAndGenerateCollisionInfo(
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   606
                ar[i].x + overlays[ii].Position.X,
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   607
                ar[i].y + overlays[ii].Position.Y, overlays[ii].Surf);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   608
            AddRect(ar[i].x + overlays[ii].Position.X,
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   609
                    ar[i].y + overlays[ii].Position.Y,
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   610
                    Width, Height);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   611
            inc(ii);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   612
            end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   613
        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
   614
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   615
    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
   616
    end;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   617
TryPut:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   618
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   619
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   620
function TryPut2(var Obj: TSprayObject; Surface: PSDL_Surface): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   621
const MaxPointsIndex = 8095;
15161
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   622
var x, y, xStart, yStart: Longword;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   623
    xWraps, yWraps: Byte;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   624
    ar: array[0..MaxPointsIndex] of TPoint;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   625
    cnt, i: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   626
    r: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   627
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   628
begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   629
TryPut2:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   630
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   631
with Obj do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   632
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   633
    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
   634
        exit;
15161
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   635
    xWraps:= 0;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   636
    yWraps:= 0;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   637
    // Start at random coordinates
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   638
    xStart:= getrandom(LAND_WIDTH - Width);
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   639
    yStart:= 8 + getrandom(LAND_HEIGHT - Height - 16);
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   640
    x:= xStart;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   641
    y:= yStart;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   642
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   643
    r.y:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   644
    r.w:= Width;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   645
    r.h:= Height + 16;
15161
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   646
    // Then iterate through the whole map; this requires we wrap one time per axis
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   647
    repeat
15161
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   648
        yWraps:= 0;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   649
        repeat
3519
56cbc035b74b rename flags
nemo
parents: 3513
diff changeset
   650
            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
   651
            and (not CheckIntersect(x, y, Width, Height)) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   652
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   653
                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
   654
                ar[cnt].y:= y;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   655
                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
   656
                    begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   657
                    y:= $FF000000;
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   658
                    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
   659
                    end
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   660
                    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
   661
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   662
            inc(y, 12);
15161
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   663
            if (y >= LAND_HEIGHT - Height - 8) or ((yWraps > 0) and (y >= yStart)) then
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   664
                begin
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   665
                inc(yWraps);
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   666
                y:= 8;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   667
                end;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   668
        until yWraps > 1;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   669
        inc(x, getrandom(12) + 12);
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   670
        if (x >= LAND_WIDTH - Width) or ((xWraps > 0) and (x >= xStart)) then
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   671
            begin
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   672
            inc(xWraps);
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   673
            x:= 0;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   674
            end;
84e98f0f7f7b Fix sprays being biased to the left on huge maps
Wuzzy <Wuzzy2@mail.ru>
parents: 15147
diff changeset
   675
    until xWraps > 1;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   676
    bRes:= cnt <> 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   677
    if bRes then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   678
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   679
        i:= getrandom(cnt);
12847
f72c6f64c94c hate SDL blit...
nemo
parents: 12764
diff changeset
   680
        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
   681
        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
   682
        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
   683
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   684
    else Maxcnt:= 0
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   685
    end;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   686
TryPut2:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   687
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   688
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   689
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   690
procedure CheckRect(Width, Height, x, y, w, h: LongWord);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   691
begin
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   692
    if (x + w > Width) then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   693
        OutError('Broken theme. Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true);
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   694
    if (y + h > Height) then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   695
        OutError('Broken theme. Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true);
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   696
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   697
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   698
procedure ReadRect(var rect: TSDL_Rect; var s: ShortString);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   699
var i: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   700
begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   701
with rect do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   702
    begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   703
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   704
    x:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   705
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   706
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   707
    y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   708
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   709
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   710
    w:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   711
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   712
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   713
    if i = 0 then i:= Succ(Length(S));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   714
    h:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   715
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   716
    end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   717
end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   718
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   719
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   720
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   721
procedure ReadOverlay(var overlay: TThemeObjectOverlay; var s: ShortString);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   722
var i: LongInt;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   723
begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   724
with overlay do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   725
    begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   726
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   727
    Position.X:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   728
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   729
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   730
    Position.Y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   731
    Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   732
    i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   733
    if i = 0 then i:= Succ(Length(S));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   734
    Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifColorKey or ifIgnoreCaps or ifCritical);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   735
    Width:= Surf^.w;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   736
    Height:= Surf^.h;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   737
    Delete(s, 1, i);
13402
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   738
    ChecksumLandObjectImage(Surf);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   739
    end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   740
end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   741
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   742
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   743
var s, key, nameRef: shortstring;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   744
    f: PFSFile;
13406
40235ccf8d6d Remove unused variable in uLandObjects
Wuzzy <Wuzzy2@mail.ru>
parents: 13402
diff changeset
   745
    i: LongInt;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   746
    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
   747
    c2: TSDL_Color;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   748
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
   749
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
   750
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
   751
// Set default water greyscale values
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   752
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
   753
    begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   754
    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
   755
        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
   756
        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
   757
        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
   758
            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
   759
        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
   760
        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
   761
        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
   762
        end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   763
    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
   764
        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
   765
        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
   766
        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
   767
            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
   768
        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
   769
        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
   770
        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
   771
        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
   772
    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
   773
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 7640
diff changeset
   774
s:= cPathz[ptCurrTheme] + '/' + cThemeCFGFilename;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   775
WriteLnToConsole('Reading objects info...');
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   776
f:= pfsOpenRead(s);
13489
480ea997036b Send proper failure error message when image loading has failed
Wuzzy <Wuzzy2@mail.ru>
parents: 13406
diff changeset
   777
if (f = nil) then
480ea997036b Send proper failure error message when image loading has failed
Wuzzy <Wuzzy2@mail.ru>
parents: 13406
diff changeset
   778
    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
   779
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   780
ThemeObjects.Count:= 0;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   781
SprayObjects.Count:= 0;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   782
11544
c22d292e7266 Fix possible crashes/hangs due to recent changes
unC0Rr
parents: 11537
diff changeset
   783
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
   784
    begin
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   785
    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
   786
    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
   787
        continue;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   788
    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
   789
        continue;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   790
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   791
    i:= Pos('=', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   792
    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
   793
    Delete(s, 1, i);
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   794
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   795
    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
   796
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   797
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   798
        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
   799
        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
   800
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   801
        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
   802
        Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   803
        SkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   804
        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
   805
            then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   806
            begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   807
            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
   808
            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
   809
                t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   810
            SkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   811
            SkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   812
            SkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   813
            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
   814
        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
   815
        SDSkyColor.r:= SkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   816
        SDSkyColor.g:= SkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   817
        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
   818
        end
11900
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   819
    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
   820
        begin
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   821
        i:= Pos(',', s);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   822
        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
   823
        Delete(s, 1, i);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   824
        i:= Pos(',', s);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   825
        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
   826
        Delete(s, 1, i);
12102
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11900
diff changeset
   827
        i:= Pos(',', s);
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11900
diff changeset
   828
        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
   829
        Delete(s, 1, i);
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11900
diff changeset
   830
        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
   831
        if GrayScale
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   832
            then
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   833
            begin
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   834
            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
   835
            if t > 255 then
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   836
                t:= 255;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   837
            SDTint.r:= t;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   838
            SDTint.g:= t;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   839
            SDTint.b:= t
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   840
            end;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11876
diff changeset
   841
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   842
    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
   843
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   844
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   845
        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
   846
        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
   847
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   848
        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
   849
        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
   850
        c2.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   851
        if GrayScale then
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   852
            begin
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   853
            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
   854
            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
   855
                t:= 255;
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   856
            c2.r:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   857
            c2.g:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   858
            c2.b:= t
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   859
            end;
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   860
        ExplosionBorderColorR:= c2.r;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   861
        ExplosionBorderColorG:= c2.g;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   862
        ExplosionBorderColorB:= c2.b;
10878
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   863
        ExplosionBorderColorNoA:=
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   864
            (c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift);
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   865
        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
   866
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   867
    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
   868
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   869
        i:= Pos(',', s);
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   870
        WaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   871
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   872
        i:= Pos(',', s);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   873
        WaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   874
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   875
        WaterColorArray[1].b:= StrToInt(Trim(s));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   876
        WaterColorArray[1].a := 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   877
        if GrayScale then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   878
            begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   879
            t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   880
            if t > 255 then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   881
                t:= 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   882
            WaterColorArray[1].r:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   883
            WaterColorArray[1].g:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   884
            WaterColorArray[1].b:= t
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   885
            end;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   886
        WaterColorArray[3]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   887
        WaterColorArray[5]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   888
        WaterColorArray[7]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   889
        end
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   890
    else if key = 'water-bottom' then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   891
        begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   892
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   893
        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
   894
        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
   895
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   896
        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
   897
        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
   898
        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
   899
        WaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   900
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   901
            begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   902
            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
   903
            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
   904
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   905
            WaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   906
            WaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   907
            WaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   908
            end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   909
        WaterColorArray[2]:= WaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   910
        WaterColorArray[4]:= WaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   911
        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
   912
        end
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   913
    else if key = 'water-opacity' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   914
        begin
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   915
        WaterOpacity:= StrToInt(Trim(s));
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   916
        SDWaterOpacity:= WaterOpacity
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   917
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   918
    else if key = 'music' then
10254
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   919
        MusicFN:= Trim(s)
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   920
    else if key = 'sd-music' then
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   921
        SDMusicFN:= Trim(s)
12920
4d3b52f1ba18 Add theme fallback music settings
Wuzzy <Wuzzy2@mail.ru>
parents: 12847
diff changeset
   922
    else if key = 'fallback-music' then
4d3b52f1ba18 Add theme fallback music settings
Wuzzy <Wuzzy2@mail.ru>
parents: 12847
diff changeset
   923
        FallbackMusicFN:= Trim(s)
4d3b52f1ba18 Add theme fallback music settings
Wuzzy <Wuzzy2@mail.ru>
parents: 12847
diff changeset
   924
    else if key = 'fallback-sd-music' then
4d3b52f1ba18 Add theme fallback music settings
Wuzzy <Wuzzy2@mail.ru>
parents: 12847
diff changeset
   925
        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
   926
    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
   927
        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
   928
        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
   929
        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
   930
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   931
    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
   932
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   933
        inc(ThemeObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   934
        with ThemeObjects.objs[Pred(ThemeObjects.Count)] do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   935
            begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   936
            i:= Pos(',', s);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   937
            Name:= Trim(Copy(s, 1, Pred(i)));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   938
            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
   939
            Width:= Surf^.w;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   940
            Height:= Surf^.h;
12597
00b539e6115d rename ifTransparent to ifColorKey
sheepluva
parents: 12195
diff changeset
   941
            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
   942
            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
   943
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   944
            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
   945
            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
   946
            if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   947
                OutError('Broken theme. Object''s max. count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true);
13402
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   948
            ChecksumLandObjectImage(Surf);
166f8f31de3e Checksum girders and masks too
alfadur
parents: 13396
diff changeset
   949
            ChecksumLandObjectImage(Mask);
11876
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   950
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   951
            inrectcnt := 0;
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   952
11875
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   953
            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
   954
              if S[ii] = ',' then
11876
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   955
                inc(inrectcnt);
11875
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   956
11876
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   957
            if inrectcnt mod 2 = 0 then
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   958
              inrectcnt := 1
11875
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   959
            else begin
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   960
              i:= Pos(',', s);
11876
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   961
              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
   962
              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
   963
            end;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11829
diff changeset
   964
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   965
            if inrectcnt > MAXOBJECTRECTS then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   966
                OutError('Broken theme. Object''s inland rectangle count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(inrectcnt) +').', true);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   967
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   968
            for ii:= 0 to Pred(inrectcnt) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   969
                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
   970
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   971
            i:= Pos(',', s);
11876
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11875
diff changeset
   972
            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
   973
            Delete(s, 1, i);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   974
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   975
            if outrectcnt > MAXOBJECTRECTS then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   976
                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
   977
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   978
            for ii:= 0 to Pred(outrectcnt) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   979
                ReadRect(outland[ii], s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   980
            end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   981
        end
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   982
    else if key = 'anchors' then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   983
        begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   984
        i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   985
        nameRef:= Trim(Copy(s, 1, Pred(i)));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   986
        for ii:= 0 to Pred(ThemeObjects.Count) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   987
            if ThemeObjects.objs[ii].Name = nameRef then with ThemeObjects.objs[ii] do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   988
                begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   989
                if anchorcnt <> 0 then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   990
                    OutError('Broken theme. Duplicate anchors declaration for object ' + nameRef, true);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   991
                Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   992
                i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   993
                anchorcnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   994
                Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   995
                if anchorcnt > MAXOBJECTRECTS then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
   996
                    OutError('Broken theme. Object''s anchor rectangle count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(anchorcnt) +').', true);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   997
                for t:= 0 to Pred(anchorcnt) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   998
                    ReadRect(anchors[t], s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
   999
                break
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1000
                end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1001
        end
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1002
    else if key = 'overlays' then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1003
        begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1004
        i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1005
        nameRef:= Trim(Copy(s, 1, Pred(i)));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1006
        for ii:= 0 to Pred(ThemeObjects.Count) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1007
            if ThemeObjects.objs[ii].Name = nameRef then with ThemeObjects.objs[ii] do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1008
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1009
                if overlaycnt <> 0 then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
  1010
                    OutError('Broken theme. Duplicate overlays declaration for object ' + nameRef, true);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1011
                Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1012
                i:= Pos(',', s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1013
                overlaycnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1014
                Delete(s, 1, i);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1015
                if overlaycnt > MAXOBJECTRECTS then
13506
bdac56fb6f1a Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13489
diff changeset
  1016
                    OutError('Broken theme. Object''s overlay count should be no more than '+ inttostr(MAXOBJECTRECTS) +' (it was '+ inttostr(overlaycnt) +').', true);
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1017
                for t:= 0 to Pred(overlaycnt) do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1018
                    ReadOverlay(overlays[t], s);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1019
                break
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1020
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1021
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1022
    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
  1023
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1024
        inc(SprayObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1025
        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
  1026
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1027
            i:= Pos(',', s);
12598
d6bd8b327a09 don't use colorkey for land spray
sheepluva
parents: 12597
diff changeset
  1028
            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
  1029
            Width:= Surf^.w;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1030
            Height:= Surf^.h;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1031
            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
  1032
            Maxcnt:= StrToInt(Trim(s));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1033
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1034
        end
12194
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1035
    else if key = 'water-animation' then
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1036
        begin
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1037
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1038
        watFrames:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1039
        Delete(s, 1, i);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1040
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1041
        watFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1042
        Delete(s, 1, i);
12195
4d818abdc00f Fix bad water flow animation
KoBeWi <kobewi4e@gmail.com>
parents: 12194
diff changeset
  1043
        watMove:= StrToInt(Trim(s));
12194
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1044
        end
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1045
    else if key = 'sd-water-animation' then
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1046
        begin
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1047
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1048
        watSDFrames:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1049
        Delete(s, 1, i);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1050
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1051
        watSDFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1052
        Delete(s, 1, i);
12195
4d818abdc00f Fix bad water flow animation
KoBeWi <kobewi4e@gmail.com>
parents: 12194
diff changeset
  1053
        watSDMove:= StrToInt(Trim(s));
12194
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12173
diff changeset
  1054
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1055
    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
  1056
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1057
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1058
        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
  1059
        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
  1060
        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
  1061
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1062
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1063
            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
  1064
            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
  1065
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1066
            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
  1067
            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
  1068
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1069
            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
  1070
            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
  1071
            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
  1072
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1073
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1074
    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
  1075
        cFlattenFlakes:= true
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1076
    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
  1077
        cFlattenClouds:= true
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
  1078
    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
  1079
        cIce:= true
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
  1080
    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
  1081
        cSnow:= true
14949
8b53cb1c0ada make rope styleable
alfadur
parents: 14287
diff changeset
  1082
    else if key = 'rope-step' then
15032
88e3d1ff67bb disallow zero rope step
alfadur
parents: 15029
diff changeset
  1083
        cRopeNodeStep:= max(1, StrToInt(s))
15029
af2f6f4074de add rope layers
alfadur
parents: 14986
diff changeset
  1084
    else if key = 'rope-layers' then
af2f6f4074de add rope layers
alfadur
parents: 14986
diff changeset
  1085
        cRopeLayers:= max(1, min(MAXROPELAYERS, StrToInt(s)))
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1086
    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
  1087
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
  1088
        i:= Pos(',', s);
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1089
        SDWaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1090
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1091
        i:= Pos(',', s);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1092
        SDWaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1093
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1094
        SDWaterColorArray[1].b:= StrToInt(Trim(s));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1095
        SDWaterColorArray[1].a := 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1096
        if GrayScale then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1097
            begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1098
            t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1099
            if t > 255 then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1100
                t:= 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1101
            SDWaterColorArray[1].r:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1102
            SDWaterColorArray[1].g:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1103
            SDWaterColorArray[1].b:= t
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1104
            end;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1105
        SDWaterColorArray[3]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1106
        SDWaterColorArray[5]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1107
        SDWaterColorArray[7]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1108
        end
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1109
    else if key = 'sd-water-bottom' then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1110
        begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1111
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1112
        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
  1113
        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
  1114
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1115
        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
  1116
        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
  1117
        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
  1118
        SDWaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1119
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1120
            begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1121
            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
  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;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1124
            SDWaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1125
            SDWaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1126
            SDWaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1127
            end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1128
        SDWaterColorArray[2]:= SDWaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1129
        SDWaterColorArray[4]:= SDWaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
  1130
        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
  1131
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1132
    else if key = 'sd-water-opacity' then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1133
        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
  1134
    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
  1135
        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
  1136
    else if key = 'sd-flakes' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1137
        begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1138
        i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1139
        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
  1140
        Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1141
        if vobSDCount > 0 then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1142
            begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1143
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1144
            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
  1145
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1146
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1147
            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
  1148
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1149
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1150
            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
  1151
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1152
            vobSDFallSpeed:= StrToInt(Trim(s));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1153
            end;
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
  1154
        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
  1155
    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
  1156
        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
  1157
        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
  1158
            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
  1159
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1160
            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
  1161
            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
  1162
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1163
            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
  1164
            Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1165
            RQSkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
  1166
            if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1167
                begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1168
                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
  1169
                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
  1170
                    t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1171
                RQSkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1172
                RQSkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
  1173
                RQSkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
  1174
                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
  1175
            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
  1176
            SDSkyColor.r:= RQSkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
  1177
            SDSkyColor.g:= RQSkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
  1178
            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
  1179
            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
  1180
        end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1181
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1182
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
  1183
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
  1184
AddProgress;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1185
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1186
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
  1187
procedure AddThemeObjects(var ThemeObjects: TThemeObjects);
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
  1188
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1189
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1190
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1191
    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
  1192
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1193
    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
  1194
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
  1195
    for i:=0 to Pred(ThemeObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1196
        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
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
  1197
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1198
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1199
        t := getrandom(ThemeObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1200
        b := false;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
  1201
        for i:= 0 to Pred(ThemeObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1202
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1203
            ii := (i+t) mod ThemeObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
  1204
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1205
            if ThemeObjects.objs[ii].Maxcnt <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1206
                b := b or TryPut(ThemeObjects.objs[ii])
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1207
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1208
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1209
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1210
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
  1211
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects);
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
  1212
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1213
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1214
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1215
    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
  1216
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1217
    WriteLnToConsole('Adding spray objects...');
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
  1218
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
  1219
    for i:= 0 to Pred(SprayObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1220
        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
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
  1221
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1222
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1223
        t := getrandom(SprayObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1224
        b := false;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
  1225
        for i:= 0 to Pred(SprayObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1226
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1227
            ii := (i+t) mod SprayObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
  1228
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1229
            if SprayObjects.objs[ii].Maxcnt <> 0 then
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
  1230
                b := b or TryPut2(SprayObjects.objs[ii], Surface)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1231
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
  1232
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1233
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1234
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
  1235
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
  1236
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
  1237
    i, g: Longword;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1238
begin
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
  1239
InitRects;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
  1240
if hasGirders then
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
  1241
    begin
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
  1242
    g:= max(playWidth div 8, 256);
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
  1243
    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
  1244
    girSurf:= nil;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
  1245
    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
  1246
        AddGirder(i, girSurf);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
  1247
        i:=i + g;
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
  1248
    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
  1249
    // 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
  1250
    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
  1251
        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
  1252
        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
  1253
        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
  1254
        end;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
  1255
    end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
  1256
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
  1257
    AddThemeObjects(ThemeObjects);
2705
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
  1258
AddProgress();
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
  1259
FreeRects();
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
  1260
end;
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
  1261
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
  1262
procedure AddOnLandObjects(Surface: PSDL_Surface);
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
  1263
begin
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
  1264
InitRects;
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
  1265
AddSprayObjects(Surface, SprayObjects);
1186
bf5af791d234 Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents: 1185
diff changeset
  1266
FreeRects
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1267
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1268
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1269
procedure LoadThemeConfig;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1270
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1271
    ReadThemeInfo(ThemeObjects, SprayObjects)
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1272
end;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1273
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1274
procedure FreeLandObjects();
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1275
var i, ii: Longword;
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1276
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1277
    for i:= 0 to Pred(MAXTHEMEOBJECTS) do
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1278
    begin
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1279
        if ThemeObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1280
            SDL_FreeSurface(ThemeObjects.objs[i].Surf);
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1281
        if SprayObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1282
            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
  1283
        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
  1284
        SprayObjects.objs[i].Surf:= nil;
13396
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1285
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1286
        ii:= 0;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1287
        while ii < ThemeObjects.objs[i].overlaycnt do
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1288
            begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1289
            if ThemeObjects.objs[i].overlays[ii].Surf <> nil then
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1290
                begin
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1291
                    SDL_FreeSurface(ThemeObjects.objs[i].overlays[ii].Surf);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1292
                    ThemeObjects.objs[i].overlays[ii].Surf:= nil;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1293
                end;
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1294
            inc(ii);
04d1521cb7b8 new theme object features
alfadur
parents: 12920
diff changeset
  1295
            end;
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1296
    end;
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1297
end;
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1298
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1299
end.