hedgewars/uLandObjects.pas
author unc0rr
Fri, 13 Dec 2013 00:00:49 +0400
changeset 9786 e33ee5ef5d9d
parent 9778 6166aa84a396
child 9798 f2b18754742f
child 9950 2759212a27de
child 9998 736015b847e3
permissions -rw-r--r--
- Remove obsolete protocol message - Fix some warnings
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
9080
9b42757d7e71 bump copyright year for Andrey entries
unc0rr
parents: 8848
diff changeset
     3
 * Copyright (c) 2004-2013 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
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
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;
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
    29
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word);
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
    30
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
    31
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
    32
procedure SetLand(var LandWord: Word; Pixel: LongWord); inline;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    33
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    34
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
    35
uses uStore, uConsts, uConsole, uRandom, uSound
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    36
     , uTypes, uVariables, uUtils, uDebug, SysUtils
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    37
     , uPhysFSLayer;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2695
diff changeset
    38
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
    39
const MaxRects = 512;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    40
      MAXOBJECTRECTS = 16;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    41
      MAXTHEMEOBJECTS = 32;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8028
diff changeset
    42
      cThemeCFGFilename = 'theme.cfg';
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    43
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 7021
diff changeset
    44
type TRectsArray = array[0..MaxRects] of TSDL_Rect;
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 7021
diff changeset
    45
     PRectArray = ^TRectsArray;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    46
     TThemeObject = record
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
    47
                     Surf, Mask: PSDL_Surface;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    48
                     inland: TSDL_Rect;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    49
                     outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    50
                     rectcnt: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    51
                     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
    52
                     Maxcnt: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    53
                     end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    54
     TThemeObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    55
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    56
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    57
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    58
     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
    59
                     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
    60
                     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
    61
                     Maxcnt: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    62
                     end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    63
     TSprayObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    64
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    65
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    66
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    67
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    68
var Rects: PRectArray;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    69
    RectCount: Longword;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    70
    ThemeObjects: TThemeObjects;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    71
    SprayObjects: TSprayObjects;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    72
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
    73
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
    74
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
    75
    // 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
    76
    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
    77
        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
    78
    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
    79
        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
    80
    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
    81
        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
    82
        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
    83
        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
    84
        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
    85
    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
    86
        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
    87
    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
    88
        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
    89
    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
    90
        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
    91
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
    92
6986
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    93
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
    94
begin
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    95
    BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, 0);
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    96
end;
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    97
    
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
    98
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word);
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
    99
var p: PLongwordArray;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   100
    x, y: Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   101
    bpp: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   102
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   103
WriteToConsole('Generating collision info... ');
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   104
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   105
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
   106
    SDLTry(SDL_LockSurface(Image) >= 0, true);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   107
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   108
bpp:= Image^.format^.BytesPerPixel;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   109
TryDo(bpp = 4, 'Land object should be 32bit', true);
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   110
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   111
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
   112
    Width:= Image^.w;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   113
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   114
p:= Image^.pixels;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   115
for y:= 0 to Pred(Image^.h) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   116
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   117
    for x:= 0 to Pred(Width) do
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   118
        if (p^[x] and AMask) <> 0 then
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   119
            begin
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   120
            if (cReducedQuality and rqBlurryLand) = 0 then
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   121
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   122
                if (LandPixels[cpY + y, cpX + x] = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   123
                or (((p^[x] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   124
                    LandPixels[cpY + y, cpX + x]:= p^[x];
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   125
                end
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   126
            else
5226
10ecd8bd8517 Don't need to check for this case
nemo
parents: 5225
diff changeset
   127
                if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then 
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   128
                    LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x];
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   129
8751
4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places.
nemo
parents: 8145
diff changeset
   130
            if (Land[cpY + y, cpX + x] <= lfAllObjMask) and ((p^[x] and AMask) <> 0) then
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   131
                Land[cpY + y, cpX + x]:= lfObject or LandFlags
6081
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents: 5832
diff changeset
   132
            end;
3509
d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag)
nemo
parents: 3463
diff changeset
   133
    p:= @(p^[Image^.pitch shr 2])
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   134
    end;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   135
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   136
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
   137
    SDL_UnlockSurface(Image);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   138
WriteLnToConsole(msgOK)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   139
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   140
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
   141
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
   142
var p, mp: PLongwordArray;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   143
    x, y: Longword;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   144
    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
   145
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
   146
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
   147
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
   148
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
   149
    SDLTry(SDL_LockSurface(Image) >= 0, true);
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
   150
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
   151
bpp:= Image^.format^.BytesPerPixel;
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
   152
TryDo(bpp = 4, 'Land object should be 32bit', true);
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
   153
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
   154
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
   155
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
   156
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
   157
    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
   158
    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
   159
        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
   160
        if (cReducedQuality and rqBlurryLand) = 0 then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   161
            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
   162
            if (LandPixels[cpY + y, cpX + x] = 0)
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   163
            or (((p^[x] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   164
                LandPixels[cpY + y, cpX + x]:= p^[x];
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   165
            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
   166
        else
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
   167
            if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 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
   168
                LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x];
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   169
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
   170
        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
   171
            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
   172
        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
   173
    p:= @(p^[Image^.pitch shr 2]);
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
   174
    mp:= @(mp^[Mask^.pitch shr 2])
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
   175
    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
   176
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
   177
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
   178
    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
   179
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
   180
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
   181
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   182
procedure AddRect(x1, y1, w1, h1: LongInt);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   183
begin
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   184
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
   185
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   186
    x:= x1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   187
    y:= y1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   188
    w:= w1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   189
    h:= h1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   190
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   191
inc(RectCount);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   192
TryDo(RectCount < MaxRects, 'AddRect: overflow', true)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   193
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   194
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   195
procedure InitRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   196
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   197
RectCount:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   198
New(Rects)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   199
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   200
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   201
procedure FreeRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   202
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   203
    Dispose(rects)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   204
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   205
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   206
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   207
var i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   208
    res: boolean = false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   209
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   210
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   211
i:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   212
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
   213
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   214
    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
   215
        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
   216
    inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   217
    until (i = RectCount) or (res);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   218
CheckIntersect:= res;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   219
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   220
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   221
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   222
function CountNonZeroz(x, y: LongInt): Longword;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   223
var i: LongInt;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   224
    lRes: Longword;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   225
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   226
    lRes:= 0;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   227
    for i:= y to y + 15 do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   228
        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
   229
            inc(lRes);
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   230
    CountNonZeroz:= lRes;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   231
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   232
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   233
function AddGirder(gX: LongInt): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   234
var tmpsurf: PSDL_Surface;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   235
    x1, x2, y, k, i: LongInt;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   236
    rr: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   237
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   238
begin
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   239
y:= topY+150;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   240
repeat
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   241
    inc(y, 24);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   242
    x1:= gX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   243
    x2:= gX;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   244
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   245
    while (x1 > Longint(leftX)+150) and (CountNonZeroz(x1, y) = 0) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   246
        dec(x1, 2);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   247
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   248
    i:= x1 - 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   249
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   250
        dec(x1, 2);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   251
        k:= CountNonZeroz(x1, y)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   252
    until (x1 < Longint(leftX)+150) or (k = 0) or (k = 16) or (x1 < i);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   253
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   254
    inc(x1, 2);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   255
    if k = 16 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   256
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   257
        while (x2 < (rightX-150)) and (CountNonZeroz(x2, y) = 0) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   258
            inc(x2, 2);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   259
        i:= x2 + 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   260
        repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   261
        inc(x2, 2);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   262
        k:= CountNonZeroz(x2, y)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   263
        until (x2 >= (rightX-150)) or (k = 0) or (k = 16) or (x2 > i) or (x2 - x1 >= 768);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   264
        
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   265
        if (x2 < (rightX - 150)) and (k = 16) and (x2 - x1 > 250) and (x2 - x1 < 768)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   266
        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
   267
                break;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   268
        end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   269
x1:= 0;
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1277
diff changeset
   270
until y > (LAND_HEIGHT-125);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   271
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   272
if x1 > 0 then
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   273
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   274
    bRes:= true;
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7555
diff changeset
   275
    tmpsurf:= LoadDataImageAltPath(ptCurrTheme, ptGraphics, 'Girder', ifCritical or ifTransparent or ifIgnoreCaps);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   276
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   277
    rr.x:= x1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   278
    while rr.x < x2 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   279
        begin
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   280
        if cIce then 
6112
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents: 6081
diff changeset
   281
            BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf, lfIce)
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents: 6081
diff changeset
   282
        else
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents: 6081
diff changeset
   283
            BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   284
        inc(rr.x, tmpsurf^.w);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   285
        end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   286
    SDL_FreeSurface(tmpsurf);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   287
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   288
    AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   289
end
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   290
else bRes:= false;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   291
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   292
AddGirder:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   293
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   294
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   295
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
   296
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   297
    bRes: boolean = true;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   298
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   299
inc(rect.x, dX);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   300
inc(rect.y, dY);
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   301
bx:= rect.x + rect.w;
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   302
by:= rect.y + rect.h;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   303
{$WARNINGS OFF}
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   304
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
   305
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
   306
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
   307
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   308
    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
   309
    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
   310
    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
   311
    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
   312
    inc(tmpx);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   313
    dec(tmpx2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   314
    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
   315
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
   316
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
   317
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
   318
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   319
    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
   320
    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
   321
    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
   322
    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
   323
    inc(tmpy);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   324
    dec(tmpy2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   325
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   326
{$WARNINGS ON}
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   327
CheckLand:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   328
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   329
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   330
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   331
var i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   332
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   333
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   334
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
   335
    if CheckLand(inland, x, y, lfBasic) then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   336
        begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   337
        bRes:= true;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   338
        i:= 1;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   339
        while bRes and (i <= rectcnt) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   340
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   341
            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
   342
            inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   343
            end;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   344
        if bRes then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   345
            bRes:= not CheckIntersect(x, y, Width, Height)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   346
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   347
    else
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   348
        bRes:= false;
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   349
CheckCanPlace:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   350
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   351
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   352
function TryPut(var Obj: TThemeObject): boolean; overload;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   353
const MaxPointsIndex = 2047;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   354
var x, y: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   355
    ar: array[0..MaxPointsIndex] of TPoint;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   356
    cnt, i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   357
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   358
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
   359
TryPut:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   360
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   361
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
   362
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   363
    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
   364
        exit;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   365
    x:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   366
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   367
        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
   368
        repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   369
            if CheckCanPlace(x, y, Obj) then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   370
                begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   371
                ar[cnt].x:= x;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   372
                ar[cnt].y:= y;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   373
                inc(cnt);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   374
                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
   375
                    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   376
                    y:= 5000;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   377
                    x:= 5000;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   378
                    end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   379
                end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   380
            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
   381
        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
   382
        inc(x, getrandom(6) + 3)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   383
    until x >= LAND_WIDTH - Width;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   384
    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
   385
    if bRes then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   386
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   387
        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
   388
        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
   389
             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
   390
        else BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   391
        AddRect(ar[i].x, ar[i].y, Width, Height);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   392
        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
   393
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   394
    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
   395
    end;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   396
TryPut:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   397
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   398
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   399
function TryPut(var Obj: TSprayObject; Surface: PSDL_Surface): boolean; overload;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   400
const MaxPointsIndex = 8095;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   401
var x, y: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   402
    ar: array[0..MaxPointsIndex] of TPoint;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   403
    cnt, i: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   404
    r: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   405
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   406
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
   407
TryPut:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   408
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   409
with Obj do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   410
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   411
    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
   412
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   413
    x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   414
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   415
    r.y:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   416
    r.w:= Width;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   417
    r.h:= Height + 16;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   418
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   419
        y:= 8;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   420
        repeat
3519
56cbc035b74b rename flags
nemo
parents: 3513
diff changeset
   421
            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
   422
            and (not CheckIntersect(x, y, Width, Height)) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   423
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   424
                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
   425
                ar[cnt].y:= y;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   426
                inc(cnt);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   427
                if cnt > MaxPointsIndex then // buffer is full, do not check the rest land
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   428
                    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   429
                    y:= 5000;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   430
                    x:= 5000;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   431
                    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   432
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   433
            inc(y, 12);
4159
64e677349124 REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents: 3976
diff changeset
   434
        until y >= LAND_HEIGHT - Height - 8;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   435
        inc(x, getrandom(12) + 12)
4159
64e677349124 REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents: 3976
diff changeset
   436
    until x >= LAND_WIDTH - Width;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   437
    bRes:= cnt <> 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   438
    if bRes then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   439
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   440
        i:= getrandom(cnt);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   441
        r.x:= ar[i].X;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   442
        r.y:= ar[i].Y;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   443
        r.w:= Width;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   444
        r.h:= Height;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   445
        SDL_UpperBlit(Obj.Surf, nil, Surface, @r);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   446
        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
   447
        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
   448
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   449
    else Maxcnt:= 0
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   450
    end;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   451
TryPut:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   452
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   453
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   454
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   455
procedure CheckRect(Width, Height, x, y, w, h: LongWord);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   456
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   457
    if (x + w > Width) then 
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   458
        OutError('Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   459
    if (y + h > Height) then 
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   460
        OutError('Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   461
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   462
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   463
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   464
var s, key: shortstring;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   465
    f: PFSFile;
5179
8d64dcb566ea Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents: 5166
diff changeset
   466
    i: LongInt;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   467
    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
   468
    c2: TSDL_Color;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   469
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
   470
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
   471
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
   472
// Set default water greyscale values
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   473
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
   474
    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
   475
    for i:= 0 to 3 do
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   476
        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
   477
        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
   478
        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
   479
            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
   480
        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
   481
        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
   482
        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
   483
        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
   484
    for i:= 0 to 1 do
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   485
        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
   486
        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
   487
        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
   488
            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
   489
        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
   490
        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
   491
        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
   492
        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
   493
    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
   494
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 7640
diff changeset
   495
s:= cPathz[ptCurrTheme] + '/' + cThemeCFGFilename;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   496
WriteLnToConsole('Reading objects info...');
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   497
f:= pfsOpenRead(s);
9778
6166aa84a396 Better diagnostic message when failing to load theme.cfg
unc0rr
parents: 9768
diff changeset
   498
TryDo(f <> nil, 'Bad data or cannot access file ' + s, true);
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   499
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   500
ThemeObjects.Count:= 0;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   501
SprayObjects.Count:= 0;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   502
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   503
while not pfsEOF(f) do
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   504
    begin
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   505
    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
   506
    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
   507
        continue;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   508
    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
   509
        continue;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   510
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   511
    i:= Pos('=', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   512
    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
   513
    Delete(s, 1, i);
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   514
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   515
    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
   516
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   517
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   518
        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
   519
        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
   520
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   521
        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
   522
        Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   523
        SkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   524
        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
   525
            then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   526
            begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   527
            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
   528
            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
   529
                t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   530
            SkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   531
            SkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   532
            SkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   533
            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
   534
        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
   535
        SDSkyColor.r:= SkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   536
        SDSkyColor.g:= SkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   537
        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
   538
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   539
    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
   540
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   541
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   542
        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
   543
        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
   544
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   545
        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
   546
        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
   547
        c2.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   548
        if GrayScale then
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   549
            begin
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   550
            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
   551
            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
   552
                t:= 255;
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   553
            c2.r:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   554
            c2.g:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   555
            c2.b:= t
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   556
            end;
7555
acadabfb2dd1 byte order
nemo
parents: 7546
diff changeset
   557
        ExplosionBorderColor:= (c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift) or AMask; 
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   558
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   559
    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
   560
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   561
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   562
        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
   563
        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
   564
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   565
        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
   566
        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
   567
        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
   568
        WaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   569
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   570
            begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   571
            t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   572
            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
   573
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   574
            WaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   575
            WaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   576
            WaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   577
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   578
        WaterColorArray[1]:= WaterColorArray[0];
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   579
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   580
    else if key = 'water-bottom' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   581
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   582
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   583
        WaterColorArray[2].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   584
        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
   585
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   586
        WaterColorArray[2].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   587
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   588
        WaterColorArray[2].b:= StrToInt(Trim(s));
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   589
        WaterColorArray[2].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   590
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   591
            begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   592
            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
   593
            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
   594
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   595
            WaterColorArray[2].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   596
            WaterColorArray[2].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   597
            WaterColorArray[2].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   598
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   599
        WaterColorArray[3]:= WaterColorArray[2];
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   600
        end
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   601
    else if key = 'water-opacity' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   602
        begin
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   603
        WaterOpacity:= StrToInt(Trim(s));
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   604
        SDWaterOpacity:= WaterOpacity
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   605
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   606
    else if key = 'music' then
7053
8c9dcaedc7a8 Make pas2c happier with uSound
unc0rr
parents: 7035
diff changeset
   607
        SetMusicName(Trim(s))
4792
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4782
diff changeset
   608
    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
   609
        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
   610
        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
   611
        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
   612
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   613
    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
   614
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   615
        inc(ThemeObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   616
        with ThemeObjects.objs[Pred(ThemeObjects.Count)] do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   617
            begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   618
            i:= Pos(',', s);
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
   619
            Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps or ifCritical);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   620
            Width:= Surf^.w;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   621
            Height:= Surf^.h;
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
   622
            Mask:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i)))+'_mask', ifTransparent or ifIgnoreCaps);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   623
            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
   624
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   625
            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
   626
            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
   627
            if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   628
                OutError('Object''s max count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   629
            with inland do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   630
                begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   631
                i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   632
                x:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   633
                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
   634
                i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   635
                y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   636
                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
   637
                i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   638
                w:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   639
                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
   640
                i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   641
                h:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   642
                Delete(s, 1, i);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   643
                CheckRect(Width, Height, x, y, w, h)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   644
                end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   645
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   646
            rectcnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   647
            Delete(s, 1, i);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   648
            for ii:= 1 to rectcnt do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   649
                with outland[ii] do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   650
                    begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   651
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   652
                    x:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   653
                    Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   654
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   655
                    y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   656
                    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
   657
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   658
                    w:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   659
                    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
   660
                    if ii = rectcnt then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   661
                        h:= StrToInt(Trim(s))
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   662
                    else
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   663
                        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   664
                        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   665
                        h:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   666
                        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
   667
                        end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   668
                    CheckRect(Width, Height, x, y, w, h)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   669
                    end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   670
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   671
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   672
    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
   673
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   674
        inc(SprayObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   675
        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
   676
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   677
            i:= Pos(',', s);
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7555
diff changeset
   678
            Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   679
            Width:= Surf^.w;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   680
            Height:= Surf^.h;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   681
            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
   682
            Maxcnt:= StrToInt(Trim(s));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   683
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   684
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   685
    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
   686
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   687
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   688
        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
   689
        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
   690
        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
   691
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   692
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   693
            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
   694
            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
   695
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   696
            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
   697
            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
   698
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   699
            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
   700
            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
   701
            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
   702
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   703
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   704
    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
   705
        cFlattenFlakes:= true
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   706
    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
   707
        cFlattenClouds:= true
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   708
    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
   709
        cIce:= true
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   710
    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
   711
        cSnow:= true
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   712
    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
   713
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   714
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   715
        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
   716
        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
   717
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   718
        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
   719
        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
   720
        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
   721
        SDWaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   722
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   723
            begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   724
            t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   725
            if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   726
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   727
            SDWaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   728
            SDWaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   729
            SDWaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   730
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   731
        SDWaterColorArray[1]:= SDWaterColorArray[0];
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   732
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   733
    else if key = 'sd-water-bottom' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   734
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   735
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   736
        SDWaterColorArray[2].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   737
        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
   738
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   739
        SDWaterColorArray[2].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   740
        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
   741
        SDWaterColorArray[2].b:= StrToInt(Trim(s));
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   742
        SDWaterColorArray[2].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   743
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   744
            begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   745
            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
   746
            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
   747
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   748
            SDWaterColorArray[2].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   749
            SDWaterColorArray[2].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   750
            SDWaterColorArray[2].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   751
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   752
        SDWaterColorArray[3]:= SDWaterColorArray[2];
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   753
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   754
    else if key = 'sd-water-opacity' then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   755
        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
   756
    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
   757
        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
   758
    else if key = 'sd-flakes' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   759
        begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   760
        i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   761
        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
   762
        Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   763
        if vobSDCount > 0 then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   764
            begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   765
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   766
            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
   767
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   768
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   769
            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
   770
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   771
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   772
            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
   773
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   774
            vobSDFallSpeed:= StrToInt(Trim(s));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   775
            end;
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   776
        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
   777
    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
   778
        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
   779
        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
   780
            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
   781
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   782
            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
   783
            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
   784
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   785
            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
   786
            Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   787
            RQSkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   788
            if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   789
                begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   790
                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
   791
                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
   792
                    t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   793
                RQSkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   794
                RQSkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   795
                RQSkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   796
                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
   797
            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
   798
            SDSkyColor.r:= RQSkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   799
            SDSkyColor.g:= RQSkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   800
            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
   801
            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
   802
        end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   803
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   804
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   805
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
   806
AddProgress;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   807
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   808
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   809
procedure AddThemeObjects(var ThemeObjects: TThemeObjects);
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   810
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   811
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   812
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   813
    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
   814
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   815
    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
   816
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   817
    for i:=0 to ThemeObjects.Count do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   818
        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
   819
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   820
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   821
        t := getrandom(ThemeObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   822
        b := false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   823
        for i:=0 to ThemeObjects.Count do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   824
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   825
            ii := (i+t) mod ThemeObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   826
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   827
            if ThemeObjects.objs[ii].Maxcnt <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   828
                b := b or TryPut(ThemeObjects.objs[ii])
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   829
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   830
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   831
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   832
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   833
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects);
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   834
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   835
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   836
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   837
    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
   838
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   839
    WriteLnToConsole('Adding spray objects...');
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   840
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   841
    for i:=0 to SprayObjects.Count do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   842
        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
   843
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   844
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   845
        t := getrandom(SprayObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   846
        b := false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   847
        for i:=0 to SprayObjects.Count do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   848
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   849
            ii := (i+t) mod SprayObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   850
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   851
            if SprayObjects.objs[ii].Maxcnt <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   852
                b := b or TryPut(SprayObjects.objs[ii], Surface)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   853
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   854
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   855
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   856
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   857
procedure AddObjects();
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   858
var i, g: Longword;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   859
begin
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   860
InitRects;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   861
if hasGirders then
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   862
    begin
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   863
    g:= max(playWidth div 8, 256);
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   864
    i:= leftX + g;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   865
    repeat
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   866
        AddGirder(i);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   867
        i:=i + g;
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   868
    until (i > rightX - g);
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   869
    end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   870
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
   871
    AddThemeObjects(ThemeObjects);
2705
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
   872
AddProgress();
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
   873
FreeRects();
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   874
end;
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   875
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   876
procedure AddOnLandObjects(Surface: PSDL_Surface);
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   877
begin
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   878
InitRects;
2275
3f56c99a70f8 Make all theme numbers proportional to map MaxHedgehogs. This should mean the numbers should be as in past for 18 hedgehog map
nemo
parents: 2272
diff changeset
   879
//AddSprayObjects(Surface, SprayObjects, 12);
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   880
AddSprayObjects(Surface, SprayObjects);
1186
bf5af791d234 Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents: 1185
diff changeset
   881
FreeRects
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   882
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   883
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   884
procedure LoadThemeConfig;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   885
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   886
    ReadThemeInfo(ThemeObjects, SprayObjects)
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   887
end;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   888
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
   889
procedure FreeLandObjects();
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
   890
var i: Longword;
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
   891
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   892
    for i:= 0 to Pred(MAXTHEMEOBJECTS) do
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   893
    begin
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   894
        if ThemeObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   895
            SDL_FreeSurface(ThemeObjects.objs[i].Surf);
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   896
        if SprayObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   897
            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
   898
        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
   899
        SprayObjects.objs[i].Surf:= nil;
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   900
    end;
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
   901
end;
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
   902
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   903
end.