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