hedgewars/uLandObjects.pas
author Wuzzy <almikes@aol.com>
Mon, 10 Apr 2017 14:34:32 +0200
changeset 12211 00bcaa0e0ef6
parent 12190 4d818abdc00f
child 12592 00b539e6115d
permissions -rw-r--r--
Fix dynamite sparks appearing underwater
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 883
diff changeset
     2
 * Hedgewars, a free turn based strategy game
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 11006
diff changeset
     3
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     4
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     8
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    12
 * GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    13
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    14
 * You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    15
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10015
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    17
 *)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    21
unit uLandObjects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    22
interface
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    23
uses SDLh;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    24
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
    25
procedure AddObjects();
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
    26
procedure FreeLandObjects();
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    27
procedure LoadThemeConfig;
6986
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    28
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline;
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
    29
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word); inline;
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
    30
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word; Flip: boolean);
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    31
procedure BlitImageUsingMask(cpX, cpY: Longword;  Image, Mask: PSDL_Surface);
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
    32
procedure AddOnLandObjects(Surface: PSDL_Surface);
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    33
procedure SetLand(var LandWord: Word; Pixel: LongWord); inline;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    34
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    35
implementation
9295
f8819c3dde54 Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents: 9080
diff changeset
    36
uses uStore, uConsts, uConsole, uRandom, uSound
11824
3f1f8f79fcdb implement Trim() in uUtils
sheepluva
parents: 11821
diff changeset
    37
     , uTypes, uVariables, uDebug, uUtils
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    38
     , uPhysFSLayer;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2695
diff changeset
    39
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
    40
const MaxRects = 512;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    41
      MAXOBJECTRECTS = 16;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    42
      MAXTHEMEOBJECTS = 32;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8028
diff changeset
    43
      cThemeCFGFilename = 'theme.cfg';
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    44
7035
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 7021
diff changeset
    45
type TRectsArray = array[0..MaxRects] of TSDL_Rect;
823caba67738 Reflects change in previous revision to uTypes
nemo
parents: 7021
diff changeset
    46
     PRectArray = ^TRectsArray;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    47
     TThemeObject = record
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    48
                     Surf, Mask: PSDL_Surface;
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
    49
                     inland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    50
                     outland: array[0..Pred(MAXOBJECTRECTS)] of TSDL_Rect;
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
    51
                     inrectcnt: Longword;
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
    52
                     outrectcnt: Longword;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    53
                     Width, Height: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    54
                     Maxcnt: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    55
                     end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    56
     TThemeObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    57
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    58
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TThemeObject;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    59
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    60
     TSprayObject = record
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    61
                     Surf: PSDL_Surface;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    62
                     Width, Height: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    63
                     Maxcnt: Longword;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
    64
                     end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    65
     TSprayObjects = record
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    66
                     Count: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    67
                     objs: array[0..Pred(MAXTHEMEOBJECTS)] of TSprayObject
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    68
                     end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    69
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    70
var Rects: PRectArray;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    71
    RectCount: Longword;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    72
    ThemeObjects: TThemeObjects;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    73
    SprayObjects: TSprayObjects;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
    74
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    75
procedure SetLand(var LandWord: Word; Pixel: LongWord); inline;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    76
begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    77
    // this an if instead of masking colours to avoid confusing map creators
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    78
    if ((AMask and Pixel) = 0) then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    79
        LandWord:= 0
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    80
    else if Pixel = $FFFFFFFF then                  // white
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    81
        LandWord:= lfObject
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    82
    else if Pixel = AMask then                      // black
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    83
        begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    84
        LandWord:= lfBasic;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    85
        disableLandBack:= false
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    86
        end
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    87
    else if Pixel = (AMask or RMask) then           // red
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    88
        LandWord:= lfIndestructible
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    89
    else if Pixel = (AMask or BMask) then           // blue
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    90
        LandWord:= lfObject or lfIce
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    91
    else if Pixel = (AMask or GMask) then           // green
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    92
        LandWord:= lfObject or lfBouncy
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    93
end;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
    94
6986
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    95
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface); inline;
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    96
begin
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
    97
    BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, 0, false);
6986
409dd3851309 add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents: 6982
diff changeset
    98
end;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
    99
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   100
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word); inline;
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   101
begin
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   102
    BlitImageAndGenerateCollisionInfo(cpX, cpY, Width, Image, LandFlags, false);
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   103
end;
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   104
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   105
procedure BlitImageAndGenerateCollisionInfo(cpX, cpY, Width: Longword; Image: PSDL_Surface; LandFlags: Word; Flip: boolean);
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   106
var p: PLongwordArray;
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   107
    px, x, y: Longword;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   108
    bpp: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   109
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   110
WriteToConsole('Generating collision info... ');
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   111
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   112
if SDL_MustLock(Image) then
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11362
diff changeset
   113
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   114
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   115
bpp:= Image^.format^.BytesPerPixel;
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   116
if checkFails(bpp = 4, 'Land object should be 32bit', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   117
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   118
if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   119
    SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   120
end;
1182
e2e13aa055c1 Step 3: Maps are rendered correctly, but without objects yet
unc0rr
parents: 1181
diff changeset
   121
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   122
if Width = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   123
    Width:= Image^.w;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   124
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   125
p:= Image^.pixels;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   126
for y:= 0 to Pred(Image^.h) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   127
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   128
    for x:= 0 to Pred(Width) do
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   129
        begin
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   130
        // map image pixels per line backwards if in flip mode
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   131
        if Flip then
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   132
            px:= Pred(Image^.w) - x
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   133
        else
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   134
            px:= x;
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   135
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   136
        if (p^[px] and AMask) <> 0 then
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   137
            begin
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   138
            if (cReducedQuality and rqBlurryLand) = 0 then
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   139
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   140
                if (LandPixels[cpY + y, cpX + x] = 0)
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   141
                or (((p^[px] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   142
                    LandPixels[cpY + y, cpX + x]:= p^[px];
6534
e6cb8a41b5f4 Experiment in eliminating transparent white from LandPixels - I think it messes up on some graphics cards. Noticed a curious white border on a girder in a theme Randy is working on. At the very least it is slightly more efficient in the blit.
nemo
parents: 6492
diff changeset
   143
                end
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   144
            else
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   145
                if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   146
                    LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[px];
3595
341e407e3754 partially removing DOWNSCALE ifdef -- only two remain and their removal requires dynamic allocation (btw this breaks low quality mode)
koda
parents: 3524
diff changeset
   147
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   148
            if (Land[cpY + y, cpX + x] <= lfAllObjMask) and ((p^[px] and AMask) <> 0) then
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   149
                Land[cpY + y, cpX + x]:= lfObject or LandFlags
6081
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects.
nemo
parents: 5832
diff changeset
   150
            end;
11006
cb06b7985261 don't keep around those right-side fort files which are just mirror images of left-side forts. generate them at run-time instead. note: inlining changes and deleting files - so consider clean build/install
sheepluva
parents: 10941
diff changeset
   151
        end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   152
    p:= PLongwordArray(@(p^[Image^.pitch shr 2]))
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   153
    end;
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   154
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   155
if SDL_MustLock(Image) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   156
    SDL_UnlockSurface(Image);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   157
WriteLnToConsole(msgOK)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   158
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   159
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   160
procedure BlitImageUsingMask(cpX, cpY: Longword;  Image, Mask: PSDL_Surface);
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   161
var p, mp: PLongwordArray;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   162
    x, y: Longword;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   163
    bpp: LongInt;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   164
begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   165
WriteToConsole('Generating collision info... ');
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   166
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   167
if SDL_MustLock(Image) then
11507
bd9a2f1b0080 SDLTry doesn't halt engine no more
unc0rr
parents: 11362
diff changeset
   168
    if SDLCheck(SDL_LockSurface(Image) >= 0, 'SDL_LockSurface', true) then exit;
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   169
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   170
bpp:= Image^.format^.BytesPerPixel;
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   171
if checkFails(bpp = 4, 'Land object should be 32bit', true) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   172
begin
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   173
if SDL_MustLock(Image) then
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   174
    SDL_UnlockSurface(Image);
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   175
end;
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   176
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   177
p:= Image^.pixels;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   178
mp:= Mask^.pixels;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   179
for y:= 0 to Pred(Image^.h) do
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   180
    begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   181
    for x:= 0 to Pred(Image^.w) do
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   182
        begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   183
        if (cReducedQuality and rqBlurryLand) = 0 then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   184
            begin
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   185
            if (LandPixels[cpY + y, cpX + x] = 0)
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   186
            or (((p^[x] and AMask) <> 0) and (((LandPixels[cpY + y, cpX + x] and AMask) shr AShift) < 255)) then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   187
                LandPixels[cpY + y, cpX + x]:= p^[x];
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   188
            end
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   189
        else
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   190
            if LandPixels[(cpY + y) div 2, (cpX + x) div 2] = 0 then
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   191
                LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x];
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   192
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   193
        if (Land[cpY + y, cpX + x] <= lfAllObjMask) or (Land[cpY + y, cpX + x] and lfObject <> 0)  then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   194
            SetLand(Land[cpY + y, cpX + x], mp^[x]);
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   195
        end;
10131
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   196
    p:= PLongwordArray(@(p^[Image^.pitch shr 2]));
4b4a043111f4 - pas2c recognizes typecasts in initialization expressions
unc0rr
parents: 10108
diff changeset
   197
    mp:= PLongwordArray(@(mp^[Mask^.pitch shr 2]))
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   198
    end;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   199
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   200
if SDL_MustLock(Image) then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   201
    SDL_UnlockSurface(Image);
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   202
WriteLnToConsole(msgOK)
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   203
end;
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   204
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   205
procedure AddRect(x1, y1, w1, h1: LongInt);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   206
begin
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 279
diff changeset
   207
with Rects^[RectCount] do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   208
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   209
    x:= x1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   210
    y:= y1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   211
    w:= w1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   212
    h:= h1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   213
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   214
inc(RectCount);
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   215
checkFails(RectCount < MaxRects, 'AddRect: overflow', true)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   216
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   217
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   218
procedure InitRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   219
begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   220
    RectCount:= 0;
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   221
    New(Rects)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   222
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   223
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   224
procedure FreeRects;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   225
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   226
    Dispose(rects)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   227
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   228
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   229
function CheckIntersect(x1, y1, w1, h1: LongInt): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   230
var i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   231
    res: boolean = false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   232
begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   233
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   234
i:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   235
if RectCount > 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   236
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   237
    with Rects^[i] do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   238
        res:= (x < x1 + w1) and (x1 < x + w) and (y < y1 + h1) and (y1 < y + h);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   239
    inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   240
    until (i = RectCount) or (res);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   241
CheckIntersect:= res;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   242
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   243
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   244
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   245
function CountNonZeroz(x, y, h: LongInt): Longword;
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   246
var i: LongInt;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   247
    lRes: Longword;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   248
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   249
    lRes:= 0;
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   250
    for i:= y to Pred(y + h) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   251
        if Land[i, x] <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   252
            inc(lRes);
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   253
    CountNonZeroz:= lRes;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   254
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   255
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   256
function AddGirder(gX: LongInt; var girSurf: PSDL_Surface): boolean;
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   257
var x1, x2, y, k, i, girderHeight: LongInt;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   258
    rr: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   259
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   260
begin
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   261
if girSurf = nil then
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   262
    girSurf:= LoadDataImageAltPath(ptCurrTheme, ptGraphics, 'Girder', ifCritical or ifTransparent or ifIgnoreCaps);
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   263
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   264
girderHeight:= girSurf^.h;
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   265
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   266
y:= topY+150;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   267
repeat
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   268
    inc(y, 24);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   269
    x1:= gX;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   270
    x2:= gX;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   271
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   272
    while (x1 > Longint(leftX)+150) and (CountNonZeroz(x1, y, girderHeight) = 0) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   273
        dec(x1, 2);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   274
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   275
    i:= x1 - 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   276
    repeat
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   277
        k:= CountNonZeroz(x1, y, girderHeight);
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   278
        dec(x1, 2)
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   279
    until (x1 < Longint(leftX) + 100) or (k = 0) or (k = girderHeight) or (x1 < i);
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   280
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   281
    inc(x1, 2);
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   282
    if k = girderHeight then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   283
        begin
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   284
        while (x2 < (LongInt(rightX) - 100)) and (CountNonZeroz(x2, y, girderHeight) = 0) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   285
            inc(x2, 2);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   286
        i:= x2 + 12;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   287
        repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   288
        inc(x2, 2);
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   289
        k:= CountNonZeroz(x2, y, girderHeight)
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   290
        until (x2 >= (LongInt(rightX)-150)) or (k = 0) or (k = girderHeight) or (x2 > i) or (x2 - x1 >= 900);
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   291
10941
6f1b2d0dacdf - Take girder height into account (fix issue #908)
unc0rr
parents: 10878
diff changeset
   292
        if (x2 < (LongInt(rightX) - 100)) and (k = girderHeight) and (x2 - x1 > 200) and (x2 - x1 < 900)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   293
        and (not CheckIntersect(x1 - 32, y - 64, x2 - x1 + 64, 144)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   294
                break;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   295
        end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   296
x1:= 0;
1753
2ccba26f1aa4 Apply nemo's world resize patch
unc0rr
parents: 1277
diff changeset
   297
until y > (LAND_HEIGHT-125);
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   298
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   299
if x1 > 0 then
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   300
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   301
    bRes:= true;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   302
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   303
    rr.x:= x1;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   304
    while rr.x < x2 do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   305
        begin
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   306
        if cIce then
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   307
            BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, girSurf^.w), girSurf, lfIce)
6112
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice.
nemo
parents: 6081
diff changeset
   308
        else
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   309
            BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, girSurf^.w), girSurf);
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   310
        inc(rr.x, girSurf^.w);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   311
        end;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2275
diff changeset
   312
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   313
    AddRect(x1 - 8, y - 32, x2 - x1 + 16, 80);
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   314
end
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   315
else bRes:= false;
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   316
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   317
AddGirder:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   318
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   319
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   320
function CheckLand(rect: TSDL_Rect; dX, dY, Color: Longword): boolean;
3524
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   321
var tmpx, tmpx2, tmpy, tmpy2, bx, by: LongInt;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   322
    bRes: boolean = true;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   323
begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   324
inc(rect.x, dX);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   325
inc(rect.y, dY);
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   326
bx:= rect.x + rect.w;
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   327
by:= rect.y + rect.h;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   328
{$WARNINGS OFF}
3521
96a502730e81 Remove redundant test, add some temp variables to speed up the expensive CheckLand
nemo
parents: 3519
diff changeset
   329
tmpx:= rect.x;
3524
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   330
tmpx2:= bx;
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   331
while (tmpx <= bx - rect.w div 2 - 1) and bRes do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   332
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   333
    bRes:= ((rect.y and LAND_HEIGHT_MASK) = 0) and ((by and LAND_HEIGHT_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   334
    and ((tmpx and LAND_WIDTH_MASK) = 0) and ((tmpx2 and LAND_WIDTH_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   335
    and (Land[rect.y, tmpx] = Color) and (Land[by, tmpx] = Color)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   336
    and (Land[rect.y, tmpx2] = Color) and (Land[by, tmpx2] = Color);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   337
    inc(tmpx);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   338
    dec(tmpx2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   339
    end;
3524
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   340
tmpy:= rect.y+1;
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   341
tmpy2:= by-1;
8d0783d2a0ff This reduces CheckLand ~5.5% on average over prior making the overall reduction ~77.4% instead of ~81.9%. It does skip centre pixel in odd w/h, but that really shouldn't matter much in this case. Can alter if any objects are noticeably off.
nemo
parents: 3521
diff changeset
   342
while (tmpy <= by - rect.h div 2 - 1) and bRes do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   343
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   344
    bRes:= ((tmpy and LAND_HEIGHT_MASK) = 0) and ((tmpy2 and LAND_HEIGHT_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   345
    and ((rect.x and LAND_WIDTH_MASK) = 0) and ((bx and LAND_WIDTH_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   346
    and (Land[tmpy, rect.x] = Color) and (Land[tmpy, bx] = Color)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   347
    and (Land[tmpy2, rect.x] = Color) and (Land[tmpy2, bx] = Color);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   348
    inc(tmpy);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   349
    dec(tmpy2)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   350
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   351
{$WARNINGS ON}
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   352
CheckLand:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   353
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   354
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   355
function CheckCanPlace(x, y: Longword; var Obj: TThemeObject): boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   356
var i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   357
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   358
begin
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   359
    with Obj do begin
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   360
        bRes:= true;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   361
        i:= 1;
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   362
        while bRes and (i <= inrectcnt) do
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   363
            begin
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   364
            bRes:= CheckLand(inland[i], x, y, lfBasic);
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   365
            inc(i)
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   366
            end;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   367
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   368
        i:= 1;
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   369
        while bRes and (i <= outrectcnt) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   370
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   371
            bRes:= CheckLand(outland[i], x, y, 0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   372
            inc(i)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   373
            end;
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   374
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   375
        if bRes then
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   376
            bRes:= not CheckIntersect(x, y, Width, Height);
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   377
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   378
        CheckCanPlace:= bRes;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   379
    end
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   380
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   381
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   382
function TryPut(var Obj: TThemeObject): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   383
const MaxPointsIndex = 2047;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   384
var x, y: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   385
    ar: array[0..MaxPointsIndex] of TPoint;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   386
    cnt, i: Longword;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   387
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   388
begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6986
diff changeset
   389
TryPut:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   390
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   391
with Obj do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   392
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   393
    if Maxcnt = 0 then
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6986
diff changeset
   394
        exit;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   395
    x:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   396
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   397
        y:= topY+32; // leave room for a hedgie to teleport in
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   398
        repeat
12168
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12097
diff changeset
   399
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12097
diff changeset
   400
            if (inland[1].x = 0) and (inland[1].y = 0) and (inland[1].w = 0) and (inland[1].h = 0) then
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12097
diff changeset
   401
                y := LAND_HEIGHT - Height;
666e18b1ca32 Allow to place theme objects on water
Wuzzy <almikes@aol.com>
parents: 12097
diff changeset
   402
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   403
            if CheckCanPlace(x, y, Obj) then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   404
                begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   405
                ar[cnt].x:= x;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   406
                ar[cnt].y:= y;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   407
                if cnt >= MaxPointsIndex then // buffer is full, do not check the rest land
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   408
                    begin
10490
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10325
diff changeset
   409
                    y:= LAND_HEIGHT;
b30b8d39d662 Fix some stuff from coverity
unc0rr
parents: 10325
diff changeset
   410
                    x:= LAND_WIDTH;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   411
                    end
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   412
                    else inc(cnt);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   413
                end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   414
            inc(y, 3);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   415
        until y >= LAND_HEIGHT - Height;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   416
        inc(x, getrandom(6) + 3)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   417
    until x >= LAND_WIDTH - Width;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   418
    bRes:= cnt <> 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   419
    if bRes then
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   420
        begin
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   421
        i:= getrandom(cnt);
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   422
        if Obj.Mask <> nil then
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   423
             BlitImageUsingMask(ar[i].x, ar[i].y, Obj.Surf, Obj.Mask)
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   424
        else BlitImageAndGenerateCollisionInfo(ar[i].x, ar[i].y, 0, Obj.Surf);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   425
        AddRect(ar[i].x, ar[i].y, Width, Height);
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   426
        dec(Maxcnt)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   427
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   428
    else Maxcnt:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   429
    end;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   430
TryPut:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   431
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   432
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   433
function TryPut2(var Obj: TSprayObject; Surface: PSDL_Surface): boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   434
const MaxPointsIndex = 8095;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   435
var x, y: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   436
    ar: array[0..MaxPointsIndex] of TPoint;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   437
    cnt, i: Longword;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   438
    r: TSDL_Rect;
2695
ed789a7ef68d makes freepascal code compatible with OBJFPC mode
koda
parents: 2671
diff changeset
   439
    bRes: boolean;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   440
begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   441
TryPut2:= false;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   442
cnt:= 0;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   443
with Obj do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   444
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   445
    if Maxcnt = 0 then
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6986
diff changeset
   446
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   447
    x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   448
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   449
    r.y:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   450
    r.w:= Width;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   451
    r.h:= Height + 16;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   452
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   453
        y:= 8;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   454
        repeat
3519
56cbc035b74b rename flags
nemo
parents: 3513
diff changeset
   455
            if CheckLand(r, x, y - 8, lfBasic)
6453
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents: 6305
diff changeset
   456
            and (not CheckIntersect(x, y, Width, Height)) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   457
                begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   458
                ar[cnt].x:= x;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   459
                ar[cnt].y:= y;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   460
                if cnt >= MaxPointsIndex then // buffer is full, do not check the rest land
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   461
                    begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   462
                    y:= $FF000000;
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   463
                    x:= $FF000000;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   464
                    end
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   465
                    else inc(cnt);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   466
                end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   467
            inc(y, 12);
4159
64e677349124 REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents: 3976
diff changeset
   468
        until y >= LAND_HEIGHT - Height - 8;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   469
        inc(x, getrandom(12) + 12)
4159
64e677349124 REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents: 3976
diff changeset
   470
    until x >= LAND_WIDTH - Width;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   471
    bRes:= cnt <> 0;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   472
AddFileLog('CHECKPOINT 004');
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   473
    if bRes then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   474
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   475
        i:= getrandom(cnt);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   476
        r.x:= ar[i].X;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   477
        r.y:= ar[i].Y;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   478
        r.w:= Width;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   479
        r.h:= Height;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   480
        SDL_UpperBlit(Obj.Surf, nil, Surface, @r);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   481
        AddRect(ar[i].x - 32, ar[i].y - 32, Width + 64, Height + 64);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   482
        dec(Maxcnt)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   483
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   484
    else Maxcnt:= 0
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   485
    end;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   486
TryPut2:= bRes;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   487
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   488
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   489
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   490
procedure CheckRect(Width, Height, x, y, w, h: LongWord);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   491
begin
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   492
    if (x + w > Width) then
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   493
        OutError('Object''s rectangle exceeds image: x + w (' + inttostr(x) + ' + ' + inttostr(w) + ') > Width (' + inttostr(Width) + ')', true);
8330
aaefa587e277 update branch with default
koda
parents: 8096 8145
diff changeset
   494
    if (y + h > Height) then
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   495
        OutError('Object''s rectangle exceeds image: y + h (' + inttostr(y) + ' + ' + inttostr(h) + ') > Height (' + inttostr(Height) + ')', true);
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   496
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   497
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   498
procedure ReadThemeInfo(var ThemeObjects: TThemeObjects; var SprayObjects: TSprayObjects);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   499
var s, key: shortstring;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   500
    f: PFSFile;
5179
8d64dcb566ea Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr
parents: 5166
diff changeset
   501
    i: LongInt;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   502
    ii, t: Longword;
5832
f730c8a9777b Remove some unused variables and options.inc which uFloat doesn't use, probably should never use, and was getting in the way of my testcase - but most importantly, remove the inline on hwSqrt which was causing very bad math on my compiler/machine. We may have to remove more inlining. A pity.
nemo
parents: 5689
diff changeset
   503
    c2: TSDL_Color;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   504
begin
2671
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
   505
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
   506
AddProgress;
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   507
// Set default water greyscale values
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   508
if GrayScale then
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   509
    begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   510
    for i:= Low(SDWaterColorArray) to High(SDWaterColorArray) do
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   511
        begin
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   512
        t:= round(SDWaterColorArray[i].r * RGB_LUMINANCE_RED + SDWaterColorArray[i].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[i].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   513
        if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   514
            t:= 255;
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   515
        SDWaterColorArray[i].r:= t;
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   516
        SDWaterColorArray[i].g:= t;
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   517
        SDWaterColorArray[i].b:= t
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   518
        end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   519
    for i:= Low(WaterColorArray) to High(WaterColorArray) do
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   520
        begin
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   521
        t:= round(WaterColorArray[i].r * RGB_LUMINANCE_RED + WaterColorArray[i].g * RGB_LUMINANCE_GREEN + WaterColorArray[i].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   522
        if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   523
            t:= 255;
6305
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   524
        WaterColorArray[i].r:= t;
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   525
        WaterColorArray[i].g:= t;
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   526
        WaterColorArray[i].b:= t
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   527
        end
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use
nemo
parents: 6303
diff changeset
   528
    end;
2671
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
   529
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 7640
diff changeset
   530
s:= cPathz[ptCurrTheme] + '/' + cThemeCFGFilename;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   531
WriteLnToConsole('Reading objects info...');
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   532
f:= pfsOpenRead(s);
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11507
diff changeset
   533
if checkFails(f <> nil, 'Bad data or cannot access file ' + s, true) then exit;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   534
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   535
ThemeObjects.Count:= 0;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   536
SprayObjects.Count:= 0;
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   537
11539
c22d292e7266 Fix possible crashes/hangs due to recent changes
unC0Rr
parents: 11532
diff changeset
   538
while (not pfsEOF(f)) and allOK do
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   539
    begin
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   540
    pfsReadLn(f, s);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   541
    if Length(s) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   542
        continue;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   543
    if s[1] = ';' then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   544
        continue;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   545
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   546
    i:= Pos('=', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   547
    key:= Trim(Copy(s, 1, Pred(i)));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   548
    Delete(s, 1, i);
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
   549
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   550
    if key = 'sky' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   551
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   552
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   553
        SkyColor.r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   554
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   555
        i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   556
        SkyColor.g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   557
        Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   558
        SkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   559
        if GrayScale
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   560
            then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   561
            begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   562
            t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   563
            if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   564
                t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   565
            SkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   566
            SkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   567
            SkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   568
            end;
9295
f8819c3dde54 Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents: 9080
diff changeset
   569
        SetSkyColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255);
5689
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   570
        SDSkyColor.r:= SkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   571
        SDSkyColor.g:= SkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   572
        SDSkyColor.b:= SkyColor.b;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   573
        end
11895
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   574
    else if key = 'sd-tint' then
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   575
        begin
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   576
        i:= Pos(',', s);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   577
        SDTint.r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   578
        Delete(s, 1, i);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   579
        i:= Pos(',', s);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   580
        SDTint.g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   581
        Delete(s, 1, i);
12097
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11895
diff changeset
   582
        i:= Pos(',', s);
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11895
diff changeset
   583
        SDTint.b:= StrToInt(Trim(Copy(s, 1, Pred(i))));
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11895
diff changeset
   584
        Delete(s, 1, i);
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 11895
diff changeset
   585
        SDTint.a:= StrToInt(Trim(s));
11895
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   586
        if GrayScale
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   587
            then
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   588
            begin
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   589
            t:= round(SDTint.r * RGB_LUMINANCE_RED + SDTint.g * RGB_LUMINANCE_GREEN + SDTint.b * RGB_LUMINANCE_BLUE);
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   590
            if t > 255 then
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   591
                t:= 255;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   592
            SDTint.r:= t;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   593
            SDTint.g:= t;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   594
            SDTint.b:= t
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   595
            end;
19cb0de79287 Make sd-tint a theme variable so cophernue can tweak his sky tinting
nemo
parents: 11871
diff changeset
   596
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   597
    else if key = 'border' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   598
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   599
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   600
        c2.r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   601
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   602
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   603
        c2.g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   604
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   605
        c2.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   606
        if GrayScale then
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   607
            begin
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   608
            t:= round(SkyColor.r * RGB_LUMINANCE_RED + SkyColor.g * RGB_LUMINANCE_GREEN + SkyColor.b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   609
            if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   610
                t:= 255;
6303
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   611
            c2.r:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   612
            c2.g:= t;
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   613
            c2.b:= t
3edb3c857995 Add missing grayscale conversions
nemo
parents: 6302
diff changeset
   614
            end;
10877
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   615
        ExplosionBorderColorR:= c2.r;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   616
        ExplosionBorderColorG:= c2.g;
baad1cc9b749 alternative explosion border smoothing
sheepluva
parents: 10560
diff changeset
   617
        ExplosionBorderColorB:= c2.b;
10878
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   618
        ExplosionBorderColorNoA:=
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   619
            (c2.r shl RShift) or (c2.g shl GShift) or (c2.b shl BShift);
963bc20f511c small pixel jizz tweak
sheepluva
parents: 10877
diff changeset
   620
        ExplosionBorderColor:= ExplosionBorderColorNoA or AMask;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   621
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   622
    else if key = 'water-top' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   623
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   624
        i:= Pos(',', s);
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   625
        WaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   626
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   627
        i:= Pos(',', s);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   628
        WaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   629
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   630
        WaterColorArray[1].b:= StrToInt(Trim(s));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   631
        WaterColorArray[1].a := 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   632
        if GrayScale then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   633
            begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   634
            t:= round(WaterColorArray[0].r * RGB_LUMINANCE_RED + WaterColorArray[0].g * RGB_LUMINANCE_GREEN + WaterColorArray[0].b * RGB_LUMINANCE_BLUE);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   635
            if t > 255 then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   636
                t:= 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   637
            WaterColorArray[1].r:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   638
            WaterColorArray[1].g:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   639
            WaterColorArray[1].b:= t
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   640
            end;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   641
        WaterColorArray[3]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   642
        WaterColorArray[5]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   643
        WaterColorArray[7]:= WaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   644
        end
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   645
    else if key = 'water-bottom' then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   646
        begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   647
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   648
        WaterColorArray[0].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   649
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   650
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   651
        WaterColorArray[0].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   652
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   653
        WaterColorArray[0].b:= StrToInt(Trim(s));
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   654
        WaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   655
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   656
            begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   657
            t:= round(WaterColorArray[2].r * RGB_LUMINANCE_RED + WaterColorArray[2].g * RGB_LUMINANCE_GREEN + WaterColorArray[2].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   658
            if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   659
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   660
            WaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   661
            WaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   662
            WaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   663
            end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   664
        WaterColorArray[2]:= WaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   665
        WaterColorArray[4]:= WaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   666
        WaterColorArray[6]:= WaterColorArray[0];
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   667
        end
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   668
    else if key = 'water-opacity' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   669
        begin
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   670
        WaterOpacity:= StrToInt(Trim(s));
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   671
        SDWaterOpacity:= WaterOpacity
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   672
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   673
    else if key = 'music' then
10254
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   674
        MusicFN:= Trim(s)
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   675
    else if key = 'sd-music' then
eb28335df088 theme configurable sudden death music. untested
nemo
parents: 10131
diff changeset
   676
        SDMusicFN:= Trim(s)
4792
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4782
diff changeset
   677
    else if key = 'clouds' then
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4782
diff changeset
   678
        begin
7543
a0dc770538e1 Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents: 7069
diff changeset
   679
        cCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096;
4792
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4782
diff changeset
   680
        cSDCloudsNumber:= cCloudsNumber
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4782
diff changeset
   681
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   682
    else if key = 'object' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   683
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   684
        inc(ThemeObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   685
        with ThemeObjects.objs[Pred(ThemeObjects.Count)] do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   686
            begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   687
            i:= Pos(',', s);
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   688
            Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps or ifCritical);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   689
            Width:= Surf^.w;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   690
            Height:= Surf^.h;
8848
e9ebd63f8a03 So. Some themes have objects that seem to be large natural extensions of the landscape. Masks allow maintaining that. Lemme know if it doesn't look good. If it doesn't, can still use for ice/bounce/indestructible. Indestructible bunker object for example.
nemo
parents: 8751
diff changeset
   691
            Mask:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i)))+'_mask', ifTransparent or ifIgnoreCaps);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   692
            Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   693
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   694
            Maxcnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   695
            Delete(s, 1, i);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   696
            if (Maxcnt < 1) or (Maxcnt > MAXTHEMEOBJECTS) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   697
                OutError('Object''s max count should be between 1 and '+ inttostr(MAXTHEMEOBJECTS) +' (it was '+ inttostr(Maxcnt) +').', true);
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   698
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   699
            inrectcnt := 0;
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   700
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   701
            for ii := 1 to Length(S) do
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   702
              if S[ii] = ',' then
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   703
                inc(inrectcnt);
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   704
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   705
            if inrectcnt mod 2 = 0 then
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   706
              inrectcnt := 1
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   707
            else begin
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   708
              i:= Pos(',', s);
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   709
              inrectcnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   710
              Delete(s, 1, i);
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   711
            end;
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   712
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   713
            for ii:= 1 to inrectcnt do
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   714
                with inland[ii] do
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   715
                    begin
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   716
                    i:= Pos(',', s);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   717
                    x:= StrToInt(Trim(Copy(s, 1, Pred(i))));
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   718
                    Delete(s, 1, i);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   719
                    i:= Pos(',', s);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   720
                    y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   721
                    Delete(s, 1, i);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   722
                    i:= Pos(',', s);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   723
                    w:= StrToInt(Trim(Copy(s, 1, Pred(i))));
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   724
                    Delete(s, 1, i);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   725
                    i:= Pos(',', s);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   726
                    h:= StrToInt(Trim(Copy(s, 1, Pred(i))));
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   727
                    Delete(s, 1, i);
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   728
                    CheckRect(Width, Height, x, y, w, h)
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   729
                    end;
11870
b801ff99e52c support for multiple inland rectangles [reviewed, cleaned up and committed by sheepluva]
KoBeWi <kobewi4e@gmail.com>
parents: 11824
diff changeset
   730
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   731
            i:= Pos(',', s);
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   732
            outrectcnt:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   733
            Delete(s, 1, i);
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   734
            for ii:= 1 to outrectcnt do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   735
                with outland[ii] do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   736
                    begin
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   737
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   738
                    x:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   739
                    Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   740
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   741
                    y:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   742
                    Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   743
                    i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   744
                    w:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   745
                    Delete(s, 1, i);
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   746
                    if ii = outrectcnt then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   747
                        h:= StrToInt(Trim(s))
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   748
                    else
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   749
                        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   750
                        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   751
                        h:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   752
                        Delete(s, 1, i)
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   753
                        end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   754
                    CheckRect(Width, Height, x, y, w, h)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   755
                    end;
11871
9e0b20330d05 rename variables for better code-readability and fix indentation
sheepluva
parents: 11870
diff changeset
   756
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   757
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   758
        end
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   759
    else if key = 'spray' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   760
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   761
        inc(SprayObjects.Count);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   762
        with SprayObjects.objs[Pred(SprayObjects.Count)] do
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   763
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   764
            i:= Pos(',', s);
7640
e9e6b4d740f6 clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
sheepluva
parents: 7555
diff changeset
   765
            Surf:= LoadDataImage(ptCurrTheme, Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps);
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   766
            Width:= Surf^.w;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   767
            Height:= Surf^.h;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   768
            Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   769
            Maxcnt:= StrToInt(Trim(s));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   770
            end;
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   771
        end
12189
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   772
    else if key = 'water-animation' then
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   773
        begin
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   774
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   775
        watFrames:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   776
        Delete(s, 1, i);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   777
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   778
        watFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   779
        Delete(s, 1, i);
12190
4d818abdc00f Fix bad water flow animation
KoBeWi <kobewi4e@gmail.com>
parents: 12189
diff changeset
   780
        watMove:= StrToInt(Trim(s));
12189
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   781
        end
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   782
    else if key = 'sd-water-animation' then
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   783
        begin
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   784
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   785
        watSDFrames:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   786
        Delete(s, 1, i);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   787
        i:= Pos(',', s);
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   788
        watSDFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   789
        Delete(s, 1, i);
12190
4d818abdc00f Fix bad water flow animation
KoBeWi <kobewi4e@gmail.com>
parents: 12189
diff changeset
   790
        watSDMove:= StrToInt(Trim(s));
12189
31184d9b9bfc Water can now be animated
KoBeWi <kobewi4e@gmail.com>
parents: 12168
diff changeset
   791
        end
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   792
    else if key = 'flakes' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   793
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   794
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   795
        vobCount:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   796
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   797
        if vobCount > 0 then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   798
            begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   799
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   800
            vobFramesCount:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   801
            Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   802
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   803
            vobFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   804
            Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   805
            i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   806
            vobVelocity:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   807
            Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   808
            vobFallSpeed:= StrToInt(Trim(s));
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   809
            end;
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   810
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   811
    else if key = 'flatten-flakes' then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   812
        cFlattenFlakes:= true
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   813
    else if key = 'flatten-clouds' then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   814
        cFlattenClouds:= true
9768
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   815
    else if key = 'ice' then
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   816
        cIce:= true
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   817
    else if key = 'snow' then
08799c901a42 Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents: 9721
diff changeset
   818
        cSnow:= true
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   819
    else if key = 'sd-water-top' then
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   820
        begin
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   821
        i:= Pos(',', s);
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   822
        SDWaterColorArray[1].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   823
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   824
        i:= Pos(',', s);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   825
        SDWaterColorArray[1].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   826
        Delete(s, 1, i);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   827
        SDWaterColorArray[1].b:= StrToInt(Trim(s));
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   828
        SDWaterColorArray[1].a := 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   829
        if GrayScale then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   830
            begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   831
            t:= round(SDWaterColorArray[0].r * RGB_LUMINANCE_RED + SDWaterColorArray[0].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[0].b * RGB_LUMINANCE_BLUE);
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   832
            if t > 255 then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   833
                t:= 255;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   834
            SDWaterColorArray[1].r:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   835
            SDWaterColorArray[1].g:= t;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   836
            SDWaterColorArray[1].b:= t
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   837
            end;
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   838
        SDWaterColorArray[3]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   839
        SDWaterColorArray[5]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   840
        SDWaterColorArray[7]:= SDWaterColorArray[1];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   841
        end
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   842
    else if key = 'sd-water-bottom' then
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   843
        begin
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   844
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   845
        SDWaterColorArray[0].r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   846
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   847
        i:= Pos(',', s);
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   848
        SDWaterColorArray[0].g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   849
        Delete(s, 1, i);
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   850
        SDWaterColorArray[0].b:= StrToInt(Trim(s));
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   851
        SDWaterColorArray[0].a := 255;
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   852
        if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   853
            begin
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   854
            t:= round(SDWaterColorArray[2].r * RGB_LUMINANCE_RED + SDWaterColorArray[2].g * RGB_LUMINANCE_GREEN + SDWaterColorArray[2].b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   855
            if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   856
                t:= 255;
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   857
            SDWaterColorArray[0].r:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   858
            SDWaterColorArray[0].g:= t;
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   859
            SDWaterColorArray[0].b:= t
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   860
            end;
10325
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   861
        SDWaterColorArray[2]:= SDWaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   862
        SDWaterColorArray[4]:= SDWaterColorArray[0];
7315870716f2 tweak/refactor how water is drawn
sheepluva
parents: 10261
diff changeset
   863
        SDWaterColorArray[6]:= SDWaterColorArray[0];
4782
603916ddf4b6 added also splash and droplets to sd and refactored theme.cfg, not all themes updated
Henek
parents: 4669
diff changeset
   864
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   865
    else if key = 'sd-water-opacity' then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   866
        SDWaterOpacity:= StrToInt(Trim(s))
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   867
    else if key = 'sd-clouds' then
7543
a0dc770538e1 Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
nemo
parents: 7069
diff changeset
   868
        cSDCloudsNumber:= Word(StrToInt(Trim(s))) * cScreenSpace div 4096
4806
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   869
    else if key = 'sd-flakes' then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   870
        begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   871
        i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   872
        vobSDCount:= StrToInt(Trim(Copy(s, 1, Pred(i))));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   873
        Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   874
        if vobSDCount > 0 then
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   875
            begin
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   876
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   877
            vobSDFramesCount:= StrToInt(Trim(Copy(s, 1, Pred(i))));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   878
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   879
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   880
            vobSDFrameTicks:= StrToInt(Trim(Copy(s, 1, Pred(i))));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   881
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   882
            i:= Pos(',', s);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   883
            vobSDVelocity:= StrToInt(Trim(Copy(s, 1, Pred(i))));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   884
            Delete(s, 1, i);
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   885
            vobSDFallSpeed:= StrToInt(Trim(s));
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   886
            end;
48c1a395f0a7 added flake configuration also in sudden death and SDClouds for underwater
Henek
parents: 4792
diff changeset
   887
        end
4835
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   888
    else if key = 'rq-sky' then
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   889
        begin
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   890
        if ((cReducedQuality and rqNoBackground) <> 0) then
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   891
            begin
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   892
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   893
            RQSkyColor.r:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4835
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   894
            Delete(s, 1, i);
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   895
            i:= Pos(',', s);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   896
            RQSkyColor.g:= StrToInt(Trim(Copy(s, 1, Pred(i))));
4835
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   897
            Delete(s, 1, i);
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   898
            RQSkyColor.b:= StrToInt(Trim(s));
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6700
diff changeset
   899
            if GrayScale then
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   900
                begin
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   901
                t:= round(RQSkyColor.r * RGB_LUMINANCE_RED + RQSkyColor.g * RGB_LUMINANCE_GREEN + RQSkyColor.b * RGB_LUMINANCE_BLUE);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   902
                if t > 255 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   903
                    t:= 255;
5654
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   904
                RQSkyColor.r:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   905
                RQSkyColor.g:= t;
1cb68f420aa6 Free land texture, reset sky colour.
nemo
parents: 5441
diff changeset
   906
                RQSkyColor.b:= t
5441
39962b855540 Add grayscale option for 3d, helps with colour clashing
nemo
parents: 5240
diff changeset
   907
                end;
9295
f8819c3dde54 Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents: 9080
diff changeset
   908
            SetSkyColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255);
5689
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   909
            SDSkyColor.r:= RQSkyColor.r;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   910
            SDSkyColor.g:= RQSkyColor.g;
48ef34701751 Fix rounding error in sky colour causing visible lines
nemo
parents: 5654
diff changeset
   911
            SDSkyColor.b:= RQSkyColor.b;
4835
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   912
            end
a6924450e694 added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents: 4806
diff changeset
   913
        end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   914
    end;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   915
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   916
pfsClose(f);
2671
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
   917
AddProgress;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   918
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   919
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   920
procedure AddThemeObjects(var ThemeObjects: TThemeObjects);
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   921
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   922
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   923
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   924
    if ThemeObjects.Count = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   925
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   926
    WriteLnToConsole('Adding theme objects...');
2783
1532fde15179 Palewolf's patch to allow controlling proportion of various objects in themes. Desert and Nature have non-default values
nemo
parents: 2747
diff changeset
   927
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   928
    for i:=0 to Pred(ThemeObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   929
        ThemeObjects.objs[i].Maxcnt := max(1, (ThemeObjects.objs[i].Maxcnt * MaxHedgehogs) div 18); // Maxcnt is proportional to map size, but allow objects to span even if we're on a tiny map
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   930
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   931
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   932
        t := getrandom(ThemeObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   933
        b := false;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   934
        for i:= 0 to Pred(ThemeObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   935
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   936
            ii := (i+t) mod ThemeObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   937
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   938
            if ThemeObjects.objs[ii].Maxcnt <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   939
                b := b or TryPut(ThemeObjects.objs[ii])
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   940
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   941
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   942
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   943
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   944
procedure AddSprayObjects(Surface: PSDL_Surface; var SprayObjects: TSprayObjects);
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   945
var i, ii, t: LongInt;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   946
    b: boolean;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   947
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   948
    if SprayObjects.Count = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   949
        exit;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   950
    WriteLnToConsole('Adding spray objects...');
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   951
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   952
    for i:= 0 to Pred(SprayObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   953
        SprayObjects.objs[i].Maxcnt := max(1, (SprayObjects.objs[i].Maxcnt * MaxHedgehogs) div 18); // Maxcnt is proportional to map size, but allow objects to span even if we're on a tiny map
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   954
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   955
    repeat
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   956
        t := getrandom(SprayObjects.Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   957
        b := false;
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   958
        for i:= 0 to Pred(SprayObjects.Count) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   959
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   960
            ii := (i+t) mod SprayObjects.Count;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3641
diff changeset
   961
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   962
            if SprayObjects.objs[ii].Maxcnt <> 0 then
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9682
diff changeset
   963
                b := b or TryPut2(SprayObjects.objs[ii], Surface)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   964
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   965
    until not b;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   966
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   967
1180
e56317fdf78d Start implementing support for 32bit sprites concerned in map generation process.
unc0rr
parents: 1156
diff changeset
   968
procedure AddObjects();
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   969
var girSurf: PSDL_Surface;
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   970
    i, g: Longword;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   971
begin
1183
540cea859395 Step 4: repair girder rendering (girder is 32bit now)
unc0rr
parents: 1182
diff changeset
   972
InitRects;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   973
if hasGirders then
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   974
    begin
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   975
    g:= max(playWidth div 8, 256);
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   976
    i:= leftX + g;
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   977
    girSurf:= nil;
1792
c30c6944bd49 engine part of nemo's patch
unc0rr
parents: 1776
diff changeset
   978
    repeat
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   979
        AddGirder(i, girSurf);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   980
        i:=i + g;
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7063
diff changeset
   981
    until (i > rightX - g);
10261
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   982
    // free girder surface
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   983
    if girSurf <> nil then
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   984
        begin
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   985
        SDL_FreeSurface(girSurf);
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   986
        girSurf:= nil;
c81125782cf6 load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge
sheepluva
parents: 10254
diff changeset
   987
        end;
1776
dd5648e250e4 - nemo's patch for custom cave map dimensions
unc0rr
parents: 1773
diff changeset
   988
    end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   989
if (GameFlags and gfDisableLandObjects) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6534
diff changeset
   990
    AddThemeObjects(ThemeObjects);
2705
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
   991
AddProgress();
2b5625c4ec16 fix a nasty 196 bytes memory leak in engine, plus other stuff for iphone frontend
koda
parents: 2699
diff changeset
   992
FreeRects();
1190
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   993
end;
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   994
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   995
procedure AddOnLandObjects(Surface: PSDL_Surface);
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   996
begin
73ec31d8bb6f Enable back rendering objects that are put on top of land texture
unc0rr
parents: 1186
diff changeset
   997
InitRects;
2870
1358cc003e4d Palewolf tweaks map object placement some more.
nemo
parents: 2783
diff changeset
   998
AddSprayObjects(Surface, SprayObjects);
1186
bf5af791d234 Step 5: Finally... we have theme objects with alpha-channel!
unc0rr
parents: 1185
diff changeset
   999
FreeRects
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1000
end;
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1001
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1002
procedure LoadThemeConfig;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1003
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1004
    ReadThemeInfo(ThemeObjects, SprayObjects)
1085
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1005
end;
0b82870073b5 Load flakes information from theme.cfg when playing painted map
unc0rr
parents: 1066
diff changeset
  1006
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1007
procedure FreeLandObjects();
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1008
var i: Longword;
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1009
begin
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1010
    for i:= 0 to Pred(MAXTHEMEOBJECTS) do
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1011
    begin
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1012
        if ThemeObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1013
            SDL_FreeSurface(ThemeObjects.objs[i].Surf);
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1014
        if SprayObjects.objs[i].Surf <> nil then
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1015
            SDL_FreeSurface(SprayObjects.objs[i].Surf);
3513
f589230fa21b now it's possible to select the scheme file in the ifrontendfix a type about loading an image (iphone file system IS case senstive)
koda
parents: 3509
diff changeset
  1016
        ThemeObjects.objs[i].Surf:= nil;
f589230fa21b now it's possible to select the scheme file in the ifrontendfix a type about loading an image (iphone file system IS case senstive)
koda
parents: 3509
diff changeset
  1017
        SprayObjects.objs[i].Surf:= nil;
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3407
diff changeset
  1018
    end;
3053
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1019
end;
55a7e3a896ef Free land object SDL surfaces.
nemo
parents: 2948
diff changeset
  1020
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
  1021
end.