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