hedgewars/uWorld.pas
author koda
Sun, 11 Nov 2012 17:15:19 +0100
branchwebgl
changeset 8026 4a4f21070479
parent 7946 a99a79bbd857
child 8099 a7f02b902b6f
permissions -rw-r--r--
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
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
6700
e04da46ee43c the most important commit of the year
koda
parents: 6695
diff changeset
     3
 * Copyright (c) 2004-2012 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);
2905
f3c79f7193a9 Engine:
smxx
parents: 2904
diff changeset
    34
procedure ShowMission(caption, subcaption, text: ansistring; 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
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    63
    , uMobile
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    64
{$IFDEF USE_VIDEO_RECORDING}    
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    65
    , uVideoRec
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
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;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    81
    SoundTimerTicks: Longword;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    82
    prevPoint: TPoint;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    83
    amSel: TAmmoType = amNothing;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    84
    missionTex: PTexture;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    85
    missionTimer: LongInt;
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
    86
    stereoDepth: GLfloat;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
    87
    isFirstFrame: boolean;
7028
0f60591f3a16 old typed const moved to their proper unit
koda
parents: 7027
diff changeset
    88
    AMAnimType: LongInt;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
    89
    recTexture: PTexture;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
    90
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    91
const cStereo_Sky           = 0.0500;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    92
      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
    93
      cStereo_MidDistance   = 0.0175;
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    94
      cStereo_Water_distant = 0.0125;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    95
      cStereo_Land          = 0.0075;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    96
      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
    97
      cStereo_Outside       = -0.0400;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    98
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
    99
// helper functions to create the goal/game mode string
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   100
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   101
var t: ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   102
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   103
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   104
        begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   105
        t:= inttostr(i);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7049
diff changeset
   106
        s:= s + FormatA(trgoal[si], t) + '|'
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   107
        end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   108
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   109
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   110
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   111
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   112
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   113
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   114
        s:= s + trgoal[si] + '|';
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   115
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   116
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   117
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   118
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
   119
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
   120
    cp: PClan;
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   121
    g: ansistring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   122
begin
3764
eb91c02f2d84 Engine:
smaxx
parents: 3697
diff changeset
   123
missionTimer:= 0;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
   124
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
   125
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
   126
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   127
    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
   128
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   129
        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
   130
        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
   131
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   132
            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
   133
            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
   134
            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
   135
            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
   136
            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
   137
            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
   138
                LocalClan:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   139
            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
   140
                LocalClan:= t
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   141
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   142
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   143
    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
   144
    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
   145
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   146
// 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
   147
g:= ''; // no text/things to note yet
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   148
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   149
// 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
   150
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
   151
    g:= LuaGoals + '|';
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   152
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   153
// check different game flags (goals/game modes first for now)
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   154
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
   155
g:= AddGoal(g, gfTagTeam, gidTagTeam); // tag team mode?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   156
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   157
// other important flags
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   158
g:= AddGoal(g, gfForts, gidForts); // forts?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   159
g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   160
g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   161
g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   162
g:= AddGoal(g, gfKarma, gidKarma); // karma?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   163
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   164
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   165
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   166
g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
4132
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   167
g:= AddGoal(g, gfResetHealth, gidResetHealth);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   168
g:= AddGoal(g, gfAISurvival, gidAISurvival);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   169
g:= AddGoal(g, gfInfAttack, gidInfAttack);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   170
g:= AddGoal(g, gfResetWeps, gidResetWeps);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   171
g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   172
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   173
// modified damage modificator?
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   174
if cDamagePercent <> 100 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   175
    g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   176
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   177
// fade in
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   178
ScreenFade:= sfFromBlack;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   179
ScreenFadeValue:= sfMax;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   180
ScreenFadeSpeed:= 1;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   181
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   182
// modified mine timers?
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   183
if cMinesTime <> 3000 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   184
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   185
    if cMinesTime = 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   186
        g:= AddGoal(g, gfAny, gidNoMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   187
    else if cMinesTime < 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   188
        g:= AddGoal(g, gfAny, gidRandomMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   189
    else
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   190
        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   191
    end;
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   192
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   193
// 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
   194
if g <> '' then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   195
    ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0);
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   196
1825
c929f9111141 Nemo's patch allowing different water sprites size
unc0rr
parents: 1812
diff changeset
   197
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
   198
//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
   199
cWaveHeight:= 32;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   200
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
   201
InitCameraBorders();
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
   202
uCursor.init();
2197
a02adcdaa939 Some work on camera
unc0rr
parents: 2178
diff changeset
   203
prevPoint.X:= 0;
74
42257fee61ae - Unicode support for team and hedgehogs names
unc0rr
parents: 71
diff changeset
   204
prevPoint.Y:= cScreenHeight div 2;
6609
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   205
WorldDx:=  -(LAND_WIDTH div 2) + cScreenWidth div 2;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   206
WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   207
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   208
//aligns it to the bottom of the screen, minus the border
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   209
SkyOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   210
HorizontOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   211
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   212
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
   213
AMAnimType:= AMTypeMaskX or AMTypeMaskAlpha;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   214
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   215
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   216
procedure InitCameraBorders;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   217
begin
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   218
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5);
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   219
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   220
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   221
procedure InitTouchInterface;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   222
begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   223
{$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
   224
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   225
//positioning of the buttons
7237
1bbe31e0d707 DPI for everyone
koda
parents: 7189
diff changeset
   226
buttonScale:= uMobile.getScreenDPI/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
   227
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
   228
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   229
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
   230
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   231
    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
   232
    sprite:= sprJumpWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   233
    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
   234
    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
   235
    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
   236
    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
   237
    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
   238
    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
   239
    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
   240
    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
   241
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   242
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
   243
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
   244
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   245
    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
   246
    sprite:= sprAMWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   247
    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
   248
    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
   249
    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
   250
    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
   251
    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
   252
    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
   253
    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
   254
    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
   255
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   256
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   257
with arrowLeft do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   258
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   259
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   260
    sprite:= sprArrowLeft;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   261
    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
   262
    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
   263
    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
   264
    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
   265
    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
   266
    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
   267
    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
   268
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   269
    end;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   270
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   271
with arrowRight do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   272
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   273
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   274
    sprite:= sprArrowRight;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   275
    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
   276
    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
   277
    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
   278
    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
   279
    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
   280
    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
   281
    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
   282
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   283
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   284
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
   285
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
   286
    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
   287
    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
   288
    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
   289
    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
   290
    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
   291
    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
   292
    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
   293
    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
   294
    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
   295
    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
   296
    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
   297
    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
   298
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   299
with arrowUp do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   300
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   301
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   302
    sprite:= sprArrowUp;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   303
    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
   304
    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
   305
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   306
    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
   307
    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
   308
    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
   309
    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
   310
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   311
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   312
         begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   313
         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
   314
         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
   315
         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
   316
         source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   317
         end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   318
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   319
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   320
with arrowDown do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   321
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   322
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   323
    sprite:= sprArrowDown;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   324
    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
   325
    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
   326
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   327
    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
   328
    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
   329
    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
   330
    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
   331
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   332
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   333
        begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   334
        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
   335
        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
   336
        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
   337
        source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   338
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   339
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   340
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   341
with pauseButton do
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   342
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   343
    show:= true;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   344
    sprite:= sprPauseButton;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   345
    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
   346
    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
   347
    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
   348
    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
   349
    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
   350
    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
   351
    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
   352
    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
   353
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   354
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   355
with utilityWidget do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   356
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   357
    show:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   358
    sprite:= sprTimerButton;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   359
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   360
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   361
    frame.x:= arrowLeft.frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   362
    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
   363
    active.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   364
    active.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   365
    active.w:= frame.w;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   366
    active.h:= frame.h;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   367
    with moveAnim do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   368
        begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   369
        target.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   370
        target.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   371
        source.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   372
        source.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   373
        end;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   374
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   375
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   376
end;
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   377
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
   378
// 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
   379
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
   380
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
   381
    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
   382
    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
   383
    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
   384
    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
   385
    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
   386
    missionTex:= nil;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
   387
    FreeTexture(recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
   388
    recTexture:= 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
   389
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
   390
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   391
function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture;
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   392
const BORDERSIZE = 2;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   393
var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   394
    STurns: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   395
    amSurface: PSDL_Surface;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   396
    AMRect: TSDL_Rect;
7049
35d762458d66 minor changes for warnings and a variables scope
koda
parents: 7028
diff changeset
   397
{$IFDEF USE_AM_NUMCOLUMN}tmpsurf: PSDL_Surface;{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   398
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
   399
    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
   400
    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
   401
        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
   402
            inc(SlotsNum);
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   403
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   404
    SlotsNumX:= SlotsNum;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   405
    SlotsNumY:= cMaxSlotAmmoIndex + 2;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   406
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   407
    inc(SlotsNumY);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   408
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   409
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   410
    SlotsNumX:= cMaxSlotAmmoIndex + 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   411
    SlotsNumY:= SlotsNum + 1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   412
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   413
    inc(SlotsNumX);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   414
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   415
{$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
   416
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   417
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   418
    AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   419
    AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   420
    amSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, AmmoRect.w, AmmoRect.h, 32, RMask, GMask, BMask, AMask);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   421
    
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   422
    AMRect.x:= BORDERSIZE;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   423
    AMRect.y:= BORDERSIZE;
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   424
    AMRect.w:= AmmoRect.w - (BORDERSIZE*2);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   425
    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
   426
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   427
    SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   428
    
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   429
    x:= AMRect.x;
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   430
    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
   431
    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
   432
        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
   433
            begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   434
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   435
            y:= AMRect.y;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   436
{$ELSE}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   437
            x:= AMRect.x;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   438
{$ENDIF}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   439
{$IFDEF USE_AM_NUMCOLUMN}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   440
            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
   441
            copyToXY(tmpsurf, amSurface,
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   442
                     x + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.w shr 1),
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   443
                     y + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.h shr 1));
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   444
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   445
            SDL_FreeSurface(tmpsurf);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   446
    {$IFDEF USE_LANDSCAPE_AMMOMENU}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   447
            y:= AMRect.y + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   448
    {$ELSE}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   449
            x:= AMRect.x + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   450
    {$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   451
{$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   452
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   453
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
   454
            for t:=0 to cMaxSlotAmmoIndex do
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   455
                begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   456
                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
   457
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   458
                    STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   459
                    AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   460
                    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
   461
                        begin
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   462
                        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
   463
                                                                 y + AMSlotPadding, AMFrame);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   464
                        if STurns < 100 then
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   465
                            DrawSpriteFrame2Surf(sprTurnsLeft, amSurface, 
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   466
                                x + AMSlotSize-16, 
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   467
                                y + AMSlotSize + 1 - 16, STurns);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   468
                        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   469
                    else //draw colored version
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   470
                        begin
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   471
                        DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding, 
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   472
                                                               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
   473
                        end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   474
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   475
	    inc(y, AMSlotSize + 1); //the plus one is for the border
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   476
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   477
	    inc(x, AMSlotSize + 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   478
{$ENDIF}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   479
	    end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   480
	end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   481
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   482
    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
   483
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   484
    inc(y, AMSlotSize + 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   485
{$ENDIF}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   486
    end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   487
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   488
for i:= 1 to SlotsNumX -1 do
6652
b043665dea3d and oooone last off-by-1 in ammo menu
nemo
parents: 6650
diff changeset
   489
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
   490
for i:= 1 to SlotsNumY -1 do
6652
b043665dea3d and oooone last off-by-1 in ammo menu
nemo
parents: 6650
diff changeset
   491
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
   492
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   493
//draw outer border
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   494
DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0                    , 0                    , 0);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   495
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.y             , 1);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   496
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.x             , AMRect.h + BORDERSIZE, 2);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   497
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.h + BORDERSIZE, 3);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   498
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   499
for i:=0 to BORDERSIZE-1 do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   500
begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   501
DrawLine2Surf(amSurface, BORDERSIZE, i, AMRect.w + BORDERSIZE, i,160,160,160);//top
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   502
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
   503
DrawLine2Surf(amSurface, i, BORDERSIZE, i, AMRect.h + BORDERSIZE,160,160,160);//left
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   504
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
   505
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   506
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   507
GetAmmoMenuTexture:= Surface2Tex(amSurface, false);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   508
if amSurface <> nil then SDL_FreeSurface(amSurface);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   509
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   510
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   511
procedure ShowAmmoMenu;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   512
const BORDERSIZE = 2;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   513
var Slot, Pos: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   514
    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
   515
    c,i,g,t,STurns: LongInt;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   516
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
   517
if TurnTimeLeft = 0 then bShowAmmoMenu:= false;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   518
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   519
// give the assigned ammo to hedgehog
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   520
Ammo:= nil;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   521
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil)
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   522
and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   523
    Ammo:= CurrentHedgehog^.Ammo
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   524
else if (LocalAmmo <> -1) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   525
    Ammo:= GetAmmoByNum(LocalAmmo);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   526
Pos:= -1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   527
if Ammo = nil then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   528
    begin
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   529
    bShowAmmoMenu:= false;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   530
    AMState:= AMHidden;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   531
    exit
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   532
    end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   533
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   534
//Init the menu 
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   535
if(AmmoMenuInvalidated) then 
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   536
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   537
    AmmoMenuInvalidated:= false;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   538
    FreeTexture(AmmoMenuTex);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   539
    AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   540
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   541
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   542
    if isPhone() then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   543
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   544
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   545
        AmmoRect.y:= (cScreenHeight shr 1) - (AmmoRect.h shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   546
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   547
    else
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   548
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   549
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   550
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   551
        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   552
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   553
        AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   554
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   555
{$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
   556
    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
   557
        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
   558
        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
   559
        AMShiftTargetY:= cScreenHeight        - AmmoRect.y;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   560
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
   561
        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
   562
        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
   563
        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
   564
        else AMShiftTargetY:= 0;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   565
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
   566
        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
   567
        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
   568
        end
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   569
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   570
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   571
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   572
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   573
if AMState = AMShowing then
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   574
    begin
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   575
    FollowGear:=nil;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   576
    end;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   577
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   578
if AMState = AMShowingUp then // show ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   579
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   580
    if (cReducedQuality and rqSlowMenu) <> 0 then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   581
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   582
        AMShiftX:= 0;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   583
        AMShiftY:= 0;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   584
        AMState:= AMShowing;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   585
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   586
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   587
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   588
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   589
            AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   590
            AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
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
   591
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then 
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   592
                Tint($FF, $ff, $ff, Round($ff * AMAnimState));
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   593
            end
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   594
        else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   595
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   596
            AMShiftX:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   597
            AMShiftY:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   598
            CursorPoint.X:= AmmoRect.x + AmmoRect.w;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   599
            CursorPoint.Y:= AmmoRect.y;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   600
            AMState:= AMShowing;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   601
            end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   602
    end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   603
if AMState = AMHiding then // hide ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   604
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   605
    if (cReducedQuality and rqSlowMenu) <> 0 then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   606
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   607
        AMShiftX:= AMShiftTargetX;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   608
        AMShiftY:= AMShiftTargetY;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   609
        AMState:= AMHidden;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   610
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   611
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   612
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   613
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   614
            AMShiftX:= Round(AMShiftTargetX * AMAnimState);
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   615
            AMShiftY:= Round(AMShiftTargetY * AMAnimState);
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
   616
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then 
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   617
                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
   618
            end
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   619
         else 
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   620
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   621
            AMShiftX:= AMShiftTargetX;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   622
            AMShiftY:= AMShiftTargetY;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   623
            prevPoint:= CursorPoint;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   624
            AMState:= AMHidden;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   625
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   626
    end;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   627
    
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   628
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
   629
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   630
if ((AMState = AMHiding) or (AMState = AMShowingUp)) and ((AMAnimType and AMTypeMaskAlpha) <> 0 )then 
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   631
    Tint($FF, $ff, $ff, $ff);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   632
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
   633
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
   634
Slot:= -1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   635
{$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
   636
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   637
    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
   638
        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
   639
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   640
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   641
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   642
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   643
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   644
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   645
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   646
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   647
                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
   648
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   649
                    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
   650
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
   651
                       (CursorPoint.X >  AmmoRect.x                   + ( c    * (AMSlotSize+1))) and 
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   652
                       (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
   653
                        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   654
                        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
   655
                        Pos:= t;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   656
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   657
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   658
                            DrawSprite(sprAMSlot, 
6645
9ff40cf44827 Fixes slot sprite and ammo sprites overlapping left side border. There is still the issue that boxes should be 32px between borders, but right now they are 33px on all but the first row (since the outside border overlaps it by 1px) causing the slot sprite to have 2px of border on the left and 1px of border on the right.
nemo
parents: 6644
diff changeset
   659
                                       AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding, 
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   660
                                       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
   661
                        end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   662
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   663
                   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
   664
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   665
{$ELSE}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   666
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   667
    for i:= 0 to cMaxSlotIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   668
        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
   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
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   678
                    begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   679
                    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
   680
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and
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
   681
                       (CursorPoint.X >  AmmoRect.x                   + ( g    * (AMSlotSize+1))) and 
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   682
                       (CursorPoint.X <= AmmoRect.x                   + ((g+1) * (AMSlotSize+1))) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   683
                        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   684
                        Slot:= i;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   685
                        Pos:= t;
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
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   688
                            DrawSprite(sprAMSlot, 
6645
9ff40cf44827 Fixes slot sprite and ammo sprites overlapping left side border. There is still the issue that boxes should be 32px between borders, but right now they are 33px on all but the first row (since the outside border overlaps it by 1px) causing the slot sprite to have 2px of border on the left and 1px of border on the right.
nemo
parents: 6644
diff changeset
   689
                                       AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding, 
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   690
                                       AmmoRect.y + BORDERSIZE + (c  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   691
                        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   692
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   693
                   end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   694
            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
   695
{$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   696
    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
   697
        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   698
        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
   699
        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
   700
            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
   701
            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
   702
                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
   703
                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
   704
                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
   705
                end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   706
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   707
            DrawTexture(AmmoRect.x + (AMSlotSize shr 1),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   708
                        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
   709
                        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
   710
            if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   711
                DrawTexture(AmmoRect.x + AmmoRect.w - 20 - (CountTexz[Ammo^[Slot, Pos].Count]^.w),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   712
                            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
   713
                            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
   714
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
   715
            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
   716
                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
   717
                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
   718
                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
   719
                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
   720
                FreeWeaponTooltip;
6691
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   721
{$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
   722
                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
   723
                    begin
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   724
                    if not(arrowUp.show) then
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   725
                        begin
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   726
                        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
   727
                        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
   728
                        end;
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   729
                    end
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   730
                else
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   731
                    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
   732
                        begin
79c96abd06d6 added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents: 6688
diff changeset
   733
                        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
   734
                        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
   735
                        end;
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   736
                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
   737
{$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
   738
                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
   739
                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
   740
            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
   741
        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
   742
    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
   743
        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
   744
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   745
    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
   746
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   747
        if not isPhone() then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   748
            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
   749
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   750
        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
   751
{$ENDIF}
961
a9a349b2b3fa Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents: 956
diff changeset
   752
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
   753
    bSelected:= false;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   754
{$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
   755
   if (AMShiftX = 0) and (AMShiftY = 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   756
        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
   757
{$ENDIF}
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   758
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   759
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
   760
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
   761
var VertexBuffer : array [0..3] of TVertex2f;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   762
    r		 : TSDL_Rect;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   763
    lw, lh	 : GLfloat;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   764
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   765
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
   766
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   767
    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
   768
    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
   769
    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
   770
    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
   771
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   772
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   773
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   774
    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
   775
    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
   776
    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
   777
    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
   778
    end;
2269
00f5704f5f39 add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents: 2268
diff changeset
   779
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   780
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
   781
lh:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 + 16;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   782
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   783
    // Water
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   784
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
   785
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
   786
    begin
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   787
        if r.y < 0 then
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   788
            r.y:= 0;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   789
 
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   790
        glDisable(GL_TEXTURE_2D);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   791
        VertexBuffer[0].X:= -lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   792
        VertexBuffer[0].Y:= r.y;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   793
        VertexBuffer[1].X:= lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   794
        VertexBuffer[1].Y:= r.y;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   795
        VertexBuffer[2].X:= lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   796
        VertexBuffer[2].Y:= lh;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   797
        VertexBuffer[3].X:= -lw;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   798
        VertexBuffer[3].Y:= lh;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   799
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   800
{$IFNDEF GL2}
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   801
        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   802
        glEnableClientState(GL_COLOR_ARRAY);
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   803
        if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   804
            glColorPointer(4, GL_UNSIGNED_BYTE, 0, @SDWaterColorArray[0])
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   805
        else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   806
            glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WaterColorArray[0]);
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   807
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   808
        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
   809
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   810
        glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   811
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   812
        glDisableClientState(GL_COLOR_ARRAY);
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
   813
        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
   814
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   815
{$ELSE}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   816
        UpdateModelviewProjection;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   817
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   818
        BeginWater;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   819
        if SuddenDeathDmg then
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   820
            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
   821
        else
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   822
            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
   823
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   824
        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
   825
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   826
        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
   827
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   828
        EndWater;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   829
{$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   830
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   831
        {$IFNDEF GL2}
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
   832
        glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   833
        {$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   834
        {$IFNDEF WEBGL}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   835
        glEnable(GL_TEXTURE_2D);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   836
        {$ENDIF}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
   837
    end;
1915
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   838
end;
c357f5b55320 patch by nemo:
unc0rr
parents: 1911
diff changeset
   839
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
   840
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
   841
var VertexBuffer, TextureBuffer: array [0..3] of TVertex2f;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   842
    lw, waves, shift: GLfloat;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   843
    sprite: TSprite;
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   844
begin
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   845
if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   846
    sprite:= sprSDWater
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   847
else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   848
    sprite:= sprWater;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   849
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   850
cWaveWidth:= SpritesData[sprite].Width;
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   851
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
   852
lw:= cScreenWidth / cScaleFactor;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   853
waves:= lw * 2 / cWaveWidth;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   854
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   855
if SuddenDeathDmg then
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   856
    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
   857
         LongInt(tnt) * SDWaterColorArray[2].g div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   858
         LongInt(tnt) * SDWaterColorArray[2].b div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   859
         255
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   860
    )
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   861
else
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   862
    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
   863
         LongInt(tnt) * WaterColorArray[2].g div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   864
         LongInt(tnt) * WaterColorArray[2].b div 255 + 255 - tnt,
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   865
         255
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   866
    );
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   867
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   868
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
   869
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   870
VertexBuffer[0].X:= -lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   871
VertexBuffer[0].Y:= cWaterLine + WorldDy + dY;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   872
VertexBuffer[1].X:= lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   873
VertexBuffer[1].Y:= VertexBuffer[0].Y;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   874
VertexBuffer[2].X:= lw;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   875
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
   876
VertexBuffer[3].X:= -lw;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   877
VertexBuffer[3].Y:= VertexBuffer[2].Y;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   878
2374
d584bb4b836e Fix water position when zooming
unc0rr
parents: 2373
diff changeset
   879
shift:= - lw / cWaveWidth;
2495
b6b9523e06bf Fix warning
unc0rr
parents: 2447
diff changeset
   880
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
   881
TextureBuffer[0].Y:= 0;
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   882
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
   883
TextureBuffer[1].Y:= TextureBuffer[0].Y;
08d623a494e6 Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents: 2434
diff changeset
   884
TextureBuffer[2].X:= TextureBuffer[1].X;
4748
ce9b48de1f52 sudden death, now with visual and audial effects :D
Henek
parents: 4626
diff changeset
   885
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
   886
TextureBuffer[3].X:= TextureBuffer[0].X;
2447
08d623a494e6 Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents: 2434
diff changeset
   887
TextureBuffer[3].Y:= TextureBuffer[2].Y;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   888
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   889
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   890
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
   891
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
   892
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   893
{$IFDEF GL2}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   894
UpdateModelviewProjection;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   895
{$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
   896
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   897
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   898
3390
1d4926d10a9e Engine:
smxx
parents: 3381
diff changeset
   899
Tint($FF, $FF, $FF, $FF);
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   900
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   901
{for i:= -1 to cWaterSprCount do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   902
    DrawSprite(sprWater,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   903
        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
   904
        cWaterLine + WorldDy + dY,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   905
        0)}
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   906
end;
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
   907
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   908
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
   909
var i, w, h, lw, lh, rw, rh, sw: LongInt;
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   910
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   911
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
   912
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
   913
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   914
    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
   915
    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
   916
    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
   917
    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
   918
        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
   919
    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
   920
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   921
    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
   922
    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
   923
    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
   924
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   925
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
   926
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   927
    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
   928
    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
   929
    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
   930
    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
   931
    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
   932
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   933
        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
   934
        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
   935
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   936
    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
   937
    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
   938
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   939
    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
   940
    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
   941
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   942
        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
   943
        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
   944
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   945
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   946
    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
   947
    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
   948
        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
   949
            begin
6580
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 - 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
   951
            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
   952
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   953
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   954
        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
   955
            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
   956
            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
   957
            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
   958
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   959
    end
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   960
end;
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   961
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   962
956
19003f7fc174 Get rid of unused Surface parameter
unc0rr
parents: 942
diff changeset
   963
procedure DrawWorld(Lag: LongInt);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   964
begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   965
    if ZoomValue < zoom then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   966
    begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   967
        zoom:= zoom - 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   968
        if ZoomValue > zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   969
            zoom:= ZoomValue
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   970
    end
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   971
    else
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   972
        if ZoomValue > zoom then
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   973
        begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   974
        zoom:= zoom + 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   975
        if ZoomValue < zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   976
            zoom:= ZoomValue
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   977
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   978
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   979
        ZoomValue:= zoom;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2375
diff changeset
   980
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   981
    // Sky
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   982
    glClear(GL_COLOR_BUFFER_BIT);
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   983
    //glPushMatrix;
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   984
    //glScalef(1.0, 1.0, 1.0);
756
2b307457fd68 Respect alpha channel
unc0rr
parents: 755
diff changeset
   985
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
   986
    if (not isPaused) 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
   987
        MoveCamera;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
   988
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   989
    if cStereoMode = smNone then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   990
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   991
        glClear(GL_COLOR_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   992
        DrawWorldStereo(Lag, rmDefault)
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   993
        end
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
   994
{$IFNDEF S3D_DISABLED}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   995
    else if (cStereoMode = smAFR) then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   996
        begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   997
        AFRToggle:= not AFRToggle;
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   998
        glClear(GL_COLOR_BUFFER_BIT);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   999
        if AFRToggle then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1000
            DrawWorldStereo(Lag, rmLeftEye)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1001
        else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1002
            DrawWorldStereo(Lag, rmRightEye)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1003
        end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1004
    else if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1005
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1006
        // create left fb
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1007
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framel);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1008
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1009
        DrawWorldStereo(Lag, rmLeftEye);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1010
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1011
        // create right fb
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1012
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framer);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1013
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1014
        DrawWorldStereo(0, rmRightEye);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1015
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1016
        // detatch drawing from fbs
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1017
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, defaultFrame);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1018
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1019
        SetScale(cDefaultZoomLevel);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1020
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1021
        // draw left frame
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1022
        glBindTexture(GL_TEXTURE_2D, texl);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1023
        glBegin(GL_QUADS);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1024
            if cStereoMode = smHorizontal then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1025
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1026
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1027
                glVertex2d(cScreenWidth / -2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1028
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1029
                glVertex2d(0, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1030
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1031
                glVertex2d(0, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1032
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1033
                glVertex2d(cScreenWidth / -2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1034
                end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1035
            else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1036
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1037
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1038
                glVertex2d(cScreenWidth / -2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1039
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1040
                glVertex2d(cScreenWidth / 2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1041
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1042
                glVertex2d(cScreenWidth / 2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1043
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1044
                glVertex2d(cScreenWidth / -2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1045
                end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1046
        glEnd();
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1047
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1048
        // draw right frame
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1049
        glBindTexture(GL_TEXTURE_2D, texr);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1050
        glBegin(GL_QUADS);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1051
            if cStereoMode = smHorizontal then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1052
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1053
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1054
                glVertex2d(0, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1055
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1056
                glVertex2d(cScreenWidth / 2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1057
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1058
                glVertex2d(cScreenWidth / 2, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1059
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1060
                glVertex2d(0, 0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1061
                end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1062
            else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1063
                begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1064
                glTexCoord2f(0.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1065
                glVertex2d(cScreenWidth / -2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1066
                glTexCoord2f(1.0, 0.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1067
                glVertex2d(cScreenWidth / 2, cScreenHeight);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1068
                glTexCoord2f(1.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1069
                glVertex2d(cScreenWidth / 2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1070
                glTexCoord2f(0.0, 1.0);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1071
                glVertex2d(cScreenWidth / -2, cScreenHeight / 2);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1072
                end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1073
        glEnd();
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1074
        SetScale(zoom);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1075
        end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1076
    else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1077
        begin
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1078
        // clear scene
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1079
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1080
        glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1081
        // draw left eye in red channel only
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1082
        if cStereoMode = smGreenRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1083
            glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1084
        else if cStereoMode = smBlueRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1085
            glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1086
        else if cStereoMode = smCyanRed then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1087
            glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1088
        else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1089
            glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1090
        DrawWorldStereo(Lag, rmLeftEye);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1091
        // draw right eye in selected channel(s) only
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1092
        if cStereoMode = smRedGreen then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1093
            glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1094
        else if cStereoMode = smRedBlue then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1095
            glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1096
        else if cStereoMode = smRedCyan then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1097
            glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE)
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1098
        else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1099
            glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1100
        DrawWorldStereo(Lag, rmRightEye);
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1101
        end
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1102
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1103
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1104
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1105
procedure ChangeDepth(rm: TRenderMode; d: GLfloat);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1106
begin
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1107
{$IFDEF S3D_DISABLED}
4850
434cd1284204 code cleanup
koda
parents: 4844
diff changeset
  1108
    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
  1109
    exit;
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1110
{$ELSE}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1111
    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
  1112
    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
  1113
        exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1114
    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
  1115
        d:= -d;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1116
    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
  1117
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1118
    {$IFDEF GL2}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1119
    hglMatrixMode(MATRIX_PROJECTION);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1120
    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
  1121
    hglMatrixMode(MATRIX_MODELVIEW);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1122
    {$ELSE}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1123
    glMatrixMode(GL_PROJECTION);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1124
    glTranslatef(d, 0, 0);
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1125
    glMatrixMode(GL_MODELVIEW);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1126
    {$ENDIF}
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1127
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1128
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1129
 
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1130
procedure ResetDepth(rm: TRenderMode);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1131
begin
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1132
{$IFNDEF S3D_DISABLED}
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1133
    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
  1134
        exit;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1135
    {$IFDEF GL2}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1136
    hglMatrixMode(MATRIX_PROJECTION);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1137
    hglTranslatef(-stereoDepth, 0, 0);
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1138
    hglMatrixMode(MATRIX_MODELVIEW);    
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1139
    {$ELSE}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1140
    glMatrixMode(GL_PROJECTION);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1141
    glTranslatef(-stereoDepth, 0, 0);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1142
    glMatrixMode(GL_MODELVIEW);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1143
    {$ENDIF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1144
    cStereoDepth:= 0;
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
  1145
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1146
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1147
 
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1148
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
6627
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1149
var i, t, h: LongInt;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1150
    r: TSDL_Rect;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1151
    tdx, tdy: Double;
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1152
    s: shortstring;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1153
    highlight: Boolean;
5380
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1154
    smallScreenOffset, offsetX, offsetY, screenBottom: LongInt;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1155
    VertexBuffer: array [0..3] of TVertex2f;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1156
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1157
if (cReducedQuality and rqNoBackground) = 0 then
1812
3d4692e825e7 'Reduce quality' patch by nemo
unc0rr
parents: 1807
diff changeset
  1158
    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
  1159
        // 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
  1160
        ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
4374
bcefeeabaa33 Move some stuff from uMisc to uUtils
unC0Rr
parents: 4371
diff changeset
  1161
        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
  1162
        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
  1163
        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
  1164
        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
  1165
            HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1166
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
  1167
        // background
3688
fd8c22a358de add some comments and fix indentation
koda
parents: 3686
diff changeset
  1168
        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
  1169
        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
  1170
            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
  1171
        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
  1172
        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
  1173
        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
  1174
        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
  1175
            Tint($FF, $FF, $FF, $FF);
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1176
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1177
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1178
DrawVisualGears(0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1179
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
  1180
DrawVisualGears(4);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1181
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1182
if (cReducedQuality and rq2DWater) = 0 then
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1183
    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
  1184
        // Waves
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
  1185
        DrawWater(255, SkyOffset); 
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1186
        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
  1187
        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
  1188
        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
  1189
        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
  1190
        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
  1191
        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
  1192
        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
  1193
        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
  1194
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1195
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
  1196
        DrawWaves(-1, 100, - (cWaveHeight + (cWaveHeight shr 1)), 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1197
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1198
    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
  1199
    DrawVisualGears(5);
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1200
    DrawLand(WorldDx, WorldDy);
1911
6283bd8a960b use glVertexPointer to render water
unc0rr
parents: 1906
diff changeset
  1201
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1202
    DrawWater(255, 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1203
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1204
(*
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1205
// Attack bar
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1206
    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
  1207
        case AttackBar of
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1208
        //1: begin
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1209
        //r:= StuffPoz[sPowerBar];
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1210
        //{$WARNINGS OFF}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1211
        //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
  1212
        //{$WARNINGS ON}
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1213
        //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
  1214
        //end;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1215
        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
  1216
                begin
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1217
                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
  1218
                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
  1219
                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
  1220
                    DrawSprite(sprPower,
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1221
                            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
  1222
                            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
  1223
                            i)
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1224
                end
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1225
        end;
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1226
*)
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1227
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1228
DrawVisualGears(1);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1229
DrawGears;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1230
DrawVisualGears(6);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1231
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1232
if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1233
    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
  1234
else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1235
    DrawWater(WaterOpacity, 0);
2269
00f5704f5f39 add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents: 2268
diff changeset
  1236
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1237
    // Waves
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1238
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
  1239
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
  1240
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1241
if (cReducedQuality and rq2DWater) = 0 then
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1242
    begin
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1243
    //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
  1244
    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
  1245
    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
  1246
    if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1247
        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
  1248
    else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1249
        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
  1250
    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
  1251
    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
  1252
        if SuddenDeathDmg then
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1253
            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
  1254
        else
6982
8d41d22a291d breaking news, we don't support typed consts anymore
koda
parents: 6963
diff changeset
  1255
            DrawWater(WaterOpacity, - offsetY div 10);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1256
        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
  1257
        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
  1258
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1259
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1260
        DrawWaves(-1, 50, - (cWaveHeight shr 1), 0);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1261
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1262
// 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
  1263
// 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
  1264
    ChangeDepth(RM, cStereo_Outside);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1265
    DrawVisualGears(2);
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1266
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1267
// 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
  1268
// 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
  1269
    ResetDepth(RM);
4818
202eef454354 rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents: 4816
diff changeset
  1270
    DrawVisualGears(3);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1271
2288
c01b8258918d Move water waves rendering to a separate procedure
unc0rr
parents: 2287
diff changeset
  1272
{$WARNINGS OFF}
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1273
// Target
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1274
if (TargetPoint.X <> NoPointX) and (CurrentTeam <> nil) and (CurrentHedgehog <> nil) then
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1275
    begin
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1276
    with PHedgehog(CurrentHedgehog)^ do
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1277
        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
  1278
        if CurAmmoType = amBee then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1279
            DrawSpriteRotatedF(sprTargetBee, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
3110
c8d7c852e26a Engine:
smxx
parents: 3107
diff changeset
  1280
        else
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1281
            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
  1282
        end
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1283
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1284
{$WARNINGS ON}
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1285
3523
6592fbb969da fix zoom smoothness
koda
parents: 3513
diff changeset
  1286
// 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
  1287
SetScale(cDefaultZoomLevel);
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1288
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1289
// Turn time
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1290
{$IFDEF USE_TOUCH_INTERFACE}
3025
01682ec58eb0 update project for ipad target
koda
parents: 2999
diff changeset
  1291
offsetX:= cScreenHeight - 13;
2803
1f446fc5c8ec allow to compile engine as library with HWLIBRARY symbol
koda
parents: 2786
diff changeset
  1292
{$ELSE}
3025
01682ec58eb0 update project for ipad target
koda
parents: 2999
diff changeset
  1293
offsetX:= 48;
2803
1f446fc5c8ec allow to compile engine as library with HWLIBRARY symbol
koda
parents: 2786
diff changeset
  1294
{$ENDIF}
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
  1295
offsetY:= cOffsetY;
3890
e4b7b30232fd Extend time limit to 9999, remove ready timer if time is over 999 and stop drawing time if it is over 999 (draws wrong over 999 anyway) - this has the effect of allowing an "unlimited" time appearance if turns are over a quarter hour or so. This can be used to add an unlimited time scheme or button to ipad
nemo
parents: 3836
diff changeset
  1296
if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 1000000)) or (ReadyTimeLeft <> 0) then
3774
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1297
    begin
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1298
    if ReadyTimeLeft <> 0 then
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1299
        i:= Succ(Pred(ReadyTimeLeft) div 1000)
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1300
    else
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1301
        i:= Succ(Pred(TurnTimeLeft) div 1000);
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1302
   
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1303
    if i>99 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1304
        t:= 112
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1305
    else if i>9 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1306
        t:= 96
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1307
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1308
        t:= 80;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1309
    DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1310
    while i > 0 do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1311
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1312
        dec(t, 32);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1313
        DrawSprite(sprBigDigit, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1314
        i:= i div 10
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1315
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1316
    DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1317
    end;
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1318
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1319
// Captions
4393
883b979697e4 uCaptions
unc0rr
parents: 4380
diff changeset
  1320
DrawCaptions;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1321
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
  1322
{$IFDEF USE_TOUCH_INTERFACE}
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5824
diff changeset
  1323
// Draw buttons Related to the Touch interface
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1324
DrawScreenWidget(@arrowLeft);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1325
DrawScreenWidget(@arrowRight);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1326
DrawScreenWidget(@arrowUp);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1327
DrawScreenWidget(@arrowDown);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1328
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1329
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
  1330
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
  1331
DrawScreenWidget(@AMWidget);
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1332
DrawScreenWidget(@pauseButton);
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
  1333
DrawScreenWidget(@utilityWidget);
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  1334
{$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
  1335
47
8daf1ee0b9a3 Show team health bars, without sorting yet
unc0rr
parents: 39
diff changeset
  1336
// Teams Healths
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
  1337
if TeamsCount * 20 > Longword(cScreenHeight) div 7 then  // take up less screen on small displays
5380
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1338
    begin
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1339
    SetScale(1.5);
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1340
    smallScreenOffset:= cScreenHeight div 6;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1341
    if TeamsCount * 20 > Longword(cScreenHeight) div 5 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1342
        Tint($FF,$FF,$FF,$80);
5380
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1343
    end
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1344
else smallScreenOffset:= 0;
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 526
diff changeset
  1345
for t:= 0 to Pred(TeamsCount) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1346
    with TeamsArray[t]^ do
7644
ed7fecd0f5fd hide health bars of dead teams
unc0rr
parents: 7503
diff changeset
  1347
      if TeamHealth > 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
  1348
        begin
6627
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1349
        h:= 0;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1350
        highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1351
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1352
        if highlight then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1353
            Tint(Clan^.Color shl 8 or $FF);
690
e9d35e319328 Finally, get rid of large stupid StoreSurface
unc0rr
parents: 689
diff changeset
  1354
2839
95977f876122 Engine:
smxx
parents: 2803
diff changeset
  1355
         // draw name
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1356
        DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1357
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1358
        // draw flag
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1359
        DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1360
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1361
        // draw health bar
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1362
        r.x:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1363
        r.y:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1364
        r.w:= 2 + TeamHealthBarWidth;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1365
        r.h:= HealthTex^.h;
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1366
        DrawTextureFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1367
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1368
        // draw health bars right border
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1369
        inc(r.x, cTeamHealthWidth + 2);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1370
        r.w:= 3;
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1371
        DrawTextureFromRect(TeamHealthBarWidth + 16, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1372
7645
0e3c2dd9fee6 remove checks from c4272519b128, ed7fecd0f5fd just hides 'em instead.
nemo
parents: 7644
diff changeset
  1373
        if not highlight and (not hasGone) then
6627
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1374
            for i:= 0 to cMaxHHIndex do
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1375
                if Hedgehogs[i].Gear <> nil then
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1376
                    begin
6644
b86a50569238 Fix slider positions
nemo
parents: 6638
diff changeset
  1377
                    inc(h,Hedgehogs[i].Gear^.Health);
6647
26e523c8fe88 slider tweak
nemo
parents: 6645
diff changeset
  1378
                    if h < TeamHealth then DrawTexture(15 + h*TeamHealthBarWidth div TeamHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture);
6627
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1379
                    end;
18cbb75aba59 add individual hog healths to team health bar
nemo
parents: 6622
diff changeset
  1380
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1381
        // draw ai kill counter for gfAISurvival
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1382
        if (GameFlags and gfAISurvival) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1383
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1384
            DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, AIKillsTex);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1385
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1386
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1387
        // if highlighted, draw flag and other contents again to keep their colors
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1388
        // this approach should be faster than drawing all borders one by one tinted or not
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1389
        if highlight then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1390
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1391
            if TeamsCount * 20 > Longword(cScreenHeight) div 5 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1392
                Tint($FF,$FF,$FF,$80)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1393
            else Tint($FF, $FF, $FF, $FF);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1394
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1395
            // draw name
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1396
            r.x:= 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1397
            r.y:= 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1398
            r.w:= NameTagTex^.w - 4;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1399
            r.h:= NameTagTex^.h - 4;
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1400
            DrawTextureFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1401
            // draw flag
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1402
            r.w:= 22;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1403
            r.h:= 15;
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1404
            DrawTextureFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1405
            // draw health bar
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1406
            r.w:= TeamHealthBarWidth + 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1407
            r.h:= HealthTex^.h - 4;
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1408
            DrawTextureFromRect(16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, HealthTex);
7368
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1409
            if not hasGone and (TeamHealth > 1) then
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1410
                begin
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1411
                Tint(Clan^.Color shl 8 or $FF);
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1412
                for i:= 0 to cMaxHHIndex do
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1413
                    if Hedgehogs[i].Gear <> nil then
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1414
                        begin
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1415
                        inc(h,Hedgehogs[i].Gear^.Health);
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1416
                        if h < TeamHealth then DrawTexture(15 + h*TeamHealthBarWidth div TeamHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture);
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1417
                        end;
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1418
                if TeamsCount * 20 > Longword(cScreenHeight) div 5 then
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1419
                    Tint($FF,$FF,$FF,$80)
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1420
                else Tint($FF, $FF, $FF, $FF);
20448801e86a A bit more convoluted, but more attractive visually
nemo
parents: 7343
diff changeset
  1421
                end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1422
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1423
        end;
5380
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1424
if smallScreenOffset <> 0 then
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1425
    begin
5485
e943a005d0e8 Reset to default zoom. Unbreaks waves
nemo
parents: 5380
diff changeset
  1426
    SetScale(cDefaultZoomLevel);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1427
    if TeamsCount * 20 > Longword(cScreenHeight) div 5 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1428
        Tint($FF,$FF,$FF,$FF);
5380
6ba1e40a360c Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents: 5372
diff changeset
  1429
    end;
47
8daf1ee0b9a3 Show team health bars, without sorting yet
unc0rr
parents: 39
diff changeset
  1430
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1431
// Lag alert
7392
bc3306c59a08 Correctly distinguish between game and real ticks while recording video,
Stepan777 <stepik-777@mail.ru>
parents: 7386
diff changeset
  1432
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
  1433
    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
  1434
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1435
// Wind bar
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1436
{$IFDEF USE_TOUCH_INTERFACE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1437
    offsetX:= cScreenHeight - 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1438
    offsetY:= (cScreenWidth shr 1) + 74;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1439
{$ELSE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1440
    offsetX:= 30;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1441
    offsetY:= 180;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1442
{$ENDIF}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1443
    DrawSprite(sprWindBar, (cScreenWidth shr 1) - offsetY, cScreenHeight - offsetX, 0);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1444
    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
  1445
        begin
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1446
        {$WARNINGS OFF}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1447
        r.x:= 8 - (RealTicks shr 6) mod 8;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1448
        {$WARNINGS ON}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1449
        r.y:= 0;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1450
        r.w:= WindBarWidth;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1451
        r.h:= 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1452
        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
  1453
        end
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1454
    else
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1455
        if WindBarWidth < 0 then
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1456
        begin
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1457
            {$WARNINGS OFF}
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
  1458
            r.x:= (Longword(WindBarWidth) + RealTicks shr 6) mod 8;
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1459
            {$WARNINGS ON}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1460
            r.y:= 0;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1461
            r.w:= - WindBarWidth;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1462
            r.h:= 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1463
            DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1464
        end;
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1465
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1466
// AmmoMenu
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1467
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
  1468
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1469
    if (AMState = AMHidden) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1470
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1471
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1472
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1473
    AMState:= AMShowingUp;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1474
    end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1475
if not(bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1476
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1477
    if (AMState = AMShowing) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1478
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1479
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1480
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1481
    AMState:= AMHiding;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1482
    end; 
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1483
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1484
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
  1485
    ShowAmmoMenu;
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1486
2287
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1487
// Cursor
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1488
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
  1489
    DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
942
b41af014d85e Stub for chat implementation
unc0rr
parents: 883
diff changeset
  1490
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1491
// Chat
2287
e34b5363ae91 Better handle pointing with mouse cursor on zoom
unc0rr
parents: 2285
diff changeset
  1492
DrawChat;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1493
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1494
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4901
diff changeset
  1495
// 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
  1496
if fastUntilLag then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1497
    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
  1498
if isPaused then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1499
    DrawTextureCentered(0, (cScreenHeight shr 1), PauseTexture);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1500
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
  1501
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1502
    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
  1503
        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
  1504
    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
  1505
        missionTimer:= 0; // avoid subtracting below 0
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1506
    if missionTex <> nil then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1507
        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
  1508
    end;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1509
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1510
// fps
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1511
{$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
  1512
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
  1513
{$ELSE}
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
  1514
offsetX:= 10;
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1515
{$ENDIF}
3463
23c50be687a9 update sdl functions to latest revision
koda
parents: 3445
diff changeset
  1516
offsetY:= cOffsetY;
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1517
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
  1518
    begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1519
    inc(Frames);
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1520
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1521
    if cShowFPS or (GameType = gmtDemo) then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1522
        inc(CountTicks, Lag);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1523
    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
  1524
        begin
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1525
        i:= GameTicks div 1000;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1526
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1527
        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
  1528
        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
  1529
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1530
        i:= i div 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1531
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1532
        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
  1533
        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
  1534
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1535
        s:= inttostr(i div 60) + ':' + s;
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
  1536
   
3513
f589230fa21b now it's possible to select the scheme file in the ifrontendfix a type about loading an image (iphone file system IS case senstive)
koda
parents: 3483
diff changeset
  1537
    
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1538
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1539
        tmpSurface:= doSurfaceConversion(tmpSurface);
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1540
        FreeTexture(timeTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1541
        timeTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1542
        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
  1543
        end;
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1544
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1545
    if timeTexture <> nil then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1546
        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
  1547
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1548
    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
  1549
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1550
        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
  1551
            begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1552
            FPS:= Frames;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1553
            Frames:= 0;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1554
            CountTicks:= 0;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1555
            s:= inttostr(FPS) + ' fps';
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1556
            tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1557
            tmpSurface:= doSurfaceConversion(tmpSurface);
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1558
            FreeTexture(fpsTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1559
            fpsTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1560
            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
  1561
            end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1562
        if fpsTexture <> nil then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1563
            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
  1564
        end;
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 165
diff changeset
  1565
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1566
    // lag warning (?)
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1567
    inc(SoundTimerTicks, Lag);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1568
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1569
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 165
diff changeset
  1570
if SoundTimerTicks >= 50 then
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1571
begin
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1572
    SoundTimerTicks:= 0;
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1573
    if cVolumeDelta <> 0 then
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1574
    begin
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1575
        str(ChangeVolume(cVolumeDelta), s);
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1576
        AddCaption(Format(trmsg[sidVolume], s), cWhiteColor, capgrpVolume);
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1577
    end;
7404
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
  1578
    if isAudioMuted then
38a23771ee45 ooops (and indentation)
koda
parents: 7403
diff changeset
  1579
        AddCaption(trmsg[sidMute], cWhiteColor, capgrpVolume)
7403
e8d0b21efa82 press 8 to mute audio while ingame
koda
parents: 7368
diff changeset
  1580
end;
756
2b307457fd68 Respect alpha channel
unc0rr
parents: 755
diff changeset
  1581
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1582
if GameState = gsConfirm then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1583
    DrawTextureCentered(0, (cScreenHeight shr 1), ConfirmTexture);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1584
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1585
if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1586
    begin
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1587
    if not isFirstFrame then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1588
        case ScreenFade of
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1589
            sfToBlack, sfToWhite:     if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1590
                                          inc(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1591
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1592
                                          ScreenFadeValue:= sfMax;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1593
            sfFromBlack, sfFromWhite: if ScreenFadeValue - Lag * ScreenFadeSpeed > 0 then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1594
                                          dec(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1595
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1596
                                          ScreenFadeValue:= 0;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1597
            end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1598
    if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1599
        begin
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1600
        case ScreenFade of
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1601
            sfToBlack, sfFromBlack: Tint(0, 0, 0, ScreenFadeValue * 255 div 1000);
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1602
            sfToWhite, sfFromWhite: Tint($FF, $FF, $FF, ScreenFadeValue * 255 div 1000);
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1603
            end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1604
3113
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1605
        VertexBuffer[0].X:= -cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1606
        VertexBuffer[0].Y:= cScreenHeight;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1607
        VertexBuffer[1].X:= -cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1608
        VertexBuffer[1].Y:= 0;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1609
        VertexBuffer[2].X:= cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1610
        VertexBuffer[2].Y:= 0;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1611
        VertexBuffer[3].X:= cScreenWidth;
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1612
        VertexBuffer[3].Y:= cScreenHeight;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1613
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1614
        glDisable(GL_TEXTURE_2D);
3641
98319a621dc8 save the gl client state to get a nice 80% fps boost
koda
parents: 3638
diff changeset
  1615
3113
2829ea0dd47c * port fadeout to opengles
koda
parents: 3110
diff changeset
  1616
        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
  1617
        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
  1618
3376
faee68a28b82 Engine:
smxx
parents: 3304
diff changeset
  1619
        glEnable(GL_TEXTURE_2D);
3390
1d4926d10a9e Engine:
smxx
parents: 3381
diff changeset
  1620
        Tint($FF, $FF, $FF, $FF);
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1621
        if (not isFirstFrame) and ((ScreenFadeValue = 0) or (ScreenFadeValue = sfMax)) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1622
            ScreenFade:= sfNone
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1623
        end
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1624
    end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1625
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1626
{$IFDEF USE_VIDEO_RECORDING}
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1627
// during video prerecording draw red blinking circle and text 'rec'
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1628
if flagPrerecording then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1629
    begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1630
    if recTexture = nil then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1631
        begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1632
        s:= 'rec';
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1633
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fntBig].Handle, Str2PChar(s), cWhiteColorChannels);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1634
        tmpSurface:= doSurfaceConversion(tmpSurface);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1635
        FreeTexture(recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1636
        recTexture:= Surface2Tex(tmpSurface, false);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1637
        SDL_FreeSurface(tmpSurface)
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1638
        end;
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1639
    DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1640
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1641
    // draw red circle
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1642
    glDisable(GL_TEXTURE_2D); 
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1643
    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
  1644
    glBegin(GL_POLYGON);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1645
    for i:= 0 to 20 do
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1646
        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
  1647
    glEnd();
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1648
    Tint($FF, $FF, $FF, $FF);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1649
    glEnable(GL_TEXTURE_2D);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1650
    end;
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1651
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1652
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1653
SetScale(zoom);
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1654
7858
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1655
// Attack bar
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1656
    if CurrentTeam <> nil then
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1657
        case AttackBar of
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1658
(*        1: begin
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1659
        r:= StuffPoz[sPowerBar];
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1660
        {$WARNINGS OFF}
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1661
        r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1662
        {$WARNINGS ON}
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1663
        DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1664
        end;*)
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1665
        2: with CurrentHedgehog^ do
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1666
                begin
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1667
                tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1668
                tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1669
                for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1670
                    DrawSprite(sprPower,
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1671
                            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
  1672
                            hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16,
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1673
                            i)
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1674
                end
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1675
        end;
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1676
2566fc2621d4 more like here
nemo
parents: 7852
diff changeset
  1677
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1678
// Cursor
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1679
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
  1680
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1681
    if not bShowAmmoMenu then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1682
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1683
        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
  1684
            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
  1685
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1686
            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
  1687
                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
  1688
            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
  1689
            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
  1690
                if PosCount > 1 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1691
                    DrawSprite(PosSprite, CursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - CursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1692
                end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1693
        DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1694
        end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1695
    end;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1696
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1697
isFirstFrame:= false
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1698
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1699
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1700
var PrevSentPointTime: LongWord = 0;
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1701
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1702
procedure MoveCamera;
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1703
var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY: LongInt;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1704
begin
5502
0d1a1aeed00a changed iphone specific ifdefs to mobile
Xeli
parents: 5495
diff changeset
  1705
{$IFNDEF MOBILE}
6453
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents: 6415
diff changeset
  1706
if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu))) 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
  1707
    uCursor.updatePosition();
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3537
diff changeset
  1708
{$ENDIF}
5852
nemo
parents: 5851
diff changeset
  1709
z:= round(200/zoom);
7468
1333ca7554dc Toggle autoCameraOn in Findhh instead of checking FollowGear which could be set in a variety of places. Issue #404
nemo
parents: 7426
diff changeset
  1710
if not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and autoCameraOn then
7187
aff30d80bd7b - Allow camera movement while current hedgehog is falling
unc0rr
parents: 7167
diff changeset
  1711
    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
  1712
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1713
        FollowGear:= nil;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1714
        prevPoint:= CursorPoint;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1715
        exit
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1716
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1717
    else
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1718
        begin
5852
nemo
parents: 5851
diff changeset
  1719
        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
  1720
        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
  1721
            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
  1722
        else
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1723
            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
  1724
        end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1725
2375
99f05a01a6a3 Don't allow to look too deep
unc0rr
parents: 2374
diff changeset
  1726
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
  1727
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
  1728
    WorldDy:= wdy;
2375
99f05a01a6a3 Don't allow to look too deep
unc0rr
parents: 2374
diff changeset
  1729
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1730
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
  1731
    exit;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1732
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
  1733
if (AMState = AMShowingUp) or (AMState = AMShowing) then
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1734
begin
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1735
{$IFDEF USE_LANDSCAPE_AMMOMENU}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1736
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1737
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1738
    amNumOffsetY:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1739
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1740
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1741
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1742
{$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1743
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1744
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1745
    amNumOffsetX:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1746
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1747
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1748
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1749
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1750
{$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1751
    if CursorPoint.X < AmmoRect.x + amNumOffsetX + 3 then//check left 
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1752
        CursorPoint.X:= AmmoRect.x + amNumOffsetX + 3;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  1753
    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
  1754
        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
  1755
    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
  1756
        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
  1757
    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
  1758
        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
  1759
    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
  1760
    //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
  1761
    exit
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1762
end;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
  1763
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1764
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
  1765
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1766
    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
  1767
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1768
        SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1769
        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
  1770
        end;
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1771
    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
  1772
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1773
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1774
    EdgesDist:= cGearScrEdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1775
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1776
// this generates the border around the screen that moves the camera when cursor is near it
7187
aff30d80bd7b - Allow camera movement while current hedgehog is falling
unc0rr
parents: 7167
diff changeset
  1777
if 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
  1778
    begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1779
    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
  1780
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1781
        WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1782
        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
  1783
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1784
    else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1785
        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
  1786
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1787
            WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1788
            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
  1789
            end;
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1790
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  1791
    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
  1792
    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
  1793
        begin
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1794
        WorldDy:= WorldDy + CursorPoint.Y - shs;
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  1795
        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
  1796
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1797
    else
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  1798
        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
  1799
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1800
           WorldDy:= WorldDy + CursorPoint.Y - cScreenHeight + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1801
           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
  1802
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1803
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1804
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1805
    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
  1806
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1807
        WorldDx:= WorldDx - CursorPoint.X + prevPoint.X;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1808
        WorldDy:= WorldDy + CursorPoint.Y - prevPoint.Y;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1809
        CursorPoint.X:= 0;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1810
        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
  1811
        end;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 308
diff changeset
  1812
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1813
// this moves the camera according to CursorPoint X and Y
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1814
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
  1815
//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
  1816
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
  1817
    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
  1818
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
  1819
    WorldDy:= wdy;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1820
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
  1821
    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
  1822
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
  1823
    WorldDx:= 1024;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1824
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1825
2905
f3c79f7193a9 Engine:
smxx
parents: 2904
diff changeset
  1826
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1827
var r: TSDL_Rect;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1828
begin
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1829
r.w:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1830
r.h:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1831
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1832
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
  1833
    time:= 5000;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1834
missionTimer:= time;
6380
1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents: 6302
diff changeset
  1835
FreeTexture(missionTex);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1836
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1837
if icon > -1 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1838
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1839
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1840
    r.y:= icon * 32;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1841
    missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, MissionIcons, @r)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1842
    end
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1843
else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1844
    begin
4626
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  1845
    r.x:= ((-icon - 1) shr 4) * 32;
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  1846
    r.y:= ((-icon - 1) mod 16) * 32;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1847
    missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, SpritesData[sprAMAmmos].Surface, @r)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1848
    end;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1849
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1850
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1851
procedure HideMission;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1852
begin
3045
41732f986b4f Clean Augean stables
unc0rr
parents: 3038
diff changeset
  1853
    missionTimer:= 0;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1854
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1855
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
  1856
procedure ShakeCamera(amount: LongInt);
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  1857
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1858
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
  1859
    exit;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1860
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
  1861
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
  1862
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
  1863
//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
  1864
//CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2))
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  1865
end;
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  1866
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1867
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1868
procedure onFocusStateChanged;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1869
begin
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1870
if (not cHasFocus) and (GameState <> gsConfirm) then
5523
9ac5acc4f3e5 Also unhide mouse cursor when in gsConfirm state
unc0rr
parents: 5522
diff changeset
  1871
    ParseCommand('quit', true);
7847
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  1872
{$IFDEF MOBILE}
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  1873
// 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
  1874
exit;
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  1875
{$ENDIF}
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6806
diff changeset
  1876
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  1877
{$IFDEF USE_VIDEO_RECORDING}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1878
// do not change volume during prerecording as it will affect sound in video file
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1879
if not flagPrerecording then
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  1880
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1881
    begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1882
    if not cHasFocus then DampenAudio()
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1883
    else UndampenAudio();
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1884
    end;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1885
end;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1886
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1887
procedure SetUtilityWidgetState(ammoType: TAmmoType);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1888
begin
7086
e99944b25764 android typo/sabotage
Xeli
parents: 7069
diff changeset
  1889
{$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
  1890
if(ammoType = amNothing)then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1891
    ammoType:= CurrentHedgehog^.CurAmmoType;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1892
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1893
if(CurrentHedgehog <> nil)then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1894
    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
  1895
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1896
        utilityWidget.sprite:= sprTimerButton;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1897
        animateWidget(@utilityWidget, true, true);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1898
        end 
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1899
    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
  1900
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1901
        utilityWidget.sprite:= sprTargetButton;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1902
        animateWidget(@utilityWidget, true, true);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1903
        end
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  1904
    else if ammoType = amSwitch then
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  1905
        begin
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  1906
        utilityWidget.sprite:= sprTargetButton;
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  1907
        animateWidget(@utilityWidget, true, true);
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  1908
        end
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1909
    else if utilityWidget.show then
6992
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  1910
        animateWidget(@utilityWidget, true, false);
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  1911
{$ELSE}
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  1912
ammoType:= ammoType; // avoid hint
6963
Xeli
parents: 6962
diff changeset
  1913
{$ENDIF}
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1914
end;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  1915
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1916
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1917
begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1918
with widget^ do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1919
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1920
    show:= showWidget;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1921
    if fade then fadeAnimStart:= RealTicks;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1922
    
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1923
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1924
        begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1925
        animate:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1926
        startTime:= RealTicks;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  1927
        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
  1928
        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
  1929
        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
  1930
        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
  1931
        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
  1932
        source.y:= source.y xor target.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1933
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1934
    end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1935
end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  1936
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  1937
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  1938
procedure initModule;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  1939
begin
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1940
    fpsTexture:= nil;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1941
    recTexture:= nil;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1942
    FollowGear:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1943
    WindBarWidth:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1944
    bShowAmmoMenu:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1945
    bSelected:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1946
    bShowFinger:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1947
    Frames:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1948
    WorldDx:= -512;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1949
    WorldDy:= -256;
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1950
    PrevSentPointTime:= 0;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1951
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1952
    FPS:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1953
    CountTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1954
    SoundTimerTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1955
    prevPoint.X:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1956
    prevPoint.Y:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1957
    missionTimer:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1958
    missionTex:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1959
    cOffsetY:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1960
    stereoDepth:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1961
    AMState:= AMHidden;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  1962
    isFirstFrame:= true;
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7847
diff changeset
  1963
    stereoDepth:= stereoDepth; // avoid hint
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  1964
end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1965
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  1966
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  1967
begin
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7847
diff changeset
  1968
    ResetWorldTex();
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  1969
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  1970
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1971
end.