hedgewars/uLand.pas
author sheepluva
Sat, 02 Aug 2014 02:42:12 +0200
changeset 10373 5e83d029e918
parent 10249 b47ac2c19de3
child 10387 cb17b79844b5
permissions -rw-r--r--
fix flake angles
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 955
diff changeset
     2
 * Hedgewars, a free turn based strategy game
9998
736015b847e3 update copyright to 2014
sheepluva
parents: 9892
diff changeset
     3
 * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     4
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     8
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
    12
 * GNU General Public License for more details.
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    13
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
    14
 * You should have received a copy of the GNU General Public License
57c2ef19f719 Relicense to GPL
unc0rr
parents: 173
diff changeset
    15
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10040
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    17
 *)
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    18
2599
c7153d2348f3 move compiler directives to standard pascal
koda
parents: 2592
diff changeset
    19
{$INCLUDE "options.inc"}
2587
0dfa56a8513c fix a segfault in the iphone simulator by moving options.inc at the beginning of the file
koda
parents: 2376
diff changeset
    20
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    21
unit uLand;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    22
interface
10249
b47ac2c19de3 get rid of fpc warnings/hints
sheepluva
parents: 10198
diff changeset
    23
uses SDLh, uLandTemplates, uConsts, uTypes, uAILandMarks;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    24
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3017
diff changeset
    25
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3017
diff changeset
    26
procedure freeModule;
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
    27
procedure DrawBottomBorder;
37
2b7f2a43b999 - Properly get seed in net game
unc0rr
parents: 35
diff changeset
    28
procedure GenMap;
7079
939f53515489 Learn hask^Wpascal, dudes!
unc0rr
parents: 7063
diff changeset
    29
procedure GenPreview(out Preview: TPreview);
10162
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
    30
procedure GenPreviewAlpha(out Preview: TPreviewAlpha);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    31
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    32
implementation
7063
a0326412e96a sysutils -> SysUtils
unc0rr
parents: 7051
diff changeset
    33
uses uConsole, uStore, uRandom, uLandObjects, uIO, uLandTexture, SysUtils,
6626
a447993f2ad7 Further work on propagating types. Now it hopefully works fully, just need to annotate namespace with types first.
unc0rr
parents: 6580
diff changeset
    34
     uVariables, uUtils, uCommands, adler32, uDebug, uLandPainted, uTextures,
10249
b47ac2c19de3 get rid of fpc warnings/hints
sheepluva
parents: 10198
diff changeset
    35
     uLandGenMaze, uPhysFSLayer, uScript, uLandGenPerlin,
10198
e9cbe111c0df Move template-based generator into its own file
unc0rr
parents: 10197
diff changeset
    36
     uLandGenTemplateBased, uLandUtils;
365
a26cec847dd7 - New land generator feature: islands in the sky
unc0rr
parents: 364
diff changeset
    37
7028
0f60591f3a16 old typed const moved to their proper unit
koda
parents: 6982
diff changeset
    38
var digest: shortstring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    39
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
    40
10016
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
    41
procedure PrettifyLandAlpha();
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
    42
begin
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
    43
    if (cReducedQuality and rqBlurryLand) <> 0 then
10018
bdf75f0350bd (experimental) merging the new procedures for different pixel representations (1D/2D arrays) into a single procedure with the algorithm and two procedures for the different mapping. - because redundant code sucks (at least twice)
sheepluva
parents: 10016
diff changeset
    44
        PrettifyAlpha2D(LandPixels, LAND_HEIGHT div 2, LAND_WIDTH div 2)
bdf75f0350bd (experimental) merging the new procedures for different pixel representations (1D/2D arrays) into a single procedure with the algorithm and two procedures for the different mapping. - because redundant code sucks (at least twice)
sheepluva
parents: 10016
diff changeset
    45
    else
bdf75f0350bd (experimental) merging the new procedures for different pixel representations (1D/2D arrays) into a single procedure with the algorithm and two procedures for the different mapping. - because redundant code sucks (at least twice)
sheepluva
parents: 10016
diff changeset
    46
        PrettifyAlpha2D(LandPixels, LAND_HEIGHT, LAND_WIDTH);
10016
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
    47
end;
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
    48
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
    49
procedure DrawBorderFromImage(Surface: PSDL_Surface);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    50
var tmpsurf: PSDL_Surface;
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
    51
    r, rr: TSDL_Rect;
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
    52
    x, yd, yu: LongInt;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    53
begin
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
    54
    tmpsurf:= LoadDataImage(ptCurrTheme, 'Border', ifCritical or ifIgnoreCaps or ifTransparent);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    55
    for x:= 0 to LAND_WIDTH - 1 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    56
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    57
        yd:= LAND_HEIGHT - 1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    58
        repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    59
            while (yd > 0) and (Land[yd, x] =  0) do dec(yd);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2338
diff changeset
    60
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    61
            if (yd < 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    62
                yd:= 0;
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
    63
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    64
            while (yd < LAND_HEIGHT) and (Land[yd, x] <> 0) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    65
                inc(yd);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    66
            dec(yd);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    67
            yu:= yd;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2338
diff changeset
    68
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    69
            while (yu > 0  ) and (Land[yu, x] <> 0) do dec(yu);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    70
            while (yu < yd ) and (Land[yu, x] =  0) do inc(yu);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2338
diff changeset
    71
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    72
            if (yd < LAND_HEIGHT - 1) and ((yd - yu) >= 16) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    73
                begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    74
                rr.x:= x;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    75
                rr.y:= yd - 15;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    76
                r.x:= x mod tmpsurf^.w;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    77
                r.y:= 16;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    78
                r.w:= 1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    79
                r.h:= 16;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    80
                SDL_UpperBlit(tmpsurf, @r, Surface, @rr);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    81
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    82
            if (yu > 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    83
                begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    84
                rr.x:= x;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    85
                rr.y:= yu;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    86
                r.x:= x mod tmpsurf^.w;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    87
                r.y:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    88
                r.w:= 1;
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4368
diff changeset
    89
                r.h:= Min(16, yd - yu + 1);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    90
                SDL_UpperBlit(tmpsurf, @r, Surface, @rr);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
    91
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    92
            yd:= yu - 1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    93
        until yd < 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    94
    end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    95
    SDL_FreeSurface(tmpsurf);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    96
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    97
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
    98
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
    99
procedure DrawShoppaBorder;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   100
var x, y, s, i: Longword;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   101
    c1, c2, c: Longword;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   102
begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   103
    c1:= AMask;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   104
    c2:= AMask or RMask or GMask;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   105
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   106
    // vertical
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   107
    s:= LAND_HEIGHT;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   108
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   109
    for x:= 0 to LAND_WIDTH - 1 do
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   110
        for y:= 0 to LAND_HEIGHT - 1 do
9864
f7eb0d87c9b6 Oops, meant Land
unc0rr
parents: 9524
diff changeset
   111
            if Land[y, x] = 0 then
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   112
                if s < y then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   113
                    begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   114
                    for i:= max(s, y - 8) to y - 1 do
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   115
                        begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   116
                        if ((x + i) and 16) = 0 then c:= c1 else c:= c2;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   117
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   118
                        if (cReducedQuality and rqBlurryLand) = 0 then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   119
                            LandPixels[i, x]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   120
                        else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   121
                            LandPixels[i div 2, x div 2]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   122
                        end;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   123
                    s:= LAND_HEIGHT
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   124
                    end
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   125
                else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   126
            else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   127
                begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   128
                if s > y then s:= y;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   129
                if s + 8 > y then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   130
                    begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   131
                    if ((x + y) and 16) = 0 then c:= c1 else c:= c2;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   132
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   133
                    if (cReducedQuality and rqBlurryLand) = 0 then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   134
                        LandPixels[y, x]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   135
                    else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   136
                        LandPixels[y div 2, x div 2]:= c
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   137
                    end;
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   138
                end;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   139
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   140
    // horizontal
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   141
    s:= LAND_WIDTH;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   142
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   143
    for y:= 0 to LAND_HEIGHT - 1 do
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   144
        for x:= 0 to LAND_WIDTH - 1 do
9864
f7eb0d87c9b6 Oops, meant Land
unc0rr
parents: 9524
diff changeset
   145
            if Land[y, x] = 0 then
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   146
                if s < x then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   147
                    begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   148
                    for i:= max(s, x - 8) to x - 1 do
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   149
                        begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   150
                        if ((y + i) and 16) = 0 then c:= c1 else c:= c2;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   151
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   152
                        if (cReducedQuality and rqBlurryLand) = 0 then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   153
                            LandPixels[y, i]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   154
                        else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   155
                            LandPixels[y div 2, i div 2]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   156
                        end;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   157
                    s:= LAND_WIDTH
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   158
                    end
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   159
                else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   160
            else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   161
                begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   162
                if s > x then s:= x;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   163
                if s + 8 > x then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   164
                    begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   165
                    if ((x + y) and 16) = 0 then c:= c1 else c:= c2;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   166
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   167
                    if (cReducedQuality and rqBlurryLand) = 0 then
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   168
                        LandPixels[y, x]:= c
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   169
                    else
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   170
                        LandPixels[y div 2, x div 2]:= c
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   171
                    end;
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   172
                end
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   173
end;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   174
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   175
procedure ColorizeLand(Surface: PSDL_Surface);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   176
var tmpsurf: PSDL_Surface;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   177
    r: TSDL_Rect;
10197
c57798251b55 Some optimizations
unc0rr
parents: 10189
diff changeset
   178
    y: LongInt; // stupid SDL 1.2 uses stupid SmallInt for y which limits us to 32767.  But is even worse if LandTex is large, can overflow on 32767 map.
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   179
begin
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   180
    tmpsurf:= LoadDataImage(ptCurrTheme, 'LandTex', ifCritical or ifIgnoreCaps);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   181
    r.y:= 0;
9892
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   182
    y:= 0;
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   183
    while y < LAND_HEIGHT do
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   184
        begin
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   185
        r.x:= 0;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   186
        while r.x < LAND_WIDTH do
9892
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   187
            begin
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   188
            SDL_UpperBlit(tmpsurf, nil, Surface, @r);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   189
            inc(r.x, tmpsurf^.w)
9892
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   190
            end;
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   191
        inc(y, tmpsurf^.h);
5a0a7ef7af2d allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2
nemo
parents: 9864
diff changeset
   192
        r.y:= y
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   193
        end;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   194
    SDL_FreeSurface(tmpsurf);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   195
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   196
    // freed in freeModule() below
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   197
    LandBackSurface:= LoadDataImage(ptCurrTheme, 'LandBackTex', ifIgnoreCaps or ifTransparent);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   198
    if (LandBackSurface <> nil) and GrayScale then Surface2GrayScale(LandBackSurface);
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   199
end;
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   200
23
16322d14f068 - Land generator uses templates to generate
unc0rr
parents: 22
diff changeset
   201
4494
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   202
procedure GenDrawnMap;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   203
begin
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   204
    ResizeLand(4096, 2048);
4494
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   205
    uLandPainted.Draw;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   206
4559
194d5a7a3fd4 Report 48 hogs for drawn maps
unc0rr
parents: 4494
diff changeset
   207
    MaxHedgehogs:= 48;
4494
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   208
    hasGirders:= true;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   209
    playHeight:= 2048;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   210
    playWidth:= 4096;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   211
    leftX:= ((LAND_WIDTH - playWidth) div 2);
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   212
    rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   213
    topY:= LAND_HEIGHT - playHeight;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   214
end;
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   215
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 368
diff changeset
   216
function SelectTemplate: LongInt;
9243
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   217
var l: LongInt;
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 160
diff changeset
   218
begin
3612
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   219
    if (cReducedQuality and rqLowRes) <> 0 then
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   220
        SelectTemplate:= SmallTemplates[getrandom(Succ(High(SmallTemplates)))]
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   221
    else
9243
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   222
    begin
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   223
        if cTemplateFilter = 0 then
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   224
            begin
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   225
            l:= getRandom(GroupedTemplatesCount);
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   226
            repeat
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   227
                inc(cTemplateFilter);
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   228
                dec(l, TemplateCounts[cTemplateFilter]);
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   229
            until l < 0;
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   230
            end else getRandom(1);
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   231
3612
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   232
        case cTemplateFilter of
9243
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   233
        0: OutError('Ask unC0Rr about what you did wrong', true);
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   234
        1: SelectTemplate:= SmallTemplates[getrandom(TemplateCounts[cTemplateFilter])];
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   235
        2: SelectTemplate:= MediumTemplates[getrandom(TemplateCounts[cTemplateFilter])];
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   236
        3: SelectTemplate:= LargeTemplates[getrandom(TemplateCounts[cTemplateFilter])];
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   237
        4: SelectTemplate:= CavernTemplates[getrandom(TemplateCounts[cTemplateFilter])];
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   238
        5: SelectTemplate:= WackyTemplates[getrandom(TemplateCounts[cTemplateFilter])];
7567
da2aa8355d91 allow lua to specify template by number
nemo
parents: 7559
diff changeset
   239
// For lua only!
7575
f415b3e0f3b9 Burn a random number in the override. Make sure cirbuf is reset.
nemo
parents: 7571
diff changeset
   240
        6: begin
7594
5f03595335e6 fromdos + fix end of turn velocity
nemo
parents: 7591
diff changeset
   241
           SelectTemplate:= min(LuaTemplateNumber,High(EdgeTemplates));
7575
f415b3e0f3b9 Burn a random number in the override. Make sure cirbuf is reset.
nemo
parents: 7571
diff changeset
   242
           GetRandom(2) // burn 1
10142
adb804cb2638 Reduce number of warnings in pas2c-generated code
unc0rr
parents: 10131
diff changeset
   243
           end
9243
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   244
        end
3612
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   245
    end;
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   246
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   247
    WriteLnToConsole('Selected template #'+inttostr(SelectTemplate)+' using filter #'+inttostr(cTemplateFilter));
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 160
diff changeset
   248
end;
d8870bbf960e - AmmoMenu
unc0rr
parents: 160
diff changeset
   249
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   250
procedure LandSurface2LandPixels(Surface: PSDL_Surface);
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   251
var x, y: LongInt;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   252
    p: PLongwordArray;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1085
diff changeset
   253
begin
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   254
TryDo(Surface <> nil, 'Assert (LandSurface <> nil) failed', true);
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   255
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   256
if SDL_MustLock(Surface) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   257
    SDLTry(SDL_LockSurface(Surface) >= 0, true);
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1085
diff changeset
   258
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   259
p:= Surface^.pixels;
1760
55a1edd97911 Fix nemo's large land patch
unc0rr
parents: 1754
diff changeset
   260
for y:= 0 to LAND_HEIGHT - 1 do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   261
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   262
    for x:= 0 to LAND_WIDTH - 1 do
3598
a8aa06bae895 tiy new overlay graphics
koda
parents: 3595
diff changeset
   263
    if Land[y, x] <> 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: 3551
diff changeset
   264
        if (cReducedQuality and rqBlurryLand) = 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   265
            LandPixels[y, x]:= p^[x] or AMask
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3551
diff changeset
   266
        else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   267
            LandPixels[y div 2, x div 2]:= p^[x] or AMask;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2338
diff changeset
   268
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   269
    p:= PLongwordArray(@(p^[Surface^.pitch div 4]));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   270
    end;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1085
diff changeset
   271
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   272
if SDL_MustLock(Surface) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   273
    SDL_UnlockSurface(Surface);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   274
end;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   275
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3058
diff changeset
   276
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   277
procedure GenLandSurface;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   278
var tmpsurf: PSDL_Surface;
5225
d38211100f4d Experiment in making the land less jagg-y
nemo
parents: 4976
diff changeset
   279
    x,y: Longword;
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   280
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   281
    AddProgress();
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   282
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   283
    tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, LAND_WIDTH, LAND_HEIGHT, 32, RMask, GMask, BMask, 0);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   284
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   285
    TryDo(tmpsurf <> nil, 'Error creating pre-land surface', true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   286
    ColorizeLand(tmpsurf);
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   287
    if gameFlags and gfShoppaBorder = 0 then DrawBorderFromImage(tmpsurf);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   288
    AddOnLandObjects(tmpsurf);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   289
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   290
    LandSurface2LandPixels(tmpsurf);
5227
nemo
parents: 5225
diff changeset
   291
    SDL_FreeSurface(tmpsurf);
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   292
9387
6478ed9ead25 gfShoppaBorder
unc0rr
parents: 9295
diff changeset
   293
    if gameFlags and gfShoppaBorder <> 0 then DrawShoppaBorder;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   294
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   295
    for x:= leftX+2 to rightX-2 do
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   296
        for y:= topY+2 to LAND_HEIGHT-3 do
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   297
            if (Land[y, x] = 0) and
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   298
               (((Land[y, x-1] = lfBasic) and ((Land[y+1,x] = lfBasic)) or (Land[y-1,x] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   299
               ((Land[y, x+1] = lfBasic) and ((Land[y-1,x] = lfBasic) or (Land[y+1,x] = lfBasic)))) then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   300
            begin
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   301
                if (cReducedQuality and rqBlurryLand) = 0 then
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   302
                    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   303
                    if (Land[y, x-1] = lfBasic) and (LandPixels[y, x-1] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   304
                        LandPixels[y, x]:= LandPixels[y, x-1]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   305
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   306
                    else if (Land[y, x+1] = lfBasic) and (LandPixels[y, x+1] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   307
                        LandPixels[y, x]:= LandPixels[y, x+1]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   308
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   309
                    else if (Land[y-1, x] = lfBasic) and (LandPixels[y-1, x] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   310
                        LandPixels[y, x]:= LandPixels[y-1, x]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   311
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   312
                    else if (Land[y+1, x] = lfBasic) and (LandPixels[y+1, x] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   313
                        LandPixels[y, x]:= LandPixels[y+1, x];
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   314
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   315
                    if (((LandPixels[y,x] and AMask) shr AShift) > 10) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   316
                        LandPixels[y,x]:= (LandPixels[y,x] and (not AMask)) or (128 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   317
                    end;
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   318
                Land[y,x]:= lfObject
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   319
            end
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   320
            else if (Land[y, x] = 0) and
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   321
                    (((Land[y, x-1] = lfBasic) and (Land[y+1,x-1] = lfBasic) and (Land[y+2,x] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   322
                    ((Land[y, x-1] = lfBasic) and (Land[y-1,x-1] = lfBasic) and (Land[y-2,x] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   323
                    ((Land[y, x+1] = lfBasic) and (Land[y+1,x+1] = lfBasic) and (Land[y+2,x] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   324
                    ((Land[y, x+1] = lfBasic) and (Land[y-1,x+1] = lfBasic) and (Land[y-2,x] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   325
                    ((Land[y+1, x] = lfBasic) and (Land[y+1,x+1] = lfBasic) and (Land[y,x+2] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   326
                    ((Land[y-1, x] = lfBasic) and (Land[y-1,x+1] = lfBasic) and (Land[y,x+2] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   327
                    ((Land[y+1, x] = lfBasic) and (Land[y+1,x-1] = lfBasic) and (Land[y,x-2] = lfBasic)) or
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   328
                    ((Land[y-1, x] = lfBasic) and (Land[y-1,x-1] = lfBasic) and (Land[y,x-2] = lfBasic))) then
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   329
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   330
                begin
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   331
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   332
                if (cReducedQuality and rqBlurryLand) = 0 then
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   333
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   334
                    begin
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   335
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   336
                    if (Land[y, x-1] = lfBasic) and (LandPixels[y,x-1] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   337
                        LandPixels[y, x]:= LandPixels[y, x-1]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   338
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   339
                    else if (Land[y, x+1] = lfBasic) and (LandPixels[y,x+1] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   340
                        LandPixels[y, x]:= LandPixels[y, x+1]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   341
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   342
                    else if (Land[y+1, x] = lfBasic) and (LandPixels[y+1,x] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   343
                        LandPixels[y, x]:= LandPixels[y+1, x]
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   344
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   345
                    else if (Land[y-1, x] = lfBasic) and (LandPixels[y-1,x] and AMask <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   346
                        LandPixels[y, x]:= LandPixels[y-1, x];
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   347
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   348
                    if (((LandPixels[y,x] and AMask) shr AShift) > 10) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   349
                        LandPixels[y,x]:= (LandPixels[y,x] and (not AMask)) or (64 shl AShift)
5274
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   350
                    end;
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   351
                Land[y,x]:= lfObject
941da059472b Avoid desyncing on blurry land
nemo
parents: 5241
diff changeset
   352
            end;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   353
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   354
    AddProgress();
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   355
end;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   356
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   357
procedure MakeFortsMap;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   358
var tmpsurf: PSDL_Surface;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   359
begin
7922
2fc02902c7cb fix for forts mode *sob*
nemo
parents: 7640
diff changeset
   360
ResizeLand(4096,2048);
2866
450ca0afcd58 Set 32 hog limit for fort maps
nemo
parents: 2747
diff changeset
   361
MaxHedgehogs:= 32;
2171
8208946331ba Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents: 2163
diff changeset
   362
// For now, defining a fort is playable area as 3072x1200 - there are no tall forts.  The extra height is to avoid triggering border with current code, also if user turns on a border, it will give a bit more maneuvering room.
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   363
playHeight:= 1200;
2096
356468481e74 set Minefield to 150%, reduce fort distance by 512px
nemo
parents: 1906
diff changeset
   364
playWidth:= 2560;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   365
leftX:= (LAND_WIDTH - playWidth) div 2;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   366
rightX:= ((playWidth + (LAND_WIDTH - playWidth) div 2) - 1);
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   367
topY:= LAND_HEIGHT - playHeight;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   368
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   369
WriteLnToConsole('Generating forts land...');
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   370
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   371
tmpsurf:= LoadDataImage(ptForts, ClansArray[0]^.Teams[0]^.FortName + 'L', ifAlpha or ifCritical or ifTransparent or ifIgnoreCaps);
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   372
BlitImageAndGenerateCollisionInfo(leftX+150, LAND_HEIGHT - tmpsurf^.h, tmpsurf^.w, tmpsurf);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   373
SDL_FreeSurface(tmpsurf);
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   374
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   375
tmpsurf:= LoadDataImage(ptForts, ClansArray[1]^.Teams[0]^.FortName + 'R', ifAlpha or ifCritical or ifTransparent or ifIgnoreCaps);
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   376
BlitImageAndGenerateCollisionInfo(rightX - 150 - tmpsurf^.w, LAND_HEIGHT - tmpsurf^.h, tmpsurf^.w, tmpsurf);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   377
SDL_FreeSurface(tmpsurf);
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   378
end;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   379
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   380
procedure LoadMapConfig;
8060
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   381
var f: PFSFile;
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   382
    s: shortstring;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   383
begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   384
s:= cPathz[ptMapCurrent] + '/map.cfg';
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   385
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   386
WriteLnToConsole('Fetching map HH limit');
8060
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   387
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   388
f:= pfsOpenRead(s);
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   389
if f <> nil then
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   390
    begin
8060
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   391
    pfsReadLn(f, s);
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   392
    if not pfsEof(f) then
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   393
        begin
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   394
        pfsReadLn(f, s);
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   395
        val(s, MaxHedgehogs)
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   396
        end;
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   397
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   398
    pfsClose(f)
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   399
    end;
8060
341fa76d0749 Convert reading hedgehogs limit from map config
unc0rr
parents: 8025
diff changeset
   400
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   401
if (MaxHedgehogs = 0) then
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   402
    MaxHedgehogs:= 18;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   403
end;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   404
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: 5231
diff changeset
   405
// Loads Land[] from an image, allowing overriding standard collision
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   406
procedure LoadMask;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   407
var tmpsurf: PSDL_Surface;
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   408
    p: PLongwordArray;
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   409
    x, y, cpX, cpY: Longword;
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   410
    mapName: shortstring;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   411
begin
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   412
tmpsurf:= LoadDataImage(ptMapCurrent, 'mask', ifAlpha or ifTransparent or ifIgnoreCaps);
5770
022a18320f01 load mask from user path as well
nemo
parents: 5719
diff changeset
   413
if tmpsurf = nil then
022a18320f01 load mask from user path as well
nemo
parents: 5719
diff changeset
   414
    begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   415
    mapName:= ExtractFileName(cPathz[ptMapCurrent]);
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   416
    tmpsurf:= LoadDataImage(ptMissionMaps, mapName + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
5770
022a18320f01 load mask from user path as well
nemo
parents: 5719
diff changeset
   417
    end;
3920
a54ca6185307 updated lua loading in the ifrontend and also fixed masked maps
koda
parents: 3912
diff changeset
   418
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   419
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   420
if (tmpsurf <> nil) and (tmpsurf^.format^.BytesPerPixel = 4) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   421
    begin
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   422
    if LAND_WIDTH = 0 then
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   423
        begin
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   424
        LoadMapConfig;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   425
        ResizeLand(tmpsurf^.w, tmpsurf^.h);
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   426
        playHeight:= tmpsurf^.h;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   427
        playWidth:= tmpsurf^.w;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   428
        leftX:= (LAND_WIDTH - playWidth) div 2;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   429
        rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   430
        topY:= LAND_HEIGHT - playHeight;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   431
        end;
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   432
    disableLandBack:= true;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2338
diff changeset
   433
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   434
    cpX:= (LAND_WIDTH - tmpsurf^.w) div 2;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   435
    cpY:= LAND_HEIGHT - tmpsurf^.h;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   436
    if SDL_MustLock(tmpsurf) then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   437
        SDLTry(SDL_LockSurface(tmpsurf) >= 0, true);
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   438
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   439
        p:= tmpsurf^.pixels;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   440
        for y:= 0 to Pred(tmpsurf^.h) do
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8370
diff changeset
   441
            begin
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   442
            for x:= 0 to Pred(tmpsurf^.w) do
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8370
diff changeset
   443
                SetLand(Land[cpY + y, cpX + x], p^[x]);
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   444
            p:= PLongwordArray(@(p^[tmpsurf^.pitch div 4]));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   445
            end;
2243
b4764993f833 additional touch support and nemo's reduced land array size
koda
parents: 2240
diff changeset
   446
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   447
    if SDL_MustLock(tmpsurf) then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   448
        SDL_UnlockSurface(tmpsurf);
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   449
    if not disableLandBack then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   450
        begin
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   451
        // freed in freeModule() below
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   452
        LandBackSurface:= LoadDataImage(ptCurrTheme, 'LandBackTex', ifIgnoreCaps or ifTransparent);
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6927
diff changeset
   453
        if (LandBackSurface <> nil) and GrayScale then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   454
            Surface2GrayScale(LandBackSurface)
6096
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   455
        end;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   456
end;
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   457
if (tmpsurf <> nil) then
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   458
    SDL_FreeSurface(tmpsurf);
a00dbbf49d6c Add landbacktex to a few maps, just to see how it looks.
nemo
parents: 6082
diff changeset
   459
tmpsurf:= nil;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   460
end;
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   461
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   462
procedure LoadMap;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   463
var tmpsurf: PSDL_Surface;
3920
a54ca6185307 updated lua loading in the ifrontend and also fixed masked maps
koda
parents: 3912
diff changeset
   464
    mapName: shortstring = '';
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   465
begin
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   466
WriteLnToConsole('Loading land from file...');
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   467
AddProgress;
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   468
tmpsurf:= LoadDataImage(ptMapCurrent, 'map', ifAlpha or ifTransparent or ifIgnoreCaps);
3912
e11df2de6af2 have engine try for a second position when map loading fails (in this way it's possible to move Missions data to any path)
koda
parents: 3836
diff changeset
   469
if tmpsurf = nil then
5770
022a18320f01 load mask from user path as well
nemo
parents: 5719
diff changeset
   470
    begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   471
    mapName:= ExtractFileName(cPathz[ptMapCurrent]);
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7594
diff changeset
   472
    tmpsurf:= LoadDataImage(ptMissionMaps, mapName + '/map', ifAlpha or ifCritical or ifTransparent or ifIgnoreCaps);
5770
022a18320f01 load mask from user path as well
nemo
parents: 5719
diff changeset
   473
    end;
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   474
// (bare) Sanity check. Considering possible LongInt comparisons as well as just how much system memoery it would take
9243
d8f6a396d98e First select group of templates, then pick template from selected group
unc0rr
parents: 9080
diff changeset
   475
TryDo((tmpsurf^.w < $40000000) and (tmpsurf^.h < $40000000) and (QWord(tmpsurf^.w) * tmpsurf^.h < 6*1024*1024*1024), 'Map dimensions too big!', true);
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   476
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   477
ResizeLand(tmpsurf^.w, tmpsurf^.h);
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   478
LoadMapConfig;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   479
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   480
playHeight:= tmpsurf^.h;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   481
playWidth:= tmpsurf^.w;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   482
leftX:= (LAND_WIDTH - playWidth) div 2;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   483
rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   484
topY:= LAND_HEIGHT - playHeight;
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   485
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   486
TryDo(tmpsurf^.format^.BytesPerPixel = 4, 'Map should be 32bit', true);
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   487
1772
0fe436fb5f81 Allow loading maps and forts
unc0rr
parents: 1768
diff changeset
   488
BlitImageAndGenerateCollisionInfo(
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   489
    (LAND_WIDTH - tmpsurf^.w) div 2,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   490
    LAND_HEIGHT - tmpsurf^.h,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   491
    tmpsurf^.w,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   492
    tmpsurf);
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   493
SDL_FreeSurface(tmpsurf);
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1784
diff changeset
   494
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   495
LoadMask;
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   496
end;
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   497
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   498
procedure DrawBottomBorder; // broken out from other borders for doing a floor-only map, or possibly updating bottom during SD
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: 5775
diff changeset
   499
var x, w, c: Longword;
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   500
begin
5718
e74de0528ef4 Let's draw the bottom border thicker, so it is more visible
nemo
parents: 5717
diff changeset
   501
for w:= 0 to 23 do
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   502
    for x:= leftX to rightX do
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   503
        begin
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5832
diff changeset
   504
        Land[Longword(cWaterLine) - 1 - w, x]:= lfIndestructible;
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   505
        if (x + w) mod 32 < 16 then
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   506
            c:= AMask
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   507
        else
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   508
            c:= AMask or RMask or GMask; // FF00FFFF
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   509
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   510
        if (cReducedQuality and rqBlurryLand) = 0 then
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5832
diff changeset
   511
            LandPixels[Longword(cWaterLine) - 1 - w, x]:= c
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   512
        else
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5832
diff changeset
   513
            LandPixels[(Longword(cWaterLine) - 1 - w) div 2, x div 2]:= c
5718
e74de0528ef4 Let's draw the bottom border thicker, so it is more visible
nemo
parents: 5717
diff changeset
   514
        end
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   515
end;
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   516
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   517
procedure GenMap;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   518
var x, y, w, c: Longword;
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   519
    map, mask: shortstring;
8011
ffd5eba8f7c2 objects too
nemo
parents: 8010
diff changeset
   520
    maskOnly: boolean;
1754
a37392548124 Some fixes by nemo
unc0rr
parents: 1753
diff changeset
   521
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   522
    hasBorder:= false;
8011
ffd5eba8f7c2 objects too
nemo
parents: 8010
diff changeset
   523
    maskOnly:= false;
2891
e1f902eb0cfe Formerly "Draw Girders" by MrMfS - now "Disable Girders" to allow template prefs to still exist
nemo
parents: 2866
diff changeset
   524
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   525
    LoadThemeConfig;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3632
diff changeset
   526
4900
8ad0e23e6d63 addfilelog <3 debugfile
koda
parents: 4562
diff changeset
   527
    // is this not needed any more? lets hope setlength sets also 0s
3630
2c7a9d5aa18c fix static land loading on desktop
koda
parents: 3617
diff changeset
   528
    //if ((GameFlags and gfForts) <> 0) or (Pathz[ptMapCurrent] <> '') then
2c7a9d5aa18c fix static land loading on desktop
koda
parents: 3617
diff changeset
   529
    //    FillChar(Land,SizeOf(TCollisionArray),0);*)
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3632
diff changeset
   530
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   531
    if (GameFlags and gfForts) = 0 then
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   532
        if cPathz[ptMapCurrent] <> '' then
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   533
            begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   534
            map:= cPathz[ptMapCurrent] + '/map.png';
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   535
            mask:= cPathz[ptMapCurrent] + '/mask.png';
8182
7834c2519070 fix mask only
nemo
parents: 8060
diff changeset
   536
            if (not(pfsExists(map)) and pfsExists(mask)) then
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   537
                begin
8011
ffd5eba8f7c2 objects too
nemo
parents: 8010
diff changeset
   538
                maskOnly:= true;
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   539
                LoadMask;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   540
                GenLandSurface
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   541
                end
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   542
            else LoadMap;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   543
            end
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   544
        else
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   545
            begin
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   546
            WriteLnToConsole('Generating land...');
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   547
            case cMapGen of
10198
e9cbe111c0df Move template-based generator into its own file
unc0rr
parents: 10197
diff changeset
   548
                0: GenTemplated(EdgeTemplates[SelectTemplate]);
10181
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   549
                //1: begin ResizeLand(4096,2048); GenMaze; end;
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   550
                1: begin ResizeLand(4096,2048); GenPerlin; end;
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   551
                2: GenDrawnMap;
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   552
            else
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   553
                OutError('Unknown mapgen', true);
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   554
            end;
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   555
            GenLandSurface
8010
195677b0d06b something bender asked for. allow a mask without a map
nemo
parents: 8003
diff changeset
   556
            end
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   557
    else
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   558
        MakeFortsMap;
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   559
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
   560
    AddProgress;
1760
55a1edd97911 Fix nemo's large land patch
unc0rr
parents: 1754
diff changeset
   561
1768
9f83102b11ca That was wrong place for the patch
unc0rr
parents: 1767
diff changeset
   562
// check for land near top
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   563
c:= 0;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   564
if (GameFlags and gfBorder) <> 0 then
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   565
    hasBorder:= true
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   566
else
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   567
    for y:= topY to topY + 5 do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   568
        for x:= leftX to rightX do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   569
            if Land[y, x] <> 0 then
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   570
                begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   571
                inc(c);
8370
0c79946e96f8 Fix tons of warnings
martin_bede
parents: 8266
diff changeset
   572
                if c > LongWord((LAND_WIDTH div 2)) then // avoid accidental triggering
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   573
                    begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   574
                    hasBorder:= true;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   575
                    break;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   576
                    end;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1779
diff changeset
   577
                end;
1768
9f83102b11ca That was wrong place for the patch
unc0rr
parents: 1767
diff changeset
   578
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   579
if hasBorder then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   580
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   581
    for y:= 0 to LAND_HEIGHT - 1 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   582
        for x:= 0 to LAND_WIDTH - 1 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   583
            if (y < topY) or (x < leftX) or (x > rightX) then
3519
56cbc035b74b rename flags
nemo
parents: 3513
diff changeset
   584
                Land[y, x]:= lfIndestructible;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   585
    // experiment hardcoding cave
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   586
    // also try basing cave dimensions on map/template dimensions, if they exist
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   587
    for w:= 0 to 5 do // width of 3 allowed hogs to be knocked through with grenade
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   588
        begin
9524
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   589
        if (WorldEdge <> weBounce) and (WorldEdge <> weWrap) then
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   590
            for y:= topY to LAND_HEIGHT - 1 do
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   591
                    begin
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   592
                    Land[y, leftX + w]:= lfIndestructible;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   593
                    Land[y, rightX - w]:= lfIndestructible;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   594
                    if (y + w) mod 32 < 16 then
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   595
                        c:= AMask
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   596
                    else
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   597
                        c:= AMask or RMask or GMask; // FF00FFFF
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3551
diff changeset
   598
9524
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   599
                    if (cReducedQuality and rqBlurryLand) = 0 then
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   600
                        begin
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   601
                        LandPixels[y, leftX + w]:= c;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   602
                        LandPixels[y, rightX - w]:= c;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   603
                        end
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   604
                    else
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   605
                        begin
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   606
                        LandPixels[y div 2, (leftX + w) div 2]:= c;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   607
                        LandPixels[y div 2, (rightX - w) div 2]:= c;
0a52c1dd9400 disable side borders if bounce or wrap
nemo
parents: 9387
diff changeset
   608
                        end;
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   609
                    end;
1768
9f83102b11ca That was wrong place for the patch
unc0rr
parents: 1767
diff changeset
   610
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   611
        for x:= leftX to rightX do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   612
            begin
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   613
            Land[topY + w, x]:= lfIndestructible;
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   614
            if (x + w) mod 32 < 16 then
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   615
                c:= AMask
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   616
            else
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   617
                c:= AMask or RMask or GMask; // FF00FFFF
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3551
diff changeset
   618
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   619
            if (cReducedQuality and rqBlurryLand) = 0 then
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   620
                LandPixels[topY + w, x]:= c
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   621
            else
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   622
                LandPixels[(topY + w) div 2, x div 2]:= c;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   623
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   624
        end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   625
    end;
1768
9f83102b11ca That was wrong place for the patch
unc0rr
parents: 1767
diff changeset
   626
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   627
if (GameFlags and gfBottomBorder) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   628
    DrawBottomBorder;
5717
6d513913b7a9 Add option for a bottom border. Needs testing.
nemo
parents: 5687
diff changeset
   629
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   630
if (GameFlags and gfDisableGirders) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   631
    hasGirders:= false;
2891
e1f902eb0cfe Formerly "Draw Girders" by MrMfS - now "Disable Girders" to allow template prefs to still exist
nemo
parents: 2866
diff changeset
   632
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8011
diff changeset
   633
if (GameFlags and gfForts = 0) and (maskOnly or (cPathz[ptMapCurrent] = '')) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   634
    AddObjects
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   635
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   636
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   637
    AddProgress();
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   638
3058
2ebc20485344 Engine:
smxx
parents: 3055
diff changeset
   639
FreeLandObjects;
2ebc20485344 Engine:
smxx
parents: 3055
diff changeset
   640
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6927
diff changeset
   641
if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   642
    begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   643
    if (cReducedQuality and rqBlurryLand) = 0 then
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   644
        for x:= leftX to rightX do
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   645
            for y:= topY to LAND_HEIGHT-1 do
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   646
                begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   647
                w:= LandPixels[y,x];
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   648
                w:= round(((w shr RShift and $FF) * RGB_LUMINANCE_RED +
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   649
                      (w shr BShift and $FF) * RGB_LUMINANCE_GREEN +
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   650
                      (w shr GShift and $FF) * RGB_LUMINANCE_BLUE));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   651
                if w > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   652
                    w:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   653
                w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixels[y,x] and AMask);
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   654
                LandPixels[y,x]:= w or (LandPixels[y, x] and AMask)
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   655
                end
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   656
    else
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   657
        for x:= leftX div 2 to rightX div 2 do
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   658
            for y:= topY div 2 to LAND_HEIGHT-1 div 2 do
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   659
                begin
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   660
                w:= LandPixels[y div 2,x div 2];
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   661
                w:= ((w shr RShift and $FF) +  (w shr BShift and $FF) + (w shr GShift and $FF)) div 3;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   662
                if w > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   663
                    w:= 255;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   664
                w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixels[y div 2,x div 2] and AMask);
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   665
                LandPixels[y,x]:= w or (LandPixels[y div 2, x div 2] and AMask)
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   666
                end
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5274
diff changeset
   667
    end;
10016
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
   668
59a6d65fcb60 (experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish
sheepluva
parents: 9998
diff changeset
   669
PrettifyLandAlpha();
37
2b7f2a43b999 - Properly get seed in net game
unc0rr
parents: 35
diff changeset
   670
end;
2b7f2a43b999 - Properly get seed in net game
unc0rr
parents: 35
diff changeset
   671
7079
939f53515489 Learn hask^Wpascal, dudes!
unc0rr
parents: 7063
diff changeset
   672
procedure GenPreview(out Preview: TPreview);
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   673
var rh, rw, ox, oy, x, y, xx, yy, t, bit, cbit, lh, lw: LongInt;
155
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   674
begin
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   675
    WriteLnToConsole('Generating preview...');
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   676
    case cMapGen of
10198
e9cbe111c0df Move template-based generator into its own file
unc0rr
parents: 10197
diff changeset
   677
        0: GenTemplated(EdgeTemplates[SelectTemplate]);
10181
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   678
        //1: begin ResizeLand(4096,2048); GenMaze; end;
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   679
        1: begin ResizeLand(4096,2048); GenPerlin; end;
4494
9585435e20f7 Pass hardcoded drawn map from frontend into engine \o/
unc0rr
parents: 4458
diff changeset
   680
        2: GenDrawnMap;
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4559
diff changeset
   681
    else
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4559
diff changeset
   682
        OutError('Unknown mapgen', true);
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   683
    end;
155
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   684
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   685
    // strict scaling needed here since preview assumes a rectangle
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   686
    rh:= max(LAND_HEIGHT,2048);
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   687
    rw:= max(LAND_WIDTH,4096);
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   688
    ox:= 0;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   689
    if rw < rh*2 then
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   690
        begin
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   691
        rw:= rh*2;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   692
        end;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   693
    if rh < rw div 2 then rh:= rw * 2;
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   694
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   695
    ox:= (rw-LAND_WIDTH) div 2;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   696
    oy:= rh-LAND_HEIGHT;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   697
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   698
    lh:= rh div 128;
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   699
    lw:= rw div 32;
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   700
    for y:= 0 to 127 do
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   701
        for x:= 0 to 31 do
155
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   702
        begin
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   703
            Preview[y, x]:= 0;
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   704
            for bit:= 0 to 7 do
155
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   705
            begin
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   706
                t:= 0;
3617
1df21e06b8ba a couple of fixes i missed previously
koda
parents: 3612
diff changeset
   707
                cbit:= bit * 8;
1df21e06b8ba a couple of fixes i missed previously
koda
parents: 3612
diff changeset
   708
                for yy:= y * lh to y * lh + 7 do
1df21e06b8ba a couple of fixes i missed previously
koda
parents: 3612
diff changeset
   709
                    for xx:= x * lw + cbit to x * lw + cbit + 7 do
10017
de822cd3df3a fixwhitespace and dos2unix
koda
parents: 10015
diff changeset
   710
                        if ((yy-oy) and LAND_HEIGHT_MASK = 0) and ((xx-ox) and LAND_WIDTH_MASK = 0)
7477
26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
nemo
parents: 7293
diff changeset
   711
                           and (Land[yy-oy, xx-ox] <> 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6491
diff changeset
   712
                            inc(t);
3365
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   713
                if t > 8 then
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   714
                    Preview[y, x]:= Preview[y, x] or ($80 shr bit);
37ac593e9027 wow all these files only for land preview and seed generation
koda
parents: 3287
diff changeset
   715
            end;
566
1c1cb593cb81 Save some memory
unc0rr
parents: 561
diff changeset
   716
        end;
155
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   717
end;
401f4ea24715 Engine can generate land preview and send it via IPC
unc0rr
parents: 109
diff changeset
   718
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   719
10162
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   720
procedure GenPreviewAlpha(out Preview: TPreviewAlpha);
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   721
var rh, rw, ox, oy, x, y, xx, yy, t, lh, lw: LongInt;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   722
begin
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   723
    WriteLnToConsole('Generating preview...');
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   724
    case cMapGen of
10198
e9cbe111c0df Move template-based generator into its own file
unc0rr
parents: 10197
diff changeset
   725
        0: GenTemplated(EdgeTemplates[SelectTemplate]);
10181
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   726
        //1: begin ResizeLand(4096,2048); GenMaze; end;
4708343d5963 Perlin noise generator untweaked, temporarily replacing maze generator
unc0rr
parents: 10165
diff changeset
   727
        1: begin ResizeLand(4096,2048); GenPerlin; end;
10162
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   728
        2: GenDrawnMap;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   729
    else
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   730
        OutError('Unknown mapgen', true);
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   731
    end;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   732
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   733
    // strict scaling needed here since preview assumes a rectangle
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   734
    rh:= max(LAND_HEIGHT, 2048);
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   735
    rw:= max(LAND_WIDTH, 4096);
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   736
    ox:= 0;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   737
    if rw < rh*2 then
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   738
        begin
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   739
        rw:= rh*2;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   740
        end;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   741
    if rh < rw div 2 then rh:= rw * 2;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   742
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   743
    ox:= (rw-LAND_WIDTH) div 2;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   744
    oy:= rh-LAND_HEIGHT;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   745
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   746
    lh:= rh div 128;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   747
    lw:= rw div 256;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   748
    for y:= 0 to 127 do
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   749
        for x:= 0 to 255 do
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   750
            begin
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   751
            t:= 0;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   752
10165
e84f9b928ad3 Use all pixels, not only 8x8 areas
unc0rr
parents: 10163
diff changeset
   753
            for yy:= y * lh - oy to y * lh + lh - 1 - oy do
e84f9b928ad3 Use all pixels, not only 8x8 areas
unc0rr
parents: 10163
diff changeset
   754
                for xx:= x * lw - ox to x * lw + lw - 1 - ox do
10162
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   755
                    if (yy and LAND_HEIGHT_MASK = 0) and (xx and LAND_WIDTH_MASK = 0)
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   756
                        and (Land[yy, xx] <> 0) then
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   757
                        inc(t);
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   758
10165
e84f9b928ad3 Use all pixels, not only 8x8 areas
unc0rr
parents: 10163
diff changeset
   759
            Preview[y, x]:= t * 255 div (lh * lw);
10162
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   760
            end;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   761
end;
38dbf26475d8 Add alpha channel to preview
unc0rr
parents: 10142
diff changeset
   762
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   763
procedure chLandCheck(var s: shortstring);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   764
begin
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   765
    AddFileLog('CheckLandDigest: ' + s + ' digest : ' + digest);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   766
    if digest = '' then
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   767
        digest:= s
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   768
    else
6025
cac1d5601d7c reviewed the build system and parts of the previous merge, performed some code cleanup
koda
parents: 6023
diff changeset
   769
        TryDo(s = digest, 'Different maps generated, sorry', true);
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   770
end;
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   771
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   772
procedure chSendLandDigest(var s: shortstring);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   773
var adler, i: LongInt;
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   774
begin
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   775
    adler:= 1;
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   776
    for i:= 0 to LAND_HEIGHT-1 do
6927
ee000959d645 Oh, and I guess this is needed as well, although if many other places in the code do this, pas2c will need
nemo
parents: 6898
diff changeset
   777
        adler:= Adler32Update(adler, @Land[i,0], LAND_WIDTH);
6254
e90fb60cb46d Force a desync if there is a script name mismatch. This avoids playing until the game desyncs due to script differences.
nemo
parents: 6096
diff changeset
   778
    s:= 'M' + IntToStr(adler) + cScriptName;
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   779
10022
eb981a03de90 - Make Racer report achievements
unc0rr
parents: 10018
diff changeset
   780
    ScriptSetString('LandDigest', s);
eb981a03de90 - Make Racer report achievements
unc0rr
parents: 10018
diff changeset
   781
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   782
    chLandCheck(s);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   783
    SendIPCRaw(@s[0], Length(s) + 1)
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   784
end;
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   785
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3017
diff changeset
   786
procedure initModule;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2692
diff changeset
   787
begin
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6700
diff changeset
   788
    RegisterVariable('landcheck', @chLandCheck, false);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6700
diff changeset
   789
    RegisterVariable('sendlanddigest', @chSendLandDigest, false);
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4389
diff changeset
   790
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   791
    LandBackSurface:= nil;
3369
c7289e42f0ee add other controls for map preview, also fix a bug in digest
koda
parents: 3365
diff changeset
   792
    digest:= '';
7549
f6145d12bb17 Avoid a bit of a memory spike on small maps
nemo
parents: 7483
diff changeset
   793
    LAND_WIDTH:= 0;
f6145d12bb17 Avoid a bit of a memory spike on small maps
nemo
parents: 7483
diff changeset
   794
    LAND_HEIGHT:= 0;
f6145d12bb17 Avoid a bit of a memory spike on small maps
nemo
parents: 7483
diff changeset
   795
(*
3612
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   796
    if (cReducedQuality and rqBlurryLand) = 0 then
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   797
        SetLength(LandPixels, LAND_HEIGHT, LAND_WIDTH)
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   798
    else
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   799
        SetLength(LandPixels, LAND_HEIGHT div 2, LAND_WIDTH div 2);
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   800
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   801
    SetLength(Land, LAND_HEIGHT, LAND_WIDTH);
b50215a8a43d land arrays are allocated dynamically, so DOWNSCALE and LOWRES macros are now removed and replaced by run time flags rqBlurryLand and rqLowRes
koda
parents: 3608
diff changeset
   802
    SetLength(LandDirty, (LAND_HEIGHT div 32), (LAND_WIDTH div 32));
7549
f6145d12bb17 Avoid a bit of a memory spike on small maps
nemo
parents: 7483
diff changeset
   803
*)
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2692
diff changeset
   804
end;
51
b6e3ae05857f - Get rid of hwserv and runhelper
unc0rr
parents: 37
diff changeset
   805
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3017
diff changeset
   806
procedure freeModule;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2692
diff changeset
   807
begin
7151
ec15d9e1a7e3 pas2c stuff
unc0rr
parents: 7079
diff changeset
   808
    SetLength(Land, 0, 0);
ec15d9e1a7e3 pas2c stuff
unc0rr
parents: 7079
diff changeset
   809
    SetLength(LandPixels, 0, 0);
ec15d9e1a7e3 pas2c stuff
unc0rr
parents: 7079
diff changeset
   810
    SetLength(LandDirty, 0, 0);
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2692
diff changeset
   811
end;
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2692
diff changeset
   812
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   813
end.