hedgewars/uWorld.pas
author sheepluva
Wed, 22 Jan 2014 18:46:15 +0100
changeset 10053 8a56c23f94c5
parent 10040 4ac87acbaed9
child 10080 ac51bcb534ef
permissions -rw-r--r--
actual fix
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 1045
diff changeset
     2
 * Hedgewars, a free turn based strategy game
9998
736015b847e3 update copyright to 2014
sheepluva
parents: 9983
diff changeset
     3
 * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     4
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     8
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    12
 * GNU General Public License for more details.
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    13
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    14
 * You should have received a copy of the GNU General Public License
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    15
 * along with this program; if not, write to the Free Software
57c2ef19f719 Relicense to GPL
unc0rr
parents: 176
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    17
 *)
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2619
diff changeset
    19
{$INCLUDE "options.inc"}
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
    20
{$IF GLunit = GL}{$DEFINE GLunit:=GL,GLext}{$ENDIF}
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2619
diff changeset
    21
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    22
unit uWorld;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    23
interface
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
    24
uses SDLh, uGears, uConsts, uFloat, uRandom, uTypes, uRenderUtils;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
    25
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
    26
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
    27
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    28
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    29
procedure InitWorld;
6394
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
    30
procedure ResetWorldTex;
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
    31
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    32
procedure DrawWorld(Lag: LongInt);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
    33
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
10009
88929358d2e1 Convert some ansistrings to pchars
unc0rr
parents: 9998
diff changeset
    34
procedure ShowMission(caption, subcaption, mtext: PChar; icon, time : LongInt);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
    35
procedure HideMission;
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
    36
procedure ShakeCamera(amount: LongInt);
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
    37
procedure InitCameraBorders;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
    38
procedure InitTouchInterface;
7023
b320ff81cc73 removed the default argument in uWorld
Xeli
parents: 7022
diff changeset
    39
procedure SetUtilityWidgetState(ammoType: TAmmoType);
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
    40
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3629
diff changeset
    41
procedure MoveCamera;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
    42
procedure onFocusStateChanged;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    43
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    44
implementation
4359
83ef50815535 Move variables from uMisc to uVariables
unC0Rr
parents: 4357
diff changeset
    45
uses
7721
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    46
    uStore
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    47
    , uMisc
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    48
    , uIO
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    49
    , uLocale
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    50
    , uSound
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    51
    , uAmmos
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    52
    , uVisualGears
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    53
    , uChat
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    54
    , uLandTexture
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    55
    , GLunit
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    56
    , uVariables
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    57
    , uUtils
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    58
    , uTextures
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    59
    , uRender
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    60
    , uCaptions
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    61
    , uCursor
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    62
    , uCommands
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    63
    , uTeams
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    64
{$IFDEF USE_VIDEO_RECORDING}
7721
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    65
    , uVideoRec
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    66
{$ENDIF}
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
    67
{$IFDEF GL2}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
    68
    , uMatrix
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
    69
{$ENDIF}
4359
83ef50815535 Move variables from uMisc to uVariables
unC0Rr
parents: 4357
diff changeset
    70
    ;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    71
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
    72
var cWaveWidth, cWaveHeight: LongInt;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
    73
    AMShiftTargetX, AMShiftTargetY, AMShiftX, AMShiftY, SlotsNum: LongInt;
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
    74
    AMAnimStartTime, AMState : LongInt;
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
    75
    AMAnimState: Single;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
    76
    tmpSurface: PSDL_Surface;
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
    77
    fpsTexture: PTexture;
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
    78
    timeTexture: PTexture;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    79
    FPS: Longword;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    80
    CountTicks: Longword;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
    81
    prevPoint{, prevTargetPoint}: TPoint;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    82
    amSel: TAmmoType = amNothing;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    83
    missionTex: PTexture;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    84
    missionTimer: LongInt;
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
    85
    stereoDepth: GLfloat;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
    86
    isFirstFrame: boolean;
7028
0f60591f3a16 old typed const moved to their proper unit
koda
parents: 7027
diff changeset
    87
    AMAnimType: LongInt;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
    88
    recTexture: PTexture;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    89
    AmmoMenuTex     : PTexture;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    90
    HorizontOffset: LongInt;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    91
    cOffsetY: LongInt;
9557
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
    92
    WorldEnd, WorldFade : array[0..3] of HwColor4f;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
    93
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    94
const cStereo_Sky           = 0.0500;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    95
      cStereo_Horizon       = 0.0250;
6302
db8bdbb34e03 Spread flakes out over 5 layers now (far back, mid distance, just behind land, just in front of lands and hog, near distance). Spread clouds out over 3 layers (far back, mid distance, just behind land). Add a flatten clouds option, use
nemo
parents: 6296
diff changeset
    96
      cStereo_MidDistance   = 0.0175;
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    97
      cStereo_Water_distant = 0.0125;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    98
      cStereo_Land          = 0.0075;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    99
      cStereo_Water_near    = 0.0025;
6289
95ffd59d0f4a Increase rarity of near flakes (don't want them intruding in game much). Also fix stereo. Near flakes were being drawn far.
nemo
parents: 6276
diff changeset
   100
      cStereo_Outside       = -0.0400;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   101
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   102
      AMAnimDuration = 200;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   103
      AMHidden    = 0;//AMState values
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   104
      AMShowingUp = 1;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   105
      AMShowing   = 2;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   106
      AMHiding    = 3;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   107
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   108
      AMTypeMaskX     = $00000001;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   109
      AMTypeMaskY     = $00000002;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   110
      AMTypeMaskAlpha = $00000004;
8370
0c79946e96f8 Fix tons of warnings
martin_bede
parents: 8359
diff changeset
   111
      //AMTypeMaskSlide = $00000008;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   112
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   113
{$IFDEF MOBILE}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   114
      AMSlotSize = 48;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   115
{$ELSE}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   116
      AMSlotSize = 32;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   117
{$ENDIF}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   118
      AMSlotPadding = (AMSlotSize - 32) shr 1;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   119
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   120
      cSendCursorPosTime = 50;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   121
      cCursorEdgesDist   = 100;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   122
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   123
// helper functions to create the goal/game mode string
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   124
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   125
var t: ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   126
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   127
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   128
        begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   129
        t:= inttostr(i);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7049
diff changeset
   130
        s:= s + FormatA(trgoal[si], t) + '|'
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   131
        end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   132
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   133
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   134
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   135
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   136
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   137
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   138
        s:= s + trgoal[si] + '|';
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   139
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   140
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   141
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   142
procedure InitWorld;
2704
51cda17b7c3b Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents: 2699
diff changeset
   143
var i, t: LongInt;
51cda17b7c3b Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents: 2699
diff changeset
   144
    cp: PClan;
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   145
    g: ansistring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   146
begin
3764
eb91c02f2d84 Engine:
smaxx
parents: 3697
diff changeset
   147
missionTimer:= 0;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
   148
2704
51cda17b7c3b Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents: 2699
diff changeset
   149
if (GameFlags and gfRandomOrder) <> 0 then  // shuffle them up a bit
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   150
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   151
    for i:= 0 to ClansCount * 4 do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   152
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   153
        t:= GetRandom(ClansCount);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   154
        if t <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   155
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   156
            cp:= ClansArray[0];
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   157
            ClansArray[0]:= ClansArray[t];
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   158
            ClansArray[t]:= cp;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   159
            ClansArray[t]^.ClanIndex:= t;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   160
            ClansArray[0]^.ClanIndex:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   161
            if (LocalClan = t) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   162
                LocalClan:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   163
            else if (LocalClan = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   164
                LocalClan:= t
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   165
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   166
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   167
    CurrentTeam:= ClansArray[0]^.Teams[0];
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   168
    end;
2704
51cda17b7c3b Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents: 2699
diff changeset
   169
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   170
// if special game flags/settings are changed, add them to the game mode notice window and then show it
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   171
g:= ''; // no text/things to note yet
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   172
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   173
// add custom goals from lua script if there are any
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   174
if LuaGoals <> '' then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   175
    g:= LuaGoals + '|';
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   176
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   177
// check different game flags (goals/game modes first for now)
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   178
g:= AddGoal(g, gfKing, gidKing); // king?
5022
d2a2f6c9b236 some final work and buggfix for Tag Team, it is now playable
Henek
parents: 4976
diff changeset
   179
g:= AddGoal(g, gfTagTeam, gidTagTeam); // tag team mode?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   180
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   181
// other important flags
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   182
g:= AddGoal(g, gfForts, gidForts); // forts?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   183
g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   184
g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   185
g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   186
g:= AddGoal(g, gfKarma, gidKarma); // karma?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   187
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   188
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   189
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   190
g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
4132
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   191
g:= AddGoal(g, gfResetHealth, gidResetHealth);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   192
g:= AddGoal(g, gfAISurvival, gidAISurvival);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   193
g:= AddGoal(g, gfInfAttack, gidInfAttack);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   194
g:= AddGoal(g, gfResetWeps, gidResetWeps);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   195
g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   196
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   197
// modified damage modificator?
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   198
if cDamagePercent <> 100 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   199
    g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   200
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   201
// fade in
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   202
ScreenFade:= sfFromBlack;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   203
ScreenFadeValue:= sfMax;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   204
ScreenFadeSpeed:= 1;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   205
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   206
// modified mine timers?
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   207
if cMinesTime <> 3000 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   208
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   209
    if cMinesTime = 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   210
        g:= AddGoal(g, gfAny, gidNoMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   211
    else if cMinesTime < 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   212
        g:= AddGoal(g, gfAny, gidRandomMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   213
    else
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   214
        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   215
    end;
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   216
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   217
// if the string has been set, show it for (default timeframe) seconds
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   218
if g <> '' then
10009
88929358d2e1 Convert some ansistrings to pchars
unc0rr
parents: 9998
diff changeset
   219
    ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], PChar(g), 1, 0);
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   220
1825
c929f9111141 Nemo's patch allowing different water sprites size
unc0rr
parents: 1812
diff changeset
   221
cWaveWidth:= SpritesData[sprWater].Width;
2268
053eb81e60ee little experiment to see if this improve appearance of laser/ufo/cake/laser guided missile - of course, can't actually see it until unc0rr restores waves
nemo
parents: 2226
diff changeset
   222
//cWaveHeight:= SpritesData[sprWater].Height;
053eb81e60ee little experiment to see if this improve appearance of laser/ufo/cake/laser guided missile - of course, can't actually see it until unc0rr restores waves
nemo
parents: 2226
diff changeset
   223
cWaveHeight:= 32;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   224
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
   225
InitCameraBorders();
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
   226
uCursor.init();
2197
a02adcdaa939 Some work on camera
unc0rr
parents: 2178
diff changeset
   227
prevPoint.X:= 0;
74
42257fee61ae - Unicode support for team and hedgehogs names
unc0rr
parents: 71
diff changeset
   228
prevPoint.Y:= cScreenHeight div 2;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   229
//prevTargetPoint.X:= 0;
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   230
//prevTargetPoint.Y:= 0;
6609
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   231
WorldDx:=  -(LAND_WIDTH div 2) + cScreenWidth div 2;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   232
WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   233
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   234
//aligns it to the bottom of the screen, minus the border
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   235
SkyOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   236
HorizontOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   237
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   238
InitTouchInterface();
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   239
AMAnimType:= AMTypeMaskX or AMTypeMaskAlpha;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   240
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   241
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   242
procedure InitCameraBorders;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   243
begin
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   244
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5);
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   245
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   246
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   247
procedure InitTouchInterface;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   248
begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   249
{$IFDEF USE_TOUCH_INTERFACE}
7167
0b3b306f129a Android: added a callback to java to determine dpi/dip how much we should scale the ui
Xeli
parents: 7086
diff changeset
   250
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   251
//positioning of the buttons
9377
48ab6dea8d2f remove old and unused getScreenDPI code
koda
parents: 9080
diff changeset
   252
buttonScale:= 1 / cDefaultZoomLevel;
6683
75a1d84ac606 small refactoring to touch screen buttons, use a record to store values, added 'offset' fields to adjust active button area
koda
parents: 6682
diff changeset
   253
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   254
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   255
with JumpWidget do
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   256
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   257
    show:= true;
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   258
    sprite:= sprJumpWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   259
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   260
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   261
    frame.x:= (cScreenWidth shr 1) - Round(frame.w * 1.2);
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   262
    frame.y:= cScreenHeight - frame.h * 2;
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   263
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   264
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   265
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   266
    active.h:= frame.h;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   267
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   268
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   269
with AMWidget do
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   270
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   271
    show:= true;
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   272
    sprite:= sprAMWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   273
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   274
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   275
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   276
    frame.y:= cScreenHeight - Round(frame.h * 1.2);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   277
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   278
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   279
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   280
    active.h:= frame.h;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   281
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   282
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   283
with arrowLeft do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   284
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   285
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   286
    sprite:= sprArrowLeft;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   287
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   288
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   289
    frame.x:= -(cScreenWidth shr 1) + Round(frame.w * 0.25);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   290
    frame.y:= cScreenHeight - Round(frame.h * 1.5);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   291
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   292
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   293
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   294
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   295
    end;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   296
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   297
with arrowRight do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   298
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   299
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   300
    sprite:= sprArrowRight;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   301
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   302
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   303
    frame.x:= -(cScreenWidth shr 1) + Round(frame.w * 1.5);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   304
    frame.y:= cScreenHeight - Round(frame.h * 1.5);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   305
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   306
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   307
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   308
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   309
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   310
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   311
with firebutton do
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   312
    begin
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   313
    show:= true;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   314
    sprite:= sprFireButton;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   315
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   316
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   317
    frame.x:= arrowRight.frame.x + arrowRight.frame.w;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   318
    frame.y:= arrowRight.frame.y + (arrowRight.frame.w shr 1) - (frame.w shr 1);
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   319
    active.x:= frame.x;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   320
    active.y:= frame.y;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   321
    active.w:= frame.w;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   322
    active.h:= frame.h;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   323
    end;
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   324
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   325
with arrowUp do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   326
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   327
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   328
    sprite:= sprArrowUp;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   329
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   330
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   331
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   332
    frame.y:= jumpWidget.frame.y - Round(frame.h * 1.25);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   333
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   334
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   335
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   336
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   337
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   338
         begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   339
         target.x:= frame.x;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   340
         target.y:= frame.y;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   341
         source.x:= frame.x - Round(frame.w * 0.75);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   342
         source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   343
         end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   344
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   345
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   346
with arrowDown do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   347
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   348
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   349
    sprite:= sprArrowDown;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   350
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   351
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   352
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   353
    frame.y:= jumpWidget.frame.y - Round(frame.h * 1.25);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   354
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   355
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   356
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   357
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   358
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   359
        begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   360
        target.x:= frame.x;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   361
        target.y:= frame.y;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   362
        source.x:= frame.x + Round(frame.w * 0.75);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   363
        source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   364
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   365
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   366
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   367
with pauseButton do
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   368
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   369
    show:= true;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   370
    sprite:= sprPauseButton;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   371
    frame.w:= Round(spritesData[sprPauseButton].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   372
    frame.h:= Round(spritesData[sprPauseButton].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   373
    frame.x:= cScreenWidth div 2 - frame.w;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   374
    frame.y:= 0;
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   375
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   376
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   377
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   378
    active.h:= frame.h;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   379
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   380
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   381
with utilityWidget do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   382
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   383
    show:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   384
    sprite:= sprTimerButton;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   385
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   386
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   387
    frame.x:= arrowLeft.frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   388
    frame.y:= arrowLeft.frame.y - Round(frame.h * 1.25);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   389
    active.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   390
    active.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   391
    active.w:= frame.w;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   392
    active.h:= frame.h;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   393
    with moveAnim do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   394
        begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   395
        target.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   396
        target.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   397
        source.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   398
        source.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   399
        end;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   400
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   401
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   402
end;
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   403
6394
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   404
// for uStore texture resetting
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   405
procedure ResetWorldTex;
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   406
begin
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   407
    FreeTexture(fpsTexture);
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   408
    fpsTexture:= nil;
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   409
    FreeTexture(timeTexture);
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   410
    timeTexture:= nil;
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   411
    FreeTexture(missionTex);
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   412
    missionTex:= nil;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
   413
    FreeTexture(recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
   414
    recTexture:= nil;
9983
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
   415
    FreeTexture(AmmoMenuTex);
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
   416
    AmmoMenuInvalidated:= true;
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
   417
    AmmoMenuTex:= nil;
6394
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   418
end;
f0a9042e7387 yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents: 6380
diff changeset
   419
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   420
function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture;
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   421
const BORDERSIZE = 2;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   422
var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   423
    STurns: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   424
    amSurface: PSDL_Surface;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   425
    AMRect: TSDL_Rect;
7049
35d762458d66 minor changes for warnings and a variables scope
koda
parents: 7028
diff changeset
   426
{$IFDEF USE_AM_NUMCOLUMN}tmpsurf: PSDL_Surface;{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   427
begin
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   428
    SlotsNum:= 0;
6606
fb6163ff4ebf changed the ammomenu to be landscape for MOBILE, also tweaked the positions a bit, needs testing on iOS
Xeli
parents: 6603
diff changeset
   429
    for i:= 0 to cMaxSlotIndex do
fb6163ff4ebf changed the ammomenu to be landscape for MOBILE, also tweaked the positions a bit, needs testing on iOS
Xeli
parents: 6603
diff changeset
   430
        if((i = 0) and (Ammo^[i,1].Count > 0)) or ((i <> 0) and (Ammo^[i,0].Count > 0)) then
fb6163ff4ebf changed the ammomenu to be landscape for MOBILE, also tweaked the positions a bit, needs testing on iOS
Xeli
parents: 6603
diff changeset
   431
            inc(SlotsNum);
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   432
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   433
    SlotsNumX:= SlotsNum;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   434
    SlotsNumY:= cMaxSlotAmmoIndex + 2;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   435
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   436
    inc(SlotsNumY);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   437
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   438
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   439
    SlotsNumX:= cMaxSlotAmmoIndex + 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   440
    SlotsNumY:= SlotsNum + 1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   441
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   442
    inc(SlotsNumX);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   443
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   444
{$ENDIF}
6606
fb6163ff4ebf changed the ammomenu to be landscape for MOBILE, also tweaked the positions a bit, needs testing on iOS
Xeli
parents: 6603
diff changeset
   445
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   446
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   447
    AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   448
    AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   449
    amSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, AmmoRect.w, AmmoRect.h, 32, RMask, GMask, BMask, AMask);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   450
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   451
    AMRect.x:= BORDERSIZE;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   452
    AMRect.y:= BORDERSIZE;
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   453
    AMRect.w:= AmmoRect.w - (BORDERSIZE*2);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   454
    AMRect.h:= AmmoRect.h - (BORDERSIZE*2);
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   455
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   456
    SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   457
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   458
    x:= AMRect.x;
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   459
    y:= AMRect.y;
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   460
    for i:= 0 to cMaxSlotIndex do
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   461
        if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   462
            begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   463
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   464
            y:= AMRect.y;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   465
{$ELSE}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   466
            x:= AMRect.x;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   467
{$ENDIF}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   468
{$IFDEF USE_AM_NUMCOLUMN}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   469
            tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar('F' + IntToStr(i+1)), cWhiteColorChannels);
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   470
            copyToXY(tmpsurf, amSurface,
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   471
                     x + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.w shr 1),
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   472
                     y + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.h shr 1));
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   473
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   474
            SDL_FreeSurface(tmpsurf);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   475
    {$IFDEF USE_LANDSCAPE_AMMOMENU}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   476
            y:= AMRect.y + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   477
    {$ELSE}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   478
            x:= AMRect.x + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   479
    {$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   480
{$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   481
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   482
6606
fb6163ff4ebf changed the ammomenu to be landscape for MOBILE, also tweaked the positions a bit, needs testing on iOS
Xeli
parents: 6603
diff changeset
   483
            for t:=0 to cMaxSlotAmmoIndex do
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   484
                begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   485
                if (Ammo^[i, t].Count > 0)  and (Ammo^[i, t].AmmoType <> amNothing) then
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   486
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   487
                    STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   488
                    AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   489
                    if STurns >= 0 then //weapon not usable yet, draw grayed out with turns remaining
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   490
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   491
                        DrawSpriteFrame2Surf(sprAMAmmosBW, amSurface, x + AMSlotPadding,
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   492
                                                                 y + AMSlotPadding, AMFrame);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   493
                        if STurns < 100 then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   494
                            DrawSpriteFrame2Surf(sprTurnsLeft, amSurface,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   495
                                x + AMSlotSize-16,
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   496
                                y + AMSlotSize + 1 - 16, STurns);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   497
                        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   498
                    else //draw colored version
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   499
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   500
                        DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding,
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   501
                                                               y + AMSlotPadding, AMFrame);
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   502
                        end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   503
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   504
        inc(y, AMSlotSize + 1); //the plus one is for the border
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   505
{$ELSE}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   506
        inc(x, AMSlotSize + 1);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   507
{$ENDIF}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   508
        end;
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   509
    end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   510
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   511
    inc(x, AMSlotSize + 1);
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   512
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   513
    inc(y, AMSlotSize + 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   514
{$ENDIF}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   515
    end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   516
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   517
for i:= 1 to SlotsNumX -1 do
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   518
DrawLine2Surf(amSurface, i * (AMSlotSize+1)+1, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.h + BORDERSIZE - AMSlotSize - 2,160,160,160);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   519
for i:= 1 to SlotsNumY -1 do
6652
b043665dea3d and oooone last off-by-1 in ammo menu
nemo
parents: 6650
diff changeset
   520
DrawLine2Surf(amSurface, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.w + BORDERSIZE, i * (AMSlotSize+1)+1,160,160,160);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   521
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   522
//draw outer border
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   523
DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0                    , 0                    , 0);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   524
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.y             , 1);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   525
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.x             , AMRect.h + BORDERSIZE, 2);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   526
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.h + BORDERSIZE, 3);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   527
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   528
for i:=0 to BORDERSIZE-1 do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   529
begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   530
DrawLine2Surf(amSurface, BORDERSIZE, i, AMRect.w + BORDERSIZE, i,160,160,160);//top
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   531
DrawLine2Surf(amSurface, BORDERSIZE, AMRect.h+BORDERSIZE+i, AMRect.w + BORDERSIZE, AMRect.h+BORDERSIZE+i,160,160,160);//bottom
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   532
DrawLine2Surf(amSurface, i, BORDERSIZE, i, AMRect.h + BORDERSIZE,160,160,160);//left
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   533
DrawLine2Surf(amSurface, AMRect.w+BORDERSIZE+i, BORDERSIZE, AMRect.w + BORDERSIZE+i, AMRect.h + BORDERSIZE, 160,160,160);//right
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   534
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   535
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   536
GetAmmoMenuTexture:= Surface2Tex(amSurface, false);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   537
if amSurface <> nil then SDL_FreeSurface(amSurface);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   538
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   539
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   540
procedure ShowAmmoMenu;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   541
const BORDERSIZE = 2;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   542
var Slot, Pos: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   543
    Ammo: PHHAmmo;
6648
025473a2c420 prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents: 6647
diff changeset
   544
    c,i,g,t,STurns: LongInt;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   545
begin
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   546
if TurnTimeLeft = 0 then bShowAmmoMenu:= false;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   547
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   548
// give the assigned ammo to hedgehog
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   549
Ammo:= nil;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   550
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil)
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   551
and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   552
    Ammo:= CurrentHedgehog^.Ammo
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   553
else if (LocalAmmo <> -1) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   554
    Ammo:= GetAmmoByNum(LocalAmmo);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   555
Pos:= -1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   556
if Ammo = nil then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   557
    begin
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   558
    bShowAmmoMenu:= false;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   559
    AMState:= AMHidden;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   560
    exit
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   561
    end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   562
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   563
//Init the menu
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   564
if(AmmoMenuInvalidated) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   565
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   566
    AmmoMenuInvalidated:= false;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   567
    FreeTexture(AmmoMenuTex);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   568
    AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   569
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   570
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   571
    if isPhone() then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   572
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   573
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   574
        AmmoRect.y:= (cScreenHeight shr 1) - (AmmoRect.h shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   575
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   576
    else
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   577
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   578
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   579
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   580
        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   581
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   582
        AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   583
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   584
{$ENDIF}
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   585
    if AMState <> AMShowing then
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   586
        begin
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   587
        AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   588
        AMShiftTargetY:= cScreenHeight        - AmmoRect.y;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   589
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   590
        if (AMAnimType and AMTypeMaskX) <> 0 then AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   591
        else AMShiftTargetX:= 0;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   592
        if (AMAnimType and AMTypeMaskY) <> 0 then AMShiftTargetY:= cScreenHeight        - AmmoRect.y
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   593
        else AMShiftTargetY:= 0;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   594
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   595
        AMShiftX:= AMShiftTargetX;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   596
        AMShiftY:= AMShiftTargetY
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   597
        end
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   598
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   599
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   600
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   601
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   602
if AMState = AMShowing then
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   603
    begin
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   604
    FollowGear:=nil;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   605
    end;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   606
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   607
if AMState = AMShowingUp then // show ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   608
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   609
    if (cReducedQuality and rqSlowMenu) <> 0 then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   610
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   611
        AMShiftX:= 0;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   612
        AMShiftY:= 0;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   613
        AMState:= AMShowing;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   614
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   615
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   616
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   617
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   618
            AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   619
            AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   620
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   621
                Tint($FF, $ff, $ff, Round($ff * AMAnimState));
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   622
            end
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   623
        else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   624
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   625
            AMShiftX:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   626
            AMShiftY:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   627
            CursorPoint.X:= AmmoRect.x + AmmoRect.w;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   628
            CursorPoint.Y:= AmmoRect.y;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   629
            AMState:= AMShowing;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   630
            end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   631
    end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   632
if AMState = AMHiding then // hide ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   633
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   634
    if (cReducedQuality and rqSlowMenu) <> 0 then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   635
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   636
        AMShiftX:= AMShiftTargetX;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   637
        AMShiftY:= AMShiftTargetY;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   638
        AMState:= AMHidden;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   639
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   640
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   641
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   642
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   643
            AMShiftX:= Round(AMShiftTargetX * AMAnimState);
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   644
            AMShiftY:= Round(AMShiftTargetY * AMAnimState);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   645
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   646
                Tint($FF, $ff, $ff, Round($ff * (1-AMAnimState)));
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   647
            end
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   648
         else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   649
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   650
            AMShiftX:= AMShiftTargetX;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   651
            AMShiftY:= AMShiftTargetY;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   652
            prevPoint:= CursorPoint;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   653
            //prevTargetPoint:= TargetCursorPoint;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   654
            AMState:= AMHidden;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   655
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   656
    end;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   657
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   658
DrawTexture(AmmoRect.x + AMShiftX, AmmoRect.y + AMShiftY, AmmoMenuTex);
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   659
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   660
if ((AMState = AMHiding) or (AMState = AMShowingUp)) and ((AMAnimType and AMTypeMaskAlpha) <> 0 )then
10032
db65298717da This adds idle hog tinting. Active hog tinting still needed.
nemo
parents: 10009
diff changeset
   661
    untint;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   662
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   663
Pos:= -1;
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   664
Slot:= -1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   665
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   666
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   667
    for i:= 0 to cMaxSlotIndex do
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   668
        if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   669
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   670
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   671
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   672
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   673
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   674
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   675
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   676
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   677
                if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   678
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   679
                    if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( g    * (AMSlotSize+1))) and
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
   680
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   681
                       (CursorPoint.X >  AmmoRect.x                   + ( c    * (AMSlotSize+1))) and
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   682
                       (CursorPoint.X <= AmmoRect.x                   + ((c+1) * (AMSlotSize+1))) then
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   683
                        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   684
                        Slot:= i;
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   685
                        Pos:= t;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   686
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   687
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   688
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   689
                                       AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding,
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   690
                                       AmmoRect.y + BORDERSIZE + (g  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   691
                        end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   692
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   693
                   end;
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   694
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   695
{$ELSE}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   696
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   697
    for i:= 0 to cMaxSlotIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   698
        if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   699
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   700
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   701
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   702
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   703
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   704
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   705
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   706
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   707
                if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   708
                    begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   709
                    if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( c    * (AMSlotSize+1))) and
7840
7d86dbcd6325 Fix issue 435, and also unreported bug when 2 or even 4 entries could have selection at the same time in weapons menu.
unc0rr
parents: 7721
diff changeset
   710
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   711
                       (CursorPoint.X >  AmmoRect.x                   + ( g    * (AMSlotSize+1))) and
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   712
                       (CursorPoint.X <= AmmoRect.x                   + ((g+1) * (AMSlotSize+1))) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   713
                        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   714
                        Slot:= i;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   715
                        Pos:= t;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   716
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   717
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   718
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   719
                                       AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding,
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   720
                                       AmmoRect.y + BORDERSIZE + (c  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   721
                        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   722
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   723
                   end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   724
            end;
3395
095273ad0e08 adding a somewhat working autoration for ipad (uStore.pas and uWorld.pas got mixed in the last two commits)
koda
parents: 3390
diff changeset
   725
{$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   726
    if (Pos >= 0) and (Pos <= cMaxSlotAmmoIndex) and (Slot >= 0) and (Slot <= cMaxSlotIndex)then
3967
5b9bc77acd04 Extend the >0 / amNothing check
nemo
parents: 3966
diff changeset
   727
        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   728
        if (AMShiftX = 0) and (AMShiftY = 0) then
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   729
        if (Ammo^[Slot, Pos].Count > 0) and (Ammo^[Slot, Pos].AmmoType <> amNothing) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   730
            begin
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   731
            if (amSel <> Ammo^[Slot, Pos].AmmoType) or (WeaponTooltipTex = nil) then
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   732
                begin
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   733
                amSel:= Ammo^[Slot, Pos].AmmoType;
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   734
                RenderWeaponTooltip(amSel)
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   735
                end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   736
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   737
            DrawTexture(AmmoRect.x + (AMSlotSize shr 1),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   738
                        AmmoRect.y + AmmoRect.h - BORDERSIZE - (AMSlotSize shr 1) - (Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex^.h shr 1),
6608
9305a12f66bf added the background for the weaponnames in MOBILE
Xeli
parents: 6607
diff changeset
   739
                        Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex);
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   740
            if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   741
                DrawTexture(AmmoRect.x + AmmoRect.w - 20 - (CountTexz[Ammo^[Slot, Pos].Count]^.w),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   742
                            AmmoRect.y + AmmoRect.h - BORDERSIZE - (AMslotSize shr 1) - (CountTexz[Ammo^[Slot, Pos].Count]^.w shr 1),
6608
9305a12f66bf added the background for the weaponnames in MOBILE
Xeli
parents: 6607
diff changeset
   743
                            CountTexz[Ammo^[Slot, Pos].Count]);
1529
3bc916b419cd Don't hide ammo menu when user clicks on not yet available weapon
unc0rr
parents: 1439
diff changeset
   744
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   745
            if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   746
                begin
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   747
                bShowAmmoMenu:= false;
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   748
                SetWeapon(Ammo^[Slot, Pos].AmmoType);
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   749
                bSelected:= false;
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   750
                FreeWeaponTooltip;
6691
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   751
{$IFDEF USE_TOUCH_INTERFACE}//show the aiming buttons + animation
6941
228c0ab239f1 add ammoprop to enable to up and down buttons on for the touch interface
Xeli
parents: 6924
diff changeset
   752
                if (Ammo^[Slot, Pos].Propz and ammoprop_NeedUpDown) <> 0 then
6691
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   753
                    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
   754
                    if (not arrowUp.show) then
6691
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   755
                        begin
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   756
                        animateWidget(@arrowUp, true, true);
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   757
                        animateWidget(@arrowDown, true, true);
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   758
                        end;
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   759
                    end
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   760
                else
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   761
                    if arrowUp.show then
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   762
                        begin
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   763
                        animateWidget(@arrowUp, true, false);
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   764
                        animateWidget(@arrowDown, true, false);
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   765
                        end;
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   766
                SetUtilityWidgetState(Ammo^[Slot, Pos].AmmoType);
6691
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   767
{$ENDIF}
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   768
                exit
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   769
                end;
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   770
            end
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   771
        end
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   772
    else
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   773
        FreeWeaponTooltip;
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   774
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   775
    if (WeaponTooltipTex <> nil) and (AMShiftX = 0) and (AMShiftY = 0) then
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   776
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
   777
        if (not isPhone()) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   778
            ShowWeaponTooltip(-WeaponTooltipTex^.w div 2, AmmoRect.y - WeaponTooltipTex^.h - AMSlotSize);
3395
095273ad0e08 adding a somewhat working autoration for ipad (uStore.pas and uWorld.pas got mixed in the last two commits)
koda
parents: 3390
diff changeset
   779
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   780
        ShowWeaponTooltip(AmmoRect.x - WeaponTooltipTex^.w - 3, Min(AmmoRect.y + 1, cScreenHeight - WeaponTooltipTex^.h - 40));
3395
095273ad0e08 adding a somewhat working autoration for ipad (uStore.pas and uWorld.pas got mixed in the last two commits)
koda
parents: 3390
diff changeset
   781
{$ENDIF}
961
a9a349b2b3fa Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents: 956
diff changeset
   782
6276
1e2f8da1860a while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents: 6250
diff changeset
   783
    bSelected:= false;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   784
{$IFNDEF USE_TOUCH_INTERFACE}
6648
025473a2c420 prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents: 6647
diff changeset
   785
   if (AMShiftX = 0) and (AMShiftY = 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   786
        DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
6648
025473a2c420 prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents: 6647
diff changeset
   787
{$ENDIF}
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   788
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   789
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
   790
procedure DrawWater(Alpha: byte; OffsetY: LongInt);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   791
var VertexBuffer : array [0..3] of TVertex2f;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   792
    r        : TSDL_Rect;
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   793
    lw, lh   : GLfloat;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   794
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   795
if SuddenDeathDmg then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   796
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   797
    SDWaterColorArray[0].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   798
    SDWaterColorArray[1].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   799
    SDWaterColorArray[2].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   800
    SDWaterColorArray[3].a := Alpha
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   801
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   802
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   803
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   804
    WaterColorArray[0].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   805
    WaterColorArray[1].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   806
    WaterColorArray[2].a := Alpha;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   807
    WaterColorArray[3].a := Alpha
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   808
    end;
2269
00f5704f5f39 add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents: 2268
diff changeset
   809
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   810
lw:= cScreenWidth / cScaleFactor;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   811
lh:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 + 16;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   812
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   813
    // Water
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   814
r.y:= OffsetY + WorldDy + cWaterLine;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   815
if WorldDy < trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   816
    begin
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   817
        if r.y < 0 then
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   818
            r.y:= 0;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   819
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   820
        glDisable(GL_TEXTURE_2D);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   821
        VertexBuffer[0].X:= -lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   822
        VertexBuffer[0].Y:= r.y;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   823
        VertexBuffer[1].X:= lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   824
        VertexBuffer[1].Y:= r.y;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   825
        VertexBuffer[2].X:= lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   826
        VertexBuffer[2].Y:= lh;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   827
        VertexBuffer[3].X:= -lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   828
        VertexBuffer[3].Y:= lh;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   829
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   830
{$IFNDEF GL2}
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   831
        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   832
        glEnableClientState(GL_COLOR_ARRAY);
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   833
        if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   834
            glColorPointer(4, GL_UNSIGNED_BYTE, 0, @SDWaterColorArray[0])
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   835
        else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   836
            glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WaterColorArray[0]);
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   837
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   838
        glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
2171
8208946331ba Smaxx refactor of LoadImage to use flags, iphone changes by koda (mostly use of rgba instead of rgb)
nemo
parents: 2162
diff changeset
   839
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   840
        glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   841
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   842
        glDisableClientState(GL_COLOR_ARRAY);
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   843
        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   844
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   845
{$ELSE}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   846
        UpdateModelviewProjection;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   847
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   848
        BeginWater;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   849
        if SuddenDeathDmg then
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   850
            SetColorPointer(@SDWaterColorArray[0], 4)
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   851
        else
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   852
            SetColorPointer(@WaterColorArray[0], 4);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   853
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   854
        SetVertexPointer(@VertexBuffer[0], 4);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   855
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   856
        glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   857
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   858
        EndWater;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   859
{$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   860
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
   861
{$IFNDEF GL2}
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
   862
        // must not be Tint() as color array seems to stay active and color reset is required
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
   863
        glColor4ub($FF, $FF, $FF, $FF);
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
   864
{$ENDIF}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   865
        glEnable(GL_TEXTURE_2D);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   866
    end;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   867
end;
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   868
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
   869
procedure DrawWaves(Dir, dX, dY: LongInt; tnt: Byte);
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   870
var VertexBuffer, TextureBuffer: array [0..3] of TVertex2f;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   871
    lw, waves, shift: GLfloat;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   872
    sprite: TSprite;
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   873
begin
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   874
if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   875
    sprite:= sprSDWater
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   876
else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   877
    sprite:= sprWater;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   878
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   879
cWaveWidth:= SpritesData[sprite].Width;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   880
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
   881
lw:= cScreenWidth / cScaleFactor;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   882
waves:= lw * 2 / cWaveWidth;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   883
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   884
if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   885
    Tint(LongInt(tnt) * SDWaterColorArray[2].r div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   886
         LongInt(tnt) * SDWaterColorArray[2].g div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   887
         LongInt(tnt) * SDWaterColorArray[2].b div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   888
         255
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   889
    )
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   890
else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   891
    Tint(LongInt(tnt) * WaterColorArray[2].r div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   892
         LongInt(tnt) * WaterColorArray[2].g div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   893
         LongInt(tnt) * WaterColorArray[2].b div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   894
         255
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   895
    );
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   896
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   897
glBindTexture(GL_TEXTURE_2D, SpritesData[sprite].Texture^.id);
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   898
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   899
VertexBuffer[0].X:= -lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   900
VertexBuffer[0].Y:= cWaterLine + WorldDy + dY;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   901
VertexBuffer[1].X:= lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   902
VertexBuffer[1].Y:= VertexBuffer[0].Y;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   903
VertexBuffer[2].X:= lw;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   904
VertexBuffer[2].Y:= VertexBuffer[0].Y + SpritesData[sprite].Height;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   905
VertexBuffer[3].X:= -lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   906
VertexBuffer[3].Y:= VertexBuffer[2].Y;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   907
2374
d584bb4b836e Fix water position when zooming
unc0rr
parents: 2373
diff changeset
   908
shift:= - lw / cWaveWidth;
2495
b6b9523e06bf Fix warning
unc0rr
parents: 2447
diff changeset
   909
TextureBuffer[0].X:= shift + (( - WorldDx + LongInt(RealTicks shr 6) * Dir + dX) mod cWaveWidth) / (cWaveWidth - 1);
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   910
TextureBuffer[0].Y:= 0;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   911
TextureBuffer[1].X:= TextureBuffer[0].X + waves;
2447
08d623a494e6 Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents: 2434
diff changeset
   912
TextureBuffer[1].Y:= TextureBuffer[0].Y;
08d623a494e6 Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents: 2434
diff changeset
   913
TextureBuffer[2].X:= TextureBuffer[1].X;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   914
TextureBuffer[2].Y:= SpritesData[sprite].Texture^.ry;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   915
TextureBuffer[3].X:= TextureBuffer[0].X;
2447
08d623a494e6 Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents: 2434
diff changeset
   916
TextureBuffer[3].Y:= TextureBuffer[2].Y;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   917
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   918
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   919
SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   920
SetTexCoordPointer(@TextureBuffer[0], Length(VertexBuffer));
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   921
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   922
{$IFDEF GL2}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   923
UpdateModelviewProjection;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   924
{$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   925
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   926
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   927
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
   928
untint;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   929
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   930
{for i:= -1 to cWaterSprCount do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   931
    DrawSprite(sprWater,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   932
        i * cWaveWidth + ((WorldDx + (RealTicks shr 6) * Dir + dX) mod cWaveWidth) - (cScreenWidth div 2),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   933
        cWaterLine + WorldDy + dY,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   934
        0)}
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   935
end;
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   936
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   937
procedure DrawRepeated(spr, sprL, sprR: TSprite; Shift, OffsetY: LongInt);
3537
8f5b3108f29c New approach to the low-res problem. Basically, we already have a 1024 minimum, and the tallest maps are restricting themselves to 2048 maximum. All backgrounds are scaled down 50%, then scaled up on draw. Saves memory, and backgrounds are already deliberately fuzzed for depth of field anyway.
nemo
parents: 3523
diff changeset
   938
var i, w, h, lw, lh, rw, rh, sw: LongInt;
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   939
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   940
sw:= round(cScreenWidth / cScaleFactor);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   941
if (SpritesData[sprL].Texture = nil) and (SpritesData[spr].Texture <> nil) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   942
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   943
    w:= SpritesData[spr].Width * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   944
    h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   945
    i:= Shift mod w;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   946
    if i > 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   947
        dec(i, w);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   948
    dec(i, w * (sw div w + 1));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   949
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   950
    DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - h, SpritesData[spr].Texture, SpritesData[spr].Texture^.Scale);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   951
    inc(i, w)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   952
    until i > sw
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   953
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   954
else if SpritesData[spr].Texture <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   955
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   956
    w:= SpritesData[spr].Width * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   957
    h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   958
    lw:= SpritesData[sprL].Width * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   959
    lh:= SpritesData[sprL].Height * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   960
    if SpritesData[sprR].Texture <> nil then
5285
af4dc03dd60d Make sky, horizon, flakes and clouds optional, replace repeated strips of skyL/skyR with 2x2 transparent PNGs instead of larger images of variable dimensions, remove a number of empty unused images
nemo
parents: 5191
diff changeset
   961
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   962
        rw:= SpritesData[sprR].Width * SpritesData[spr].Texture^.Scale;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   963
        rh:= SpritesData[sprR].Height * SpritesData[spr].Texture^.Scale
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   964
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   965
    dec(Shift, w div 2);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   966
    DrawTexture(Shift, WorldDy + LAND_HEIGHT + OffsetY - h, SpritesData[spr].Texture, SpritesData[spr].Texture^.Scale);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   967
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   968
    i:= Shift - lw;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   969
    while i >= -sw - lw do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   970
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   971
        DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - lh, SpritesData[sprL].Texture, SpritesData[sprL].Texture^.Scale);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   972
        dec(i, lw);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   973
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   974
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   975
    i:= Shift + w;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   976
    if SpritesData[sprR].Texture <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   977
        while i <= sw do
6135
2172330ad52a Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents: 6131
diff changeset
   978
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   979
            DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - rh, SpritesData[sprR].Texture, SpritesData[sprR].Texture^.Scale);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   980
            inc(i, rw)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   981
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   982
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   983
        while i <= sw do
5285
af4dc03dd60d Make sky, horizon, flakes and clouds optional, replace repeated strips of skyL/skyR with 2x2 transparent PNGs instead of larger images of variable dimensions, remove a number of empty unused images
nemo
parents: 5191
diff changeset
   984
            begin
3537
8f5b3108f29c New approach to the low-res problem. Basically, we already have a 1024 minimum, and the tallest maps are restricting themselves to 2048 maximum. All backgrounds are scaled down 50%, then scaled up on draw. Saves memory, and backgrounds are already deliberately fuzzed for depth of field anyway.
nemo
parents: 3523
diff changeset
   985
            DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - lh, SpritesData[sprL].Texture, SpritesData[sprL].Texture^.Scale);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   986
            inc(i, lw)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   987
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   988
    end
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   989
end;
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   990
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   991
956
19003f7fc174 Get rid of unused Surface parameter
unc0rr
parents: 942
diff changeset
   992
procedure DrawWorld(Lag: LongInt);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   993
begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   994
    if ZoomValue < zoom then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   995
    begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   996
        zoom:= zoom - 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   997
        if ZoomValue > zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   998
            zoom:= ZoomValue
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   999
    end
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
  1000
    else
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
  1001
        if ZoomValue > zoom then
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
  1002
        begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
  1003
        zoom:= zoom + 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
  1004
        if ZoomValue < zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
  1005
            zoom:= ZoomValue
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
  1006
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1007
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1008
        ZoomValue:= zoom;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2375
diff changeset
  1009
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1010
    // Sky
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1011
    glClear(GL_COLOR_BUFFER_BIT);
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1012
    //glPushMatrix;
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1013
    //glScalef(1.0, 1.0, 1.0);
756
2b307457fd68 Respect alpha channel
unc0rr
parents: 755
diff changeset
  1014
9670
1954f692e8c6 Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents: 9666
diff changeset
  1015
    if (not isPaused) and (not isAFK) and (GameType <> gmtRecord) then
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1016
        MoveCamera;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
  1017
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1018
    if cStereoMode = smNone then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1019
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1020
        glClear(GL_COLOR_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1021
        DrawWorldStereo(Lag, rmDefault)
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1022
        end
8138
cfb228baa598 Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents: 7946
diff changeset
  1023
{$IFDEF USE_S3D_RENDERING}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1024
    else if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1025
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1026
        // create left fb
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1027
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framel);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1028
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1029
        DrawWorldStereo(Lag, rmLeftEye);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1030
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1031
        // create right fb
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1032
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framer);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1033
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1034
        DrawWorldStereo(0, rmRightEye);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1035
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1036
        // detatch drawing from fbs
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1037
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, defaultFrame);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1038
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1039
        SetScale(cDefaultZoomLevel);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1040
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1041
        // draw left frame
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1042
        glBindTexture(GL_TEXTURE_2D, texl);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1043
        glBegin(GL_QUADS);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1044
            if cStereoMode = smHorizontal then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1045
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1046
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1047
                glVertex2d(cScreenWidth / -2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1048
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1049
                glVertex2d(0, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1050
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1051
                glVertex2d(0, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1052
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1053
                glVertex2d(cScreenWidth / -2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1054
                end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1055
            else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1056
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1057
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1058
                glVertex2d(cScreenWidth / -2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1059
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1060
                glVertex2d(cScreenWidth / 2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1061
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1062
                glVertex2d(cScreenWidth / 2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1063
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1064
                glVertex2d(cScreenWidth / -2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1065
                end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1066
        glEnd();
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1067
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1068
        // draw right frame
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1069
        glBindTexture(GL_TEXTURE_2D, texr);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1070
        glBegin(GL_QUADS);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1071
            if cStereoMode = smHorizontal then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1072
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1073
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1074
                glVertex2d(0, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1075
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1076
                glVertex2d(cScreenWidth / 2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1077
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1078
                glVertex2d(cScreenWidth / 2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1079
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1080
                glVertex2d(0, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1081
                end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1082
            else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1083
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1084
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1085
                glVertex2d(cScreenWidth / -2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1086
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1087
                glVertex2d(cScreenWidth / 2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1088
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1089
                glVertex2d(cScreenWidth / 2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1090
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1091
                glVertex2d(cScreenWidth / -2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1092
                end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1093
        glEnd();
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1094
        SetScale(zoom);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1095
        end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1096
    else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1097
        begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1098
        // clear scene
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1099
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1100
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1101
        // draw left eye in red channel only
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1102
        if cStereoMode = smGreenRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1103
            glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1104
        else if cStereoMode = smBlueRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1105
            glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1106
        else if cStereoMode = smCyanRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1107
            glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1108
        else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1109
            glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1110
        DrawWorldStereo(Lag, rmLeftEye);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1111
        // draw right eye in selected channel(s) only
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1112
        if cStereoMode = smRedGreen then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1113
            glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1114
        else if cStereoMode = smRedBlue then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1115
            glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1116
        else if cStereoMode = smRedCyan then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1117
            glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1118
        else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1119
            glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1120
        DrawWorldStereo(Lag, rmRightEye);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1121
        end
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1122
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1123
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1124
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1125
procedure ChangeDepth(rm: TRenderMode; d: GLfloat);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1126
begin
8138
cfb228baa598 Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents: 7946
diff changeset
  1127
{$IFNDEF USE_S3D_RENDERING}
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
  1128
    rm:= rm; d:= d; // avoid hint
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1129
    exit;
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1130
{$ELSE}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1131
    d:= d / 5;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1132
    if rm = rmDefault then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1133
        exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1134
    else if rm = rmLeftEye then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1135
        d:= -d;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1136
    stereoDepth:= stereoDepth + d;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1137
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1138
{$IFDEF GL2}
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1139
    hglMatrixMode(MATRIX_PROJECTION);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1140
    hglTranslatef(d, 0, 0);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1141
    hglMatrixMode(MATRIX_MODELVIEW);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1142
{$ELSE}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1143
    glMatrixMode(GL_PROJECTION);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1144
    glTranslatef(d, 0, 0);
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1145
    glMatrixMode(GL_MODELVIEW);
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1146
{$ENDIF}
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1147
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1148
end;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1149
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1150
procedure ResetDepth(rm: TRenderMode);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1151
begin
8138
cfb228baa598 Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents: 7946
diff changeset
  1152
{$IFNDEF USE_S3D_RENDERING}
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
  1153
    rm:= rm; // avoid hint
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1154
    exit;
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1155
{$ELSE}
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1156
    if rm = rmDefault then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1157
        exit;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1158
{$IFDEF GL2}
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1159
    hglMatrixMode(MATRIX_PROJECTION);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1160
    hglTranslatef(-stereoDepth, 0, 0);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1161
    hglMatrixMode(MATRIX_MODELVIEW);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1162
{$ELSE}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1163
    glMatrixMode(GL_PROJECTION);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1164
    glTranslatef(-stereoDepth, 0, 0);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1165
    glMatrixMode(GL_MODELVIEW);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1166
{$ENDIF}
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1167
    cStereoDepth:= 0;
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1168
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1169
end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1170
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1171
procedure RenderWorldEdge(Lag: Longword);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1172
var
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1173
    VertexBuffer: array [0..3] of TVertex2f;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1174
    c1, c2: LongWord; // couple of colours for edges
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1175
begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1176
if WorldEdge <> weNone then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1177
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1178
(* I think for a bounded world, will fill the left and right areas with black or something. Also will probably want various border effects/animations based on border type.  Prob also, say, trigger a border animation timer on an impact. *)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1179
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1180
    glDisable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1181
    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1182
    glEnableClientState(GL_COLOR_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1183
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1184
    glPushMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1185
    glTranslatef(WorldDx, WorldDy, 0);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1186
    glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldFade[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1187
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1188
    VertexBuffer[0].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1189
    VertexBuffer[0].Y:= -3000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1190
    VertexBuffer[1].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1191
    VertexBuffer[1].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1192
    VertexBuffer[2].X:= leftX+30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1193
    VertexBuffer[2].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1194
    VertexBuffer[3].X:= leftX+30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1195
    VertexBuffer[3].Y:= -3000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1196
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1197
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1198
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1199
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1200
    VertexBuffer[0].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1201
    VertexBuffer[1].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1202
    VertexBuffer[2].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1203
    VertexBuffer[3].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1204
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1205
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1206
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1207
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1208
    glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldEnd[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1209
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1210
    VertexBuffer[0].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1211
    VertexBuffer[1].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1212
    VertexBuffer[2].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1213
    VertexBuffer[3].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1214
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1215
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1216
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1217
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1218
    VertexBuffer[0].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1219
    VertexBuffer[1].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1220
    VertexBuffer[2].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1221
    VertexBuffer[3].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1222
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1223
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1224
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1225
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1226
    glPopMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1227
    glDisableClientState(GL_COLOR_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1228
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1229
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1230
    glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1231
    glEnable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1232
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1233
    // I'd still like to have things happen to the border when a wrap or bounce just occurred, based on a timer
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1234
    if WorldEdge = weBounce then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1235
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1236
        // could maybe alternate order of these on a bounce, or maybe drop the outer ones.
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1237
        if LeftImpactTimer mod 2 = 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1238
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1239
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1240
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1241
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1242
            c1:= $FFFFFFFF; c2:= $5454FFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1243
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1244
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 7.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1245
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1246
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 3.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1247
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 1.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1248
        if RightImpactTimer mod 2 = 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1249
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1250
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1251
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1252
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1253
            c1:= $FFFFFFFF; c2:= $5454FFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1254
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1255
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 7.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1256
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1257
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 3.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1258
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 1.0, c2)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1259
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1260
    else if WorldEdge = weWrap then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1261
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1262
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-LeftImpactTimer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1263
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1264
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-RightImpactTimer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1265
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1266
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1267
    else
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1268
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1269
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $2E8B5780);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1270
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $2E8B5780)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1271
        end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1272
    if LeftImpactTimer > Lag then dec(LeftImpactTimer,Lag) else LeftImpactTimer:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1273
    if RightImpactTimer > Lag then dec(RightImpactTimer,Lag) else RightImpactTimer:= 0
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1274
    end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1275
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1276
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1277
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1278
procedure RenderTeamsHealth;
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1279
var t, i, h, smallScreenOffset, TeamHealthBarWidth : LongInt;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1280
    r: TSDL_Rect;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1281
    highlight: boolean;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1282
    htex: PTexture;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1283
begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1284
if TeamsCount * 20 > Longword(cScreenHeight) div 7 then  // take up less screen on small displays
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1285
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1286
    SetScale(1.5);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1287
    smallScreenOffset:= cScreenHeight div 6;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1288
    if TeamsCount * 100 > Longword(cScreenHeight) then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1289
        Tint($FF,$FF,$FF,$80);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1290
    end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1291
else smallScreenOffset:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1292
for t:= 0 to Pred(TeamsCount) do
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1293
    with TeamsArray[t]^ do
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1294
      if TeamHealth > 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1295
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1296
        highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1297
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1298
        if highlight then
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1299
            begin
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1300
            Tint(Clan^.Color shl 8 or $FF);
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1301
            htex:= GenericHealthTexture
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1302
            end
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1303
        else
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1304
            htex:= Clan^.HealthTex;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1305
9791
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1306
        // draw owner
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1307
        if OwnerTex <> nil then
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1308
            DrawTexture(-OwnerTex^.w - NameTagTex^.w - 18, cScreenHeight + DrawHealthY + smallScreenOffset, OwnerTex);
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1309
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1310
        // draw name
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1311
        DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1312
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1313
        // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1314
        DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1315
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1316
        TeamHealthBarWidth:= cTeamHealthWidth * TeamHealthBarHealth div MaxTeamHealth;
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1317
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1318
        // draw health bar
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1319
        r.x:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1320
        r.y:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1321
        r.w:= 2 + TeamHealthBarWidth;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1322
        r.h:= htex^.h;
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1323
        DrawTextureFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1324
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1325
        // draw health bars right border
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1326
        inc(r.x, cTeamHealthWidth + 2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1327
        r.w:= 3;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1328
        DrawTextureFromRect(TeamHealthBarWidth + 15, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1329
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1330
        h:= 0;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1331
        if not hasGone then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1332
            for i:= 0 to cMaxHHIndex do
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1333
                begin
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1334
                inc(h, Hedgehogs[i].HealthBarHealth);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1335
                if (h < TeamHealthBarHealth) and (Hedgehogs[i].HealthBarHealth > 0) then
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1336
                    DrawTexture(15 + h * TeamHealthBarWidth div TeamHealthBarHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture);
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1337
                end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1338
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1339
        // draw ai kill counter for gfAISurvival
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1340
        if (GameFlags and gfAISurvival) <> 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1341
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1342
            DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, AIKillsTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1343
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1344
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1345
        // if highlighted, draw flag and other contents again to keep their colors
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1346
        // this approach should be faster than drawing all borders one by one tinted or not
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1347
        if highlight then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1348
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1349
            if TeamsCount * 100 > Longword(cScreenHeight) then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1350
                Tint($FF,$FF,$FF,$80)
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1351
            else untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1352
9812
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1353
            if OwnerTex <> nil then
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1354
                begin
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1355
                r.x:= 2;
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1356
                r.y:= 2;
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1357
                r.w:= OwnerTex^.w - 4;
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1358
                r.h:= OwnerTex^.h - 4;
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1359
                DrawTextureFromRect(-OwnerTex^.w - NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, OwnerTex)
a293a9ecdc82 redraw ownertex to fix tinting issue
nemo
parents: 9791
diff changeset
  1360
                end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1361
            // draw name
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1362
            r.x:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1363
            r.y:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1364
            r.w:= NameTagTex^.w - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1365
            r.h:= NameTagTex^.h - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1366
            DrawTextureFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1367
            // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1368
            r.w:= 22;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1369
            r.h:= 15;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1370
            DrawTextureFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1371
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1372
        end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1373
if smallScreenOffset <> 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1374
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1375
    SetScale(cDefaultZoomLevel);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1376
    if TeamsCount * 20 > Longword(cScreenHeight) div 5 then
10032
db65298717da This adds idle hog tinting. Active hog tinting still needed.
nemo
parents: 10009
diff changeset
  1377
        untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1378
    end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1379
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1380
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1381
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1382
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1383
var i, t: LongInt;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1384
    r: TSDL_Rect;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1385
    tdx, tdy: Double;
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1386
    s: shortstring;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1387
    offsetX, offsetY, screenBottom: LongInt;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1388
    VertexBuffer: array [0..3] of TVertex2f;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1389
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1390
if (cReducedQuality and rqNoBackground) = 0 then
1812
3d4692e825e7 'Reduce quality' patch by nemo
unc0rr
parents: 1807
diff changeset
  1391
    begin
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1392
        // Offsets relative to camera - spare them to wimpier cpus, no bg or flakes for them anyway
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1393
        ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4371
diff changeset
  1394
        offsetY:= 10 * Min(0, -145 - ScreenBottom);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1395
        SkyOffset:= offsetY div 35 + cWaveHeight;
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1396
        HorizontOffset:= SkyOffset;
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1397
        if ScreenBottom > SkyOffset then
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1398
            HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1399
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1400
        // background
3688
fd8c22a358de add some comments and fix indentation
koda
parents: 3686
diff changeset
  1401
        ChangeDepth(RM, cStereo_Sky);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1402
        if SuddenDeathDmg then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1403
            Tint(SDTint, SDTint, SDTint, $FF);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1404
        DrawRepeated(sprSky, sprSkyL, sprSkyR, (WorldDx + LAND_WIDTH div 2) * 3 div 8, SkyOffset);
3688
fd8c22a358de add some comments and fix indentation
koda
parents: 3686
diff changeset
  1405
        ChangeDepth(RM, -cStereo_Horizon);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1406
        DrawRepeated(sprHorizont, sprHorizontL, sprHorizontR, (WorldDx + LAND_WIDTH div 2) * 3 div 5, HorizontOffset);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1407
        if SuddenDeathDmg then
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1408
            untint;
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1409
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1410
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1411
DrawVisualGears(0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1412
ChangeDepth(RM, -cStereo_MidDistance);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1413
DrawVisualGears(4);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1414
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1415
if (cReducedQuality and rq2DWater) = 0 then
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1416
    begin
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1417
        // Waves
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1418
        DrawWater(255, SkyOffset);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1419
        ChangeDepth(RM, -cStereo_Water_distant);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1420
        DrawWaves( 1,  0 - WorldDx div 32, - cWaveHeight + offsetY div 35, 64);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1421
        ChangeDepth(RM, -cStereo_Water_distant);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1422
        DrawWaves( -1,  25 + WorldDx div 25, - cWaveHeight + offsetY div 38, 48);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1423
        ChangeDepth(RM, -cStereo_Water_distant);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1424
        DrawWaves( 1,  75 - WorldDx div 19, - cWaveHeight + offsetY div 45, 32);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1425
        ChangeDepth(RM, -cStereo_Water_distant);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1426
        DrawWaves(-1, 100 + WorldDx div 14, - cWaveHeight + offsetY div 70, 24);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1427
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1428
else
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1429
        DrawWaves(-1, 100, - (cWaveHeight + (cWaveHeight shr 1)), 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1430
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1431
    changeDepth(RM, cStereo_Land);
6302
db8bdbb34e03 Spread flakes out over 5 layers now (far back, mid distance, just behind land, just in front of lands and hog, near distance). Spread clouds out over 3 layers (far back, mid distance, just behind land). Add a flatten clouds option, use
nemo
parents: 6296
diff changeset
  1432
    DrawVisualGears(5);
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1433
    DrawLand(WorldDx, WorldDy);
1911
6283bd8a960b use glVertexPointer to render water
unc0rr
parents: 1906
diff changeset
  1434
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1435
    DrawWater(255, 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1436
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1437
(*
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1438
// Attack bar
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1439
    if CurrentTeam <> nil then
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1440
        case AttackBar of
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1441
        //1: begin
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1442
        //r:= StuffPoz[sPowerBar];
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1443
        //{$WARNINGS OFF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1444
        //r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1445
        //{$WARNINGS ON}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1446
        //DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1447
        //end;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1448
        2: with CurrentHedgehog^ do
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1449
                begin
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1450
                tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1451
                tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1452
                for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1453
                    DrawSprite(sprPower,
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1454
                            hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16,
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1455
                            hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16,
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1456
                            i)
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1457
                end
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1458
        end;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1459
*)
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1460
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1461
DrawVisualGears(1);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1462
DrawGears;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1463
DrawVisualGears(6);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1464
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1465
if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1466
    DrawWater(SDWaterOpacity, 0)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1467
else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1468
    DrawWater(WaterOpacity, 0);
2269
00f5704f5f39 add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents: 2268
diff changeset
  1469
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1470
    // Waves
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1471
ChangeDepth(RM, cStereo_Water_near);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1472
DrawWaves( 1, 25 - WorldDx div 9, - cWaveHeight, 12);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1473
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1474
if (cReducedQuality and rq2DWater) = 0 then
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1475
    begin
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1476
    //DrawWater(WaterOpacity, - offsetY div 40);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1477
    ChangeDepth(RM, cStereo_Water_near);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1478
    DrawWaves(-1, 50 + WorldDx div 6, - cWaveHeight - offsetY div 40, 8);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1479
    if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1480
        DrawWater(SDWaterOpacity, - offsetY div 20)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1481
    else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1482
        DrawWater(WaterOpacity, - offsetY div 20);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1483
    ChangeDepth(RM, cStereo_Water_near);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1484
    DrawWaves( 1, 75 - WorldDx div 4, - cWaveHeight - offsetY div 20, 2);
4792
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4748
diff changeset
  1485
        if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1486
            DrawWater(SDWaterOpacity, - offsetY div 10)
4792
68f9b331014a sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents: 4748
diff changeset
  1487
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1488
            DrawWater(WaterOpacity, - offsetY div 10);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1489
        ChangeDepth(RM, cStereo_Water_near);
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
  1490
        DrawWaves( -1, 25 + WorldDx div 3, - cWaveHeight - offsetY div 10, 0);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1491
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1492
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1493
        DrawWaves(-1, 50, - (cWaveHeight shr 1), 0);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1494
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1495
// everything after this ChangeDepth will be drawn outside the screen
4818
202eef454354 rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents: 4816
diff changeset
  1496
// note: negative parallax gears should last very little for a smooth stereo effect
202eef454354 rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents: 4816
diff changeset
  1497
    ChangeDepth(RM, cStereo_Outside);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1498
    DrawVisualGears(2);
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1499
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1500
// everything after this ResetDepth will be drawn at screen level (depth = 0)
4818
202eef454354 rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents: 4816
diff changeset
  1501
// note: everything that needs to be readable should be on this level
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1502
    ResetDepth(RM);
4818
202eef454354 rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents: 4816
diff changeset
  1503
    DrawVisualGears(3);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1504
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
  1505
{$WARNINGS OFF}
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1506
// Target
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1507
if (TargetPoint.X <> NoPointX) and (CurrentTeam <> nil) and (CurrentHedgehog <> nil) then
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1508
    begin
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1509
    with PHedgehog(CurrentHedgehog)^ do
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1510
        begin
5372
7283bc768228 Change bee pos sprite, make aiming napalm a little easier, adjust napalm flames to be more centred on the target
nemo
parents: 5302
diff changeset
  1511
        if CurAmmoType = amBee then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1512
            DrawSpriteRotatedF(sprTargetBee, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
3110
c8d7c852e26a Engine:
smxx
parents: 3107
diff changeset
  1513
        else
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1514
            DrawSpriteRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
5372
7283bc768228 Change bee pos sprite, make aiming napalm a little easier, adjust napalm flames to be more centred on the target
nemo
parents: 5302
diff changeset
  1515
        end
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1516
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1517
{$WARNINGS ON}
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1518
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1519
RenderWorldEdge(Lag);
9473
a51a69094c24 partial implementation of non-infinite world (edge wrap/warp/bounce)
nemo
parents: 9377
diff changeset
  1520
3523
6592fbb969da fix zoom smoothness
koda
parents: 3513
diff changeset
  1521
// this scale is used to keep the various widgets at the same dimension at all zoom levels
6592fbb969da fix zoom smoothness
koda
parents: 3513
diff changeset
  1522
SetScale(cDefaultZoomLevel);
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1523
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1524
// Turn time
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1525
if UIDisplay <> uiNone then
3774
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1526
    begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1527
{$IFDEF USE_TOUCH_INTERFACE}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1528
    offsetX:= cScreenHeight - 13;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1529
{$ELSE}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1530
    offsetX:= 48;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1531
{$ENDIF}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1532
    offsetY:= cOffsetY;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1533
    if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 1000000)) or (ReadyTimeLeft <> 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1534
        begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1535
        if ReadyTimeLeft <> 0 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1536
            i:= Succ(Pred(ReadyTimeLeft) div 1000)
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1537
        else
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1538
            i:= Succ(Pred(TurnTimeLeft) div 1000);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1539
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1540
        if i>99 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1541
            t:= 112
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1542
        else if i>9 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1543
            t:= 96
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1544
        else
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1545
            t:= 80;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1546
        DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1547
        while i > 0 do
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1548
            begin
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1549
            dec(t, 32);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1550
            DrawSprite(sprBigDigit, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1551
            i:= i div 10
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1552
            end;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1553
        DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1554
        end;
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1555
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1556
// Captions
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1557
    DrawCaptions
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1558
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1559
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
  1560
{$IFDEF USE_TOUCH_INTERFACE}
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5824
diff changeset
  1561
// Draw buttons Related to the Touch interface
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1562
DrawScreenWidget(@arrowLeft);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1563
DrawScreenWidget(@arrowRight);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1564
DrawScreenWidget(@arrowUp);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1565
DrawScreenWidget(@arrowDown);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1566
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1567
DrawScreenWidget(@fireButton);
6714
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
  1568
DrawScreenWidget(@jumpWidget);
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
  1569
DrawScreenWidget(@AMWidget);
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1570
DrawScreenWidget(@pauseButton);
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
  1571
DrawScreenWidget(@utilityWidget);
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  1572
{$ENDIF}
6601
5965e2927b3d fixed the ammo menu on android, on tablets all weapons are 'choosable' and on phones I've moved the ammomenu up a bit
Xeli
parents: 6580
diff changeset
  1573
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1574
if UIDisplay = uiAll then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1575
    RenderTeamsHealth;
47
8daf1ee0b9a3 Show team health bars, without sorting yet
unc0rr
parents: 39
diff changeset
  1576
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1577
// Lag alert
7392
bc3306c59a08 Correctly distinguish between game and real ticks while recording video,
Stepan777 <stepik-777@mail.ru>
parents: 7386
diff changeset
  1578
if isInLag then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1579
    DrawSprite(sprLag, 32 - (cScreenWidth shr 1), 32, (RealTicks shr 7) mod 12);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1580
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1581
// Wind bar
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1582
if UIDisplay <> uiNone then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1583
    begin
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1584
{$IFDEF USE_TOUCH_INTERFACE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1585
    offsetX:= cScreenHeight - 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1586
    offsetY:= (cScreenWidth shr 1) + 74;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1587
{$ELSE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1588
    offsetX:= 30;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1589
    offsetY:= 180;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1590
{$ENDIF}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1591
    DrawSprite(sprWindBar, (cScreenWidth shr 1) - offsetY, cScreenHeight - offsetX, 0);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1592
    if WindBarWidth > 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1593
        begin
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1594
        {$WARNINGS OFF}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1595
        r.x:= 8 - (RealTicks shr 6) mod 8;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1596
        {$WARNINGS ON}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1597
        r.y:= 0;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1598
        r.w:= WindBarWidth;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1599
        r.h:= 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1600
        DrawSpriteFromRect(sprWindR, r, (cScreenWidth shr 1) - offsetY + 77, cScreenHeight - offsetX + 2, 13, 0);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1601
        end
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1602
    else
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1603
        if WindBarWidth < 0 then
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1604
        begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1605
        {$WARNINGS OFF}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1606
        r.x:= (Longword(WindBarWidth) + RealTicks shr 6) mod 8;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1607
        {$WARNINGS ON}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1608
        r.y:= 0;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1609
        r.w:= - WindBarWidth;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1610
        r.h:= 13;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1611
        DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1612
        end
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1613
    end;
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1614
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1615
// AmmoMenu
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1616
if bShowAmmoMenu and ((AMState = AMHidden) or (AMState = AMHiding)) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1617
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1618
    if (AMState = AMHidden) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1619
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1620
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1621
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1622
    AMState:= AMShowingUp;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1623
    end;
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  1624
if (not bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1625
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1626
    if (AMState = AMShowing) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1627
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1628
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1629
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1630
    AMState:= AMHiding;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1631
    end;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1632
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1633
if bShowAmmoMenu or (AMState = AMHiding) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1634
    ShowAmmoMenu;
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1635
2287
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1636
// Cursor
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1637
if isCursorVisible and bShowAmmoMenu then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1638
    DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
942
b41af014d85e Stub for chat implementation
unc0rr
parents: 883
diff changeset
  1639
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1640
// Chat
2287
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1641
DrawChat;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1642
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1643
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4901
diff changeset
  1644
// various captions
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1645
if fastUntilLag then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1646
    DrawTextureCentered(0, (cScreenHeight shr 1), SyncTexture);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1647
if isPaused then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1648
    DrawTextureCentered(0, (cScreenHeight shr 1), PauseTexture);
9670
1954f692e8c6 Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents: 9666
diff changeset
  1649
if isAFK then
1954f692e8c6 Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents: 9666
diff changeset
  1650
    DrawTextureCentered(0, (cScreenHeight shr 1), AFKTexture);
3774
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1651
if not isFirstFrame and (missionTimer <> 0) or isPaused or fastUntilLag or (GameState = gsConfirm) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1652
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1653
    if (ReadyTimeLeft = 0) and (missionTimer > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1654
        dec(missionTimer, Lag);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1655
    if missionTimer < 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1656
        missionTimer:= 0; // avoid subtracting below 0
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1657
    if missionTex <> nil then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1658
        DrawTextureCentered(0, Min((cScreenHeight shr 1) + 100, cScreenHeight - 48 - missionTex^.h), missionTex);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1659
    end;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1660
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1661
// fps
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1662
{$IFDEF USE_TOUCH_INTERFACE}
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  1663
offsetX:= pauseButton.frame.y + pauseButton.frame.h + 12;
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1664
{$ELSE}
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
  1665
offsetX:= 10;
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1666
{$ENDIF}
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
  1667
offsetY:= cOffsetY;
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1668
if (RM = rmDefault) or (RM = rmRightEye) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1669
    begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1670
    inc(Frames);
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1671
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1672
    if cShowFPS or (GameType = gmtDemo) then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1673
        inc(CountTicks, Lag);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1674
    if (GameType = gmtDemo) and (CountTicks >= 1000) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1675
        begin
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1676
        i:= GameTicks div 1000;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1677
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1678
        s:= inttostr(t);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1679
        if t < 10 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1680
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1681
        i:= i div 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1682
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1683
        s:= inttostr(t) + ':' + s;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1684
        if t < 10 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1685
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1686
        s:= inttostr(i div 60) + ':' + s;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1687
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1688
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1689
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1690
        tmpSurface:= doSurfaceConversion(tmpSurface);
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1691
        FreeTexture(timeTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1692
        timeTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1693
        SDL_FreeSurface(tmpSurface)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1694
        end;
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1695
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1696
    if timeTexture <> nil then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1697
        DrawTexture((cScreenWidth shr 1) - 20 - timeTexture^.w - offsetY, offsetX + timeTexture^.h+5, timeTexture);
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1698
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1699
    if cShowFPS then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1700
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1701
        if CountTicks >= 1000 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1702
            begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1703
            FPS:= Frames;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1704
            Frames:= 0;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1705
            CountTicks:= 0;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1706
            s:= inttostr(FPS) + ' fps';
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1707
            tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1708
            tmpSurface:= doSurfaceConversion(tmpSurface);
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1709
            FreeTexture(fpsTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1710
            fpsTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1711
            SDL_FreeSurface(tmpSurface)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1712
            end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1713
        if fpsTexture <> nil then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1714
            DrawTexture((cScreenWidth shr 1) - 60 - offsetY, offsetX, fpsTexture);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1715
        end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1716
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1717
756
2b307457fd68 Respect alpha channel
unc0rr
parents: 755
diff changeset
  1718
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1719
if GameState = gsConfirm then
8675
3fb25201d303 This has bothered me for the longest time. Move texture so it doesn't overlap. I'd initially had a test for isPaused, but jumping texture bothered me.
nemo
parents: 8471
diff changeset
  1720
    DrawTextureCentered(0, (cScreenHeight shr 1)-40, ConfirmTexture);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1721
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1722
if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1723
    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  1724
    if (not isFirstFrame) then
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1725
        case ScreenFade of
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1726
            sfToBlack, sfToWhite:     if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1727
                                          inc(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1728
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1729
                                          ScreenFadeValue:= sfMax;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1730
            sfFromBlack, sfFromWhite: if ScreenFadeValue - Lag * ScreenFadeSpeed > 0 then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1731
                                          dec(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1732
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1733
                                          ScreenFadeValue:= 0;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1734
            end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1735
    if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1736
        begin
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1737
        case ScreenFade of
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1738
            sfToBlack, sfFromBlack: Tint(0, 0, 0, ScreenFadeValue * 255 div 1000);
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1739
            sfToWhite, sfFromWhite: Tint($FF, $FF, $FF, ScreenFadeValue * 255 div 1000);
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1740
            end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1741
3113
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1742
        VertexBuffer[0].X:= -cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1743
        VertexBuffer[0].Y:= cScreenHeight;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1744
        VertexBuffer[1].X:= -cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1745
        VertexBuffer[1].Y:= 0;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1746
        VertexBuffer[2].X:= cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1747
        VertexBuffer[2].Y:= 0;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1748
        VertexBuffer[3].X:= cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1749
        VertexBuffer[3].Y:= cScreenHeight;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1750
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1751
        glDisable(GL_TEXTURE_2D);
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
  1752
3113
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1753
        glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1754
        glDrawArrays(GL_TRIANGLE_FAN, 0, High(VertexBuffer) - Low(VertexBuffer) + 1);
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
  1755
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1756
        glEnable(GL_TEXTURE_2D);
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1757
        untint;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1758
        if not isFirstFrame and ((ScreenFadeValue = 0) or (ScreenFadeValue = sfMax)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1759
            ScreenFade:= sfNone
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1760
        end
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1761
    end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1762
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1763
{$IFDEF USE_VIDEO_RECORDING}
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1764
// during video prerecording draw red blinking circle and text 'rec'
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1765
if flagPrerecording then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1766
    begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1767
    if recTexture = nil then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1768
        begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1769
        s:= 'rec';
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1770
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fntBig].Handle, Str2PChar(s), cWhiteColorChannels);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1771
        tmpSurface:= doSurfaceConversion(tmpSurface);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1772
        FreeTexture(recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1773
        recTexture:= Surface2Tex(tmpSurface, false);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1774
        SDL_FreeSurface(tmpSurface)
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1775
        end;
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1776
    DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1777
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1778
    // draw red circle
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1779
    glDisable(GL_TEXTURE_2D);
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1780
    Tint($FF, $00, $00, Byte(Round(127*(1 + sin(SDL_GetTicks()*0.007)))));
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1781
    glBegin(GL_POLYGON);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1782
    for i:= 0 to 20 do
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1783
        glVertex2f(-(cScreenWidth shr 1) + 30 + sin(i*2*Pi/20)*10, 35 + cos(i*2*Pi/20)*10);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1784
    glEnd();
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1785
    untint;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1786
    glEnable(GL_TEXTURE_2D);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1787
    end;
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1788
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1789
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1790
SetScale(zoom);
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1791
7858
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1792
// Attack bar
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1793
    if CurrentTeam <> nil then
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1794
        case AttackBar of
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1795
(*        1: begin
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1796
        r:= StuffPoz[sPowerBar];
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1797
        {$WARNINGS OFF}
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1798
        r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1799
        {$WARNINGS ON}
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1800
        DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1801
        end;*)
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1802
        2: with CurrentHedgehog^ do
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1803
                begin
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1804
                tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1805
                tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1806
                for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1807
                    DrawSprite(sprPower,
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1808
                            hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16,
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1809
                            hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16,
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1810
                            i)
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1811
                end
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1812
        end;
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1813
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1814
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1815
// Cursor
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1816
if isCursorVisible then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1817
    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  1818
    if (not bShowAmmoMenu) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1819
        begin
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1820
        if not CurrentTeam^.ExtDriven then TargetCursorPoint:= CursorPoint;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1821
        with CurrentHedgehog^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1822
            if (Gear <> nil) and ((Gear^.State and gstHHChooseTarget) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1823
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1824
            if (CurAmmoType = amNapalm) or (CurAmmoType = amMineStrike) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1825
                DrawLine(-3000, topY-300, 7000, topY-300, 3.0, (Team^.Clan^.Color shr 16), (Team^.Clan^.Color shr 8) and $FF, Team^.Clan^.Color and $FF, $FF);
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6918
diff changeset
  1826
            i:= GetCurAmmoEntry(CurrentHedgehog^)^.Pos;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1827
            with Ammoz[CurAmmoType] do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1828
                if PosCount > 1 then
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1829
                    DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1830
                end;
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1831
        DrawSprite(sprArrow, TargetCursorPoint.X, cScreenHeight - TargetCursorPoint.Y, (RealTicks shr 6) mod 8)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1832
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1833
    end;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1834
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1835
isFirstFrame:= false
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1836
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1837
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1838
var PrevSentPointTime: LongWord = 0;
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1839
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1840
procedure MoveCamera;
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1841
var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY: LongInt;
9755
6306b54dd8fc don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
sheepluva
parents: 9720
diff changeset
  1842
    inbtwnTrgtAttks: Boolean;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1843
begin
5502
0d1a1aeed00a changed iphone specific ifdefs to mobile
Xeli
parents: 5495
diff changeset
  1844
{$IFNDEF MOBILE}
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1845
if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
  1846
    uCursor.updatePosition();
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3537
diff changeset
  1847
{$ENDIF}
5852
nemo
parents: 5851
diff changeset
  1848
z:= round(200/zoom);
9755
6306b54dd8fc don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
sheepluva
parents: 9720
diff changeset
  1849
inbtwnTrgtAttks := (CurrentHedgehog <> nil) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0) and ((GameFlags and gfInfAttack) <> 0);
9954
bf51bc7e2808 - Fix build via pas2c
unc0rr
parents: 9952
diff changeset
  1850
if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then
7187
aff30d80bd7b - Allow camera movement while current hedgehog is falling
unc0rr
parents: 7167
diff changeset
  1851
    if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1852
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1853
        FollowGear:= nil;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1854
        prevPoint:= CursorPoint;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1855
        exit
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1856
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1857
    else
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1858
        begin
5852
nemo
parents: 5851
diff changeset
  1859
        CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
6098
959219241c67 tweak Y movement
nemo
parents: 6016
diff changeset
  1860
        if isPhone() or (cScreenHeight < 600) or ((hwSign(FollowGear^.dY) * z) < 10)  then
6016
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1861
            CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1862
        else
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1863
            CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1864
        end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1865
2375
99f05a01a6a3 Don't allow to look too deep
unc0rr
parents: 2374
diff changeset
  1866
wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1867
if WorldDy < wdy then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1868
    WorldDy:= wdy;
2375
99f05a01a6a3 Don't allow to look too deep
unc0rr
parents: 2374
diff changeset
  1869
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1870
if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1871
    exit;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1872
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
  1873
if (AMState = AMShowingUp) or (AMState = AMShowing) then
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1874
begin
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1875
{$IFDEF USE_LANDSCAPE_AMMOMENU}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1876
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1877
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1878
    amNumOffsetY:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1879
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1880
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1881
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1882
{$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1883
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1884
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1885
    amNumOffsetX:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1886
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1887
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1888
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1889
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1890
{$ENDIF}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1891
    if CursorPoint.X < AmmoRect.x + amNumOffsetX + 3 then//check left
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1892
        CursorPoint.X:= AmmoRect.x + amNumOffsetX + 3;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1893
    if CursorPoint.X > AmmoRect.x + AmmoRect.w - 3 then//check right
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1894
        CursorPoint.X:= AmmoRect.x + AmmoRect.w - 3;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1895
    if CursorPoint.Y > cScreenHeight - AmmoRect.y -amNumOffsetY - 1 then//check top
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1896
        CursorPoint.Y:= cScreenHeight - AmmoRect.y - amNumOffsetY - 1;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1897
    if CursorPoint.Y < cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5) then//check bottom
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1898
        CursorPoint.Y:= cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1899
    prevPoint:= CursorPoint;
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
  1900
    //if cHasFocus then SDL_WarpMouse(CursorPoint.X + cScreenWidth div 2, cScreenHeight - CursorPoint.Y);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1901
    exit
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1902
end;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
  1903
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1904
if isCursorVisible then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1905
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1906
    if (not CurrentTeam^.ExtDriven) and (GameTicks >= PrevSentPointTime + cSendCursorPosTime) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1907
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1908
        SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1909
        PrevSentPointTime:= GameTicks
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1910
        end;
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1911
    EdgesDist:= cCursorEdgesDist
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1912
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1913
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1914
    EdgesDist:= cGearScrEdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1915
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1916
// this generates the border around the screen that moves the camera when cursor is near it
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1917
if (CurrentTeam^.ExtDriven and isCursorVisible and autoCameraOn) or
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1918
   (not CurrentTeam^.ExtDriven and isCursorVisible) or ((FollowGear <> nil) and autoCameraOn) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1919
    begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1920
    if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1921
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1922
        WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1923
        CursorPoint.X:= - cScreenWidth div 2 + EdgesDist
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1924
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1925
    else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1926
        if CursorPoint.X > cScreenWidth div 2 - EdgesDist then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1927
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1928
            WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1929
            CursorPoint.X:= cScreenWidth div 2 - EdgesDist
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1930
            end;
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1931
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  1932
    shs:= min(cScreenHeight div 2 - trunc(cScreenHeight / cScaleFactor) + EdgesDist, cScreenHeight - EdgesDist);
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1933
    if CursorPoint.Y < shs then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1934
        begin
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1935
        WorldDy:= WorldDy + CursorPoint.Y - shs;
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1936
        CursorPoint.Y:= shs;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1937
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1938
    else
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  1939
        if (CursorPoint.Y > cScreenHeight - EdgesDist) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1940
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1941
           WorldDy:= WorldDy + CursorPoint.Y - cScreenHeight + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1942
           CursorPoint.Y:= cScreenHeight - EdgesDist
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1943
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1944
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1945
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1946
    if cHasFocus then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1947
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1948
        WorldDx:= WorldDx - CursorPoint.X + prevPoint.X;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1949
        WorldDy:= WorldDy + CursorPoint.Y - prevPoint.Y;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1950
        CursorPoint.X:= 0;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1951
        CursorPoint.Y:= cScreenHeight div 2;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1952
        end;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 308
diff changeset
  1953
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1954
// this moves the camera according to CursorPoint X and Y
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1955
prevPoint:= CursorPoint;
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
  1956
//if cHasFocus then SDL_WarpMouse(CursorPoint.X + (cScreenWidth shr 1), cScreenHeight - CursorPoint.Y);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1957
if WorldDy > LAND_HEIGHT + 1024 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1958
    WorldDy:= LAND_HEIGHT + 1024;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1959
if WorldDy < wdy then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1960
    WorldDy:= wdy;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1961
if WorldDx < - LAND_WIDTH - 1024 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1962
    WorldDx:= - LAND_WIDTH - 1024;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1963
if WorldDx > 1024 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1964
    WorldDx:= 1024;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1965
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1966
10009
88929358d2e1 Convert some ansistrings to pchars
unc0rr
parents: 9998
diff changeset
  1967
procedure ShowMission(caption, subcaption, mtext: PChar; icon, time : LongInt);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1968
var r: TSDL_Rect;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1969
begin
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1970
r.w:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1971
r.h:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1972
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1973
if time = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1974
    time:= 5000;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1975
missionTimer:= time;
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1976
FreeTexture(missionTex);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1977
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1978
if icon > -1 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1979
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1980
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1981
    r.y:= icon * 32;
10009
88929358d2e1 Convert some ansistrings to pchars
unc0rr
parents: 9998
diff changeset
  1982
    missionTex:= RenderHelpWindow(caption, subcaption, mtext, '', 0, MissionIcons, @r)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1983
    end
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1984
else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1985
    begin
4626
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  1986
    r.x:= ((-icon - 1) shr 4) * 32;
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  1987
    r.y:= ((-icon - 1) mod 16) * 32;
10009
88929358d2e1 Convert some ansistrings to pchars
unc0rr
parents: 9998
diff changeset
  1988
    missionTex:= RenderHelpWindow(caption, subcaption, mtext, '', 0, SpritesData[sprAMAmmos].Surface, @r)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1989
    end;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1990
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1991
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1992
procedure HideMission;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1993
begin
3045
41732f986b4f Clean Augean stables
unc0rr
parents: 3038
diff changeset
  1994
    missionTimer:= 0;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1995
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1996
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
  1997
procedure ShakeCamera(amount: LongInt);
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  1998
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1999
if isCursorVisible then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2000
    exit;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2001
amount:= Max(1, round(amount*zoom/2));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2002
WorldDx:= WorldDx - amount + LongInt(random(1 + amount * 2));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2003
WorldDy:= WorldDy - amount + LongInt(random(1 + amount * 2));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2004
//CursorPoint.X:= CursorPoint.X - amount + LongInt(random(1 + amount * 2));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2005
//CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2))
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  2006
end;
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  2007
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2008
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2009
procedure onFocusStateChanged;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2010
begin
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2011
if (not cHasFocus) and (GameState <> gsConfirm) then
5523
9ac5acc4f3e5 Also unhide mouse cursor when in gsConfirm state
unc0rr
parents: 5522
diff changeset
  2012
    ParseCommand('quit', true);
7847
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2013
{$IFDEF MOBILE}
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2014
// when created SDL receives an exposure event that calls UndampenAudio at full power, muting audio
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2015
exit;
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2016
{$ENDIF}
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6806
diff changeset
  2017
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  2018
{$IFDEF USE_VIDEO_RECORDING}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2019
// do not change volume during prerecording as it will affect sound in video file
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  2020
if (not flagPrerecording) then
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  2021
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2022
    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  2023
    if (not cHasFocus) then DampenAudio()
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2024
    else UndampenAudio();
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2025
    end;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2026
end;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2027
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2028
procedure SetUtilityWidgetState(ammoType: TAmmoType);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2029
begin
7086
e99944b25764 android typo/sabotage
Xeli
parents: 7069
diff changeset
  2030
{$IFDEF USE_TOUCH_INTERFACE}
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2031
if(ammoType = amNothing)then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2032
    ammoType:= CurrentHedgehog^.CurAmmoType;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2033
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2034
if(CurrentHedgehog <> nil)then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2035
    if (Ammoz[ammoType].Ammo.Propz and ammoprop_Timerable) <> 0 then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2036
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2037
        utilityWidget.sprite:= sprTimerButton;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2038
        animateWidget(@utilityWidget, true, true);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  2039
        end
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2040
    else if (Ammoz[ammoType].Ammo.Propz and ammoprop_NeedTarget) <> 0 then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2041
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2042
        utilityWidget.sprite:= sprTargetButton;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2043
        animateWidget(@utilityWidget, true, true);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2044
        end
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2045
    else if ammoType = amSwitch then
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2046
        begin
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2047
        utilityWidget.sprite:= sprTargetButton;
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2048
        animateWidget(@utilityWidget, true, true);
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2049
        end
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2050
    else if utilityWidget.show then
6992
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2051
        animateWidget(@utilityWidget, true, false);
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2052
{$ELSE}
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2053
ammoType:= ammoType; // avoid hint
6963
Xeli
parents: 6962
diff changeset
  2054
{$ENDIF}
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2055
end;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2056
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2057
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2058
begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2059
with widget^ do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2060
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2061
    show:= showWidget;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2062
    if fade then fadeAnimStart:= RealTicks;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  2063
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2064
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2065
        begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2066
        animate:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2067
        startTime:= RealTicks;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2068
        source.x:= source.x xor target.x; //swap source <-> target
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2069
        target.x:= source.x xor target.x;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2070
        source.x:= source.x xor target.x;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2071
        source.y:= source.y xor target.y;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2072
        target.y:= source.y xor target.y;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2073
        source.y:= source.y xor target.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2074
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2075
    end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2076
end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2077
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2078
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  2079
procedure initModule;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  2080
begin
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2081
    fpsTexture:= nil;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2082
    recTexture:= nil;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2083
    FollowGear:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2084
    WindBarWidth:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2085
    bShowAmmoMenu:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2086
    bSelected:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2087
    bShowFinger:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2088
    Frames:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2089
    WorldDx:= -512;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2090
    WorldDy:= -256;
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  2091
    PrevSentPointTime:= 0;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  2092
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2093
    FPS:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2094
    CountTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2095
    SoundTimerTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2096
    prevPoint.X:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2097
    prevPoint.Y:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2098
    missionTimer:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2099
    missionTex:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2100
    cOffsetY:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2101
    stereoDepth:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2102
    AMState:= AMHidden;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2103
    isFirstFrame:= true;
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7847
diff changeset
  2104
    stereoDepth:= stereoDepth; // avoid hint
9557
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2105
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2106
    FillChar(WorldFade, sizeof(WorldFade), 0);
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2107
    WorldFade[0].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2108
    WorldFade[1].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2109
    FillChar(WorldEnd, sizeof(WorldEnd), 0);
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2110
    WorldEnd[0].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2111
    WorldEnd[1].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2112
    WorldEnd[2].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2113
    WorldEnd[3].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2114
9983
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
  2115
    AmmoMenuTex:= nil;
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
  2116
    AmmoMenuInvalidated:= true
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  2117
end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2118
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  2119
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2120
begin
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7847
diff changeset
  2121
    ResetWorldTex();
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2122
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2123
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2124
end.