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