hedgewars/uWorld.pas
author Wuzzy <Wuzzy2@mail.ru>
Thu, 16 May 2019 06:41:56 +0200
changeset 14988 9939134b566d
parent 14987 5a9d203f7c82
child 14989 b4f83570c514
permissions -rw-r--r--
Show more health-related icons in top right corner
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
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 11000
diff changeset
     3
 * Copyright (c) 2004-2015 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
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10080
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    17
 *)
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2619
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2619
diff changeset
    20
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    21
unit uWorld;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    22
interface
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
    23
uses SDLh, uGears, uConsts, uFloat, uRandom, uTypes, uRenderUtils;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
    24
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
    25
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
    26
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    27
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    28
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
    29
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
    30
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    31
procedure DrawWorld(Lag: LongInt);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
    32
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
2905
f3c79f7193a9 Engine:
smxx
parents: 2904
diff changeset
    33
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
13467
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
    34
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt; forceDisplay : boolean);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
    35
procedure HideMission;
13370
e202d58236b1 Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents: 13174
diff changeset
    36
procedure SetAmmoTexts(ammoType: TAmmoType; name: ansistring; caption: ansistring; description: ansistring; autoLabels: boolean);
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
    37
procedure ShakeCamera(amount: LongInt);
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
    38
procedure InitCameraBorders;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
    39
procedure InitTouchInterface;
7023
b320ff81cc73 removed the default argument in uWorld
Xeli
parents: 7022
diff changeset
    40
procedure SetUtilityWidgetState(ammoType: TAmmoType);
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
    41
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3629
diff changeset
    42
procedure MoveCamera;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
    43
procedure onFocusStateChanged;
10392
5012e1f9e893 - Support for pausing multiplayer games
alfadur
parents: 10360
diff changeset
    44
procedure updateCursorVisibility;
14562
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
    45
procedure updateTouchWidgets(ammoType: TAmmoType);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    46
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    47
implementation
4359
83ef50815535 Move variables from uMisc to uVariables
unC0Rr
parents: 4357
diff changeset
    48
uses
7721
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    49
    uStore
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    50
    , uMisc
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    51
    , uIO
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    52
    , uLocale
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    53
    , uSound
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    54
    , uAmmos
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    55
    , uVisualGears
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    56
    , uChat
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    57
    , uLandTexture
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    58
    , uVariables
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    59
    , uUtils
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    60
    , uTextures
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    61
    , uRender
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    62
    , uCaptions
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    63
    , uCursor
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    64
    , uCommands
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    65
    , uTeams
11940
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
    66
    , uDebug
14432
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
    67
    , uInputHandler
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    68
{$IFDEF USE_VIDEO_RECORDING}
7721
2b1ad418ba39 - Fix warnings and hints
unc0rr
parents: 7645
diff changeset
    69
    , uVideoRec
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
    70
{$ENDIF}
4359
83ef50815535 Move variables from uMisc to uVariables
unC0Rr
parents: 4357
diff changeset
    71
    ;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    72
10331
cb6c33839d2a cleanup and lol
sheepluva
parents: 10330
diff changeset
    73
var AMShiftTargetX, AMShiftTargetY, AMShiftX, AMShiftY, SlotsNum: LongInt;
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
    74
    AMAnimStartTime, AMState : LongInt;
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
    75
    AMAnimState: Single;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
    76
    tmpSurface: PSDL_Surface;
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
    77
    fpsTexture: PTexture;
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
    78
    timeTexture: PTexture;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    79
    FPS: Longword;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
    80
    CountTicks: Longword;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
    81
    prevPoint{, prevTargetPoint}: TPoint;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    82
    amSel: TAmmoType = amNothing;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    83
    missionTex: PTexture;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
    84
    missionTimer: LongInt;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
    85
    isFirstFrame: boolean;
7028
0f60591f3a16 old typed const moved to their proper unit
koda
parents: 7027
diff changeset
    86
    AMAnimType: LongInt;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
    87
    recTexture: PTexture;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    88
    AmmoMenuTex     : PTexture;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    89
    HorizontOffset: LongInt;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
    90
    cOffsetY: LongInt;
9557
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
    91
    WorldEnd, WorldFade : array[0..3] of HwColor4f;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
    92
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    93
const cStereo_Sky           = 0.0500;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    94
      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
    95
      cStereo_MidDistance   = 0.0175;
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    96
      cStereo_Water_distant = 0.0125;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    97
      cStereo_Land          = 0.0075;
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
    98
      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
    99
      cStereo_Outside       = -0.0400;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   100
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   101
      AMAnimDuration = 200;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   102
      AMHidden    = 0;//AMState values
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   103
      AMShowingUp = 1;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   104
      AMShowing   = 2;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   105
      AMHiding    = 3;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   106
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   107
      AMTypeMaskX     = $00000001;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   108
      AMTypeMaskY     = $00000002;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   109
      AMTypeMaskAlpha = $00000004;
8370
0c79946e96f8 Fix tons of warnings
martin_bede
parents: 8359
diff changeset
   110
      //AMTypeMaskSlide = $00000008;
8145
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   111
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   112
{$IFDEF MOBILE}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   113
      AMSlotSize = 48;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   114
{$ELSE}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   115
      AMSlotSize = 32;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   116
{$ENDIF}
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   117
      AMSlotPadding = (AMSlotSize - 32) shr 1;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   118
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   119
      cSendCursorPosTime = 50;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   120
      cCursorEdgesDist   = 100;
6408c0ba4ba1 Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents: 8138
diff changeset
   121
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   122
// helper functions to create the goal/game mode string
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   123
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   124
var t: ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   125
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   126
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   127
        begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   128
        t:= inttostr(i);
7069
bcf9d8e64e92 pas2c stuff again
unc0rr
parents: 7049
diff changeset
   129
        s:= s + FormatA(trgoal[si], t) + '|'
6492
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   130
        end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   131
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   132
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   133
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   134
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   135
begin
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   136
    if (GameFlags and gf) <> 0 then
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   137
        s:= s + trgoal[si] + '|';
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   138
    AddGoal:= s;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   139
end;
71db3c0daa0a No more nested functions in code
unc0rr
parents: 6453
diff changeset
   140
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   141
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
   142
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
   143
    cp: PClan;
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   144
    g: ansistring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   145
begin
3764
eb91c02f2d84 Engine:
smaxx
parents: 3697
diff changeset
   146
missionTimer:= 0;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
   147
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
   148
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
   149
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   150
    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
   151
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   152
        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
   153
        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
   154
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   155
            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
   156
            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
   157
            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
   158
            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
   159
            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
   160
            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
   161
                LocalClan:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   162
            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
   163
                LocalClan:= t
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   164
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   165
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   166
    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
   167
    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
   168
14787
cbdfc5b1d5b8 Don't show hog health in gfInvulnerable mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14765
diff changeset
   169
if (GameFlags and gfInvulnerable) <> 0 then
cbdfc5b1d5b8 Don't show hog health in gfInvulnerable mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14765
diff changeset
   170
    cTagsMask:= cTagsMask and (not htHealth);
cbdfc5b1d5b8 Don't show hog health in gfInvulnerable mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14765
diff changeset
   171
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   172
// 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
   173
g:= ''; // no text/things to note yet
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   174
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   175
// add custom goals from lua script if there are any
12787
a6f51ac9a3f2 Fix bad LuaGoals comparison for pas2c builds
Wuzzy <Wuzzy2@mail.ru>
parents: 12719
diff changeset
   176
if LuaGoals <> ansistring('') then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   177
    g:= LuaGoals + '|';
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   178
12072
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   179
// check different game flags
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   180
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   181
g:= AddGoal(g, gfKing, gidKing); // king?
12072
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   182
if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) then
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   183
    g:= AddGoal(g, gfAny, gidPlaceKing);
5022
d2a2f6c9b236 some final work and buggfix for Tag Team, it is now playable
Henek
parents: 4976
diff changeset
   184
g:= AddGoal(g, gfTagTeam, gidTagTeam); // tag team mode?
12072
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   185
g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   186
g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
12257
b46b4ec17f8c Add back "more wind" modifier into mission panel. Fixes regression in 10aad1cafc10
Wuzzy <almikes@aol.com>
parents: 12210
diff changeset
   187
g:= AddGoal(g, gfMoreWind, gidMoreWind);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   188
g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity?
12072
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   189
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   190
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
4132
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   191
g:= AddGoal(g, gfInfAttack, gidInfAttack);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   192
g:= AddGoal(g, gfResetWeps, gidResetWeps);
12072
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   193
g:= AddGoal(g, gfResetHealth, gidResetHealth);
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   194
g:= AddGoal(g, gfKarma, gidKarma); // karma?
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   195
g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism?
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   196
g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
10aad1cafc10 Game mode messages: New messages for PlaceHog+King; All messages get a colon to get highlighted; Reorder messages more logically
Wuzzy <almikes@aol.com>
parents: 11940
diff changeset
   197
g:= AddGoal(g, gfAISurvival, gidAISurvival);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   198
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   199
// modified damage modificator?
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   200
if cDamagePercent <> 100 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   201
    g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   202
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   203
// fade in
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   204
ScreenFade:= sfFromBlack;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   205
ScreenFadeValue:= sfMax;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   206
ScreenFadeSpeed:= 1;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   207
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   208
// modified mine timers?
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   209
if cMinesTime <> 3000 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   210
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   211
    if cMinesTime = 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   212
        g:= AddGoal(g, gfAny, gidNoMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   213
    else if cMinesTime < 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   214
        g:= AddGoal(g, gfAny, gidRandomMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   215
    else
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   216
        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   217
    end;
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   218
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   219
// if the string has been set, show it for (default timeframe) seconds
10120
b7f632c12784 Pas2C recognizes ansistrings
unc0rr
parents: 10108
diff changeset
   220
if length(g) > 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
   221
    ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0);
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   222
10331
cb6c33839d2a cleanup and lol
sheepluva
parents: 10330
diff changeset
   223
//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
   224
//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
   225
cWaveHeight:= 32;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   226
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
   227
InitCameraBorders();
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
   228
uCursor.init();
2197
a02adcdaa939 Some work on camera
unc0rr
parents: 2178
diff changeset
   229
prevPoint.X:= 0;
74
42257fee61ae - Unicode support for team and hedgehogs names
unc0rr
parents: 71
diff changeset
   230
prevPoint.Y:= cScreenHeight div 2;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   231
//prevTargetPoint.X:= 0;
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   232
//prevTargetPoint.Y:= 0;
10628
9361e7d7c410 better initial camera position
sheepluva
parents: 10627
diff changeset
   233
WorldDx:=  -(LongInt(leftX + (playWidth div 2))); // -(LAND_WIDTH div 2);// + cScreenWidth div 2;
6609
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   234
WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   235
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   236
//aligns it to the bottom of the screen, minus the border
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   237
SkyOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   238
HorizontOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   239
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   240
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
   241
AMAnimType:= AMTypeMaskX or AMTypeMaskAlpha;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   242
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   243
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   244
procedure InitCameraBorders;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   245
begin
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   246
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5);
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   247
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   248
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   249
procedure InitTouchInterface;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   250
begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   251
{$IFDEF USE_TOUCH_INTERFACE}
7167
0b3b306f129a Android: added a callback to java to determine dpi/dip how much we should scale the ui
Xeli
parents: 7086
diff changeset
   252
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   253
//positioning of the buttons
9377
48ab6dea8d2f remove old and unused getScreenDPI code
koda
parents: 9080
diff changeset
   254
buttonScale:= 1 / cDefaultZoomLevel;
6683
75a1d84ac606 small refactoring to touch screen buttons, use a record to store values, added 'offset' fields to adjust active button area
koda
parents: 6682
diff changeset
   255
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
   256
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   257
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
   258
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   259
    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
   260
    sprite:= sprJumpWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   261
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   262
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
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
   263
    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
   264
    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
   265
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   266
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   267
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   268
    active.h:= frame.h;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   269
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   270
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
   271
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
   272
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   273
    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
   274
    sprite:= sprAMWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   275
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   276
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   277
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   278
    frame.y:= cScreenHeight - Round(frame.h * 1.2);
6710
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   279
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   280
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   281
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   282
    active.h:= frame.h;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   283
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   284
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   285
with arrowLeft do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   286
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   287
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   288
    sprite:= sprArrowLeft;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   289
    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
   290
    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
   291
    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
   292
    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
   293
    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
   294
    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
   295
    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
   296
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   297
    end;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   298
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   299
with arrowRight do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   300
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   301
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   302
    sprite:= sprArrowRight;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   303
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   304
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   305
    frame.x:= -(cScreenWidth shr 1) + 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
   306
    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
   307
    active.x:= frame.x;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   308
    active.y:= frame.y;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   309
    active.w:= frame.w;
42504695122d fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents: 6706
diff changeset
   310
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   311
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   312
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
   313
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
   314
    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
   315
    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
   316
    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
   317
    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
   318
    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
   319
    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
   320
    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
   321
    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
   322
    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
   323
    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
   324
    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
   325
    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
   326
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   327
with arrowUp do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   328
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   329
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   330
    sprite:= sprArrowUp;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   331
    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
   332
    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
   333
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   334
    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
   335
    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
   336
    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
   337
    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
   338
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   339
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   340
         begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   341
         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
   342
         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
   343
         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
   344
         source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   345
         end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   346
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   347
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   348
with arrowDown do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   349
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   350
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   351
    sprite:= sprArrowDown;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   352
    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
   353
    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
   354
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   355
    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
   356
    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
   357
    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
   358
    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
   359
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   360
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   361
        begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   362
        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
   363
        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
   364
        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
   365
        source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   366
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   367
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   368
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   369
with pauseButton do
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   370
    begin
14324
2978d6405d88 Backed out changeset 8d2983ff939b
Wuzzy <Wuzzy2@mail.ru>
parents: 14323
diff changeset
   371
    show:= true;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   372
    sprite:= sprPauseButton;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   373
    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
   374
    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
   375
    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
   376
    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
   377
    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
   378
    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
   379
    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
   380
    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
   381
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   382
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   383
with utilityWidget do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   384
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   385
    show:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   386
    sprite:= sprTimerButton;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   387
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   388
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   389
    frame.x:= arrowLeft.frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   390
    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
   391
    active.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   392
    active.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   393
    active.w:= frame.w;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   394
    active.h:= frame.h;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   395
    with moveAnim do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   396
        begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   397
        target.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   398
        target.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   399
        source.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   400
        source.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   401
        end;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   402
    end;
14559
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   403
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   404
with utilityWidget2 do
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   405
    begin
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   406
    show:= false;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   407
    sprite:= sprBounceButton;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   408
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   409
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   410
    frame.x:= utilityWidget.frame.x + Round(frame.w * 1.25);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   411
    frame.y:= arrowLeft.frame.y - Round(frame.h * 1.25);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   412
    active.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   413
    active.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   414
    active.w:= frame.w;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   415
    active.h:= frame.h;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   416
    with moveAnim do
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   417
        begin
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   418
        target.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   419
        target.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   420
        source.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   421
        source.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   422
        end;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   423
    end;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
   424
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   425
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   426
end;
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   427
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
   428
// 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
   429
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
   430
begin
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   431
    FreeAndNilTexture(fpsTexture);
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   432
    FreeAndNilTexture(timeTexture);
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   433
    FreeAndNilTexture(missionTex);
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   434
    FreeAndNilTexture(recTexture);
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   435
    FreeAndNilTexture(AmmoMenuTex);
9983
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
   436
    AmmoMenuInvalidated:= true;
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
   437
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
   438
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   439
function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture;
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   440
const BORDERSIZE = 2;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   441
var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   442
    STurns: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   443
    amSurface: PSDL_Surface;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   444
    AMRect: TSDL_Rect;
14432
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   445
{$IFDEF USE_AM_NUMCOLUMN}
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   446
    tmpsurf: PSDL_Surface;
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   447
    usesDefaultSlotKeys: boolean;
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   448
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   449
begin
10141
3be894730bd6 Fix build
unc0rr
parents: 10139
diff changeset
   450
    if cOnlyStats then exit(nil);
10139
9046f69dae4c In stats-only mode:
unc0rr
parents: 10124
diff changeset
   451
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
   452
    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
   453
    for i:= 0 to cMaxSlotIndex do
12719
637b1987570e Fix first ammo row being invisible when there's only one weapon in the first row
Wuzzy <almikes@aol.com>
parents: 12708
diff changeset
   454
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
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
   455
            inc(SlotsNum);
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   456
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   457
    SlotsNumX:= SlotsNum;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   458
    SlotsNumY:= cMaxSlotAmmoIndex + 2;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   459
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   460
    inc(SlotsNumY);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   461
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   462
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   463
    SlotsNumX:= cMaxSlotAmmoIndex + 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   464
    SlotsNumY:= SlotsNum + 1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   465
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   466
    inc(SlotsNumX);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   467
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   468
{$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
   469
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   470
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   471
    AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   472
    AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   473
    amSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, AmmoRect.w, AmmoRect.h, 32, RMask, GMask, BMask, AMask);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   474
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   475
    AMRect.x:= BORDERSIZE;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   476
    AMRect.y:= BORDERSIZE;
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   477
    AMRect.w:= AmmoRect.w - (BORDERSIZE*2);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   478
    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
   479
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   480
    SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   481
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   482
    x:= AMRect.x;
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   483
    y:= AMRect.y;
14432
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   484
{$IFDEF USE_AM_NUMCOLUMN}
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   485
    usesDefaultSlotKeys:= CheckDefaultSlotKeys;
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   486
{$ENDIF USE_AM_NUMCOLUMN}
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
   487
    for i:= 0 to cMaxSlotIndex do
12719
637b1987570e Fix first ammo row being invisible when there's only one weapon in the first row
Wuzzy <almikes@aol.com>
parents: 12708
diff changeset
   488
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   489
            begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   490
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   491
            y:= AMRect.y;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   492
{$ELSE}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   493
            x:= AMRect.x;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   494
{$ENDIF}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   495
{$IFDEF USE_AM_NUMCOLUMN}
14432
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   496
            // Ammo slot number column
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   497
            if usesDefaultSlotKeys then
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   498
                // F1, F2, F3, F4, ...
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   499
                tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar('F'+IntToStr(i+1)), cWhiteColorChannels)
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   500
            else
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   501
                // 1, 2, 3, 4, ...
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14430
diff changeset
   502
                tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(IntToStr(i+1)), cWhiteColorChannels);
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   503
            copyToXY(tmpsurf, amSurface,
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   504
                     x + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.w shr 1),
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   505
                     y + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.h shr 1));
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   506
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   507
            SDL_FreeSurface(tmpsurf);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   508
    {$IFDEF USE_LANDSCAPE_AMMOMENU}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   509
            y:= AMRect.y + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   510
    {$ELSE}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   511
            x:= AMRect.x + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   512
    {$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   513
{$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   514
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   515
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
   516
            for t:=0 to cMaxSlotAmmoIndex do
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   517
                begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   518
                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
   519
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   520
                    STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   521
                    AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   522
                    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
   523
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   524
                        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
   525
                                                                 y + AMSlotPadding, AMFrame);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   526
                        if STurns < 100 then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   527
                            DrawSpriteFrame2Surf(sprTurnsLeft, amSurface,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   528
                                x + AMSlotSize-16,
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   529
                                y + AMSlotSize + 1 - 16, STurns);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   530
                        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   531
                    else //draw colored version
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   532
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   533
                        DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding,
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   534
                                                               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
   535
                        end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   536
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   537
        inc(y, AMSlotSize + 1); //the plus one is for the border
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   538
{$ELSE}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   539
        inc(x, AMSlotSize + 1);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   540
{$ENDIF}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   541
        end;
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   542
    end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   543
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   544
    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
   545
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   546
    inc(y, AMSlotSize + 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   547
{$ENDIF}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   548
    end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   549
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   550
for i:= 1 to SlotsNumX -1 do
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   551
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
   552
for i:= 1 to SlotsNumY -1 do
6652
b043665dea3d and oooone last off-by-1 in ammo menu
nemo
parents: 6650
diff changeset
   553
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
   554
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   555
//draw outer border
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   556
DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0                    , 0                    , 0);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   557
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.y             , 1);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   558
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.x             , AMRect.h + BORDERSIZE, 2);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   559
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.h + BORDERSIZE, 3);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   560
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   561
for i:=0 to BORDERSIZE-1 do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   562
begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   563
DrawLine2Surf(amSurface, BORDERSIZE, i, AMRect.w + BORDERSIZE, i,160,160,160);//top
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   564
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
   565
DrawLine2Surf(amSurface, i, BORDERSIZE, i, AMRect.h + BORDERSIZE,160,160,160);//left
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   566
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
   567
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   568
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   569
GetAmmoMenuTexture:= Surface2Tex(amSurface, false);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   570
if amSurface <> nil then SDL_FreeSurface(amSurface);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   571
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   572
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   573
procedure ShowAmmoMenu;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   574
const BORDERSIZE = 2;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   575
var Slot, Pos: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   576
    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
   577
    c,i,g,t,STurns: LongInt;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   578
begin
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   579
if TurnTimeLeft = 0 then bShowAmmoMenu:= false;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   580
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   581
// give the assigned ammo to hedgehog
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   582
Ammo:= nil;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   583
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil)
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   584
and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   585
    Ammo:= CurrentHedgehog^.Ammo
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   586
else if (LocalAmmo <> -1) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   587
    Ammo:= GetAmmoByNum(LocalAmmo);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   588
Pos:= -1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   589
if Ammo = nil then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   590
    begin
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   591
    bShowAmmoMenu:= false;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   592
    AMState:= AMHidden;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   593
    exit
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   594
    end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   595
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   596
//Init the menu
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   597
if(AmmoMenuInvalidated) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   598
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   599
    AmmoMenuInvalidated:= false;
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   600
    FreeAndNilTexture(AmmoMenuTex);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   601
    AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   602
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   603
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   604
    if isPhone() then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   605
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   606
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   607
        AmmoRect.y:= (cScreenHeight shr 1) - (AmmoRect.h shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   608
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   609
    else
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   610
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   611
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   612
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   613
        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   614
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   615
        AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   616
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   617
{$ENDIF}
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   618
    if AMState <> AMShowing then
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   619
        begin
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   620
        AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   621
        AMShiftTargetY:= cScreenHeight        - AmmoRect.y;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   622
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   623
        if (AMAnimType and AMTypeMaskX) <> 0 then AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   624
        else AMShiftTargetX:= 0;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   625
        if (AMAnimType and AMTypeMaskY) <> 0 then AMShiftTargetY:= cScreenHeight        - AmmoRect.y
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   626
        else AMShiftTargetY:= 0;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   627
7946
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   628
        AMShiftX:= AMShiftTargetX;
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   629
        AMShiftY:= AMShiftTargetY
a99a79bbd857 Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.
nemo
parents: 7858
diff changeset
   630
        end
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   631
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   632
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   633
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   634
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   635
if AMState = AMShowing then
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   636
    begin
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   637
    FollowGear:=nil;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   638
    end;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   639
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   640
if AMState = AMShowingUp then // show ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   641
    begin
14430
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   642
    // No "appear" animation in low quality or playing with very short turn time.
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   643
    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   644
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   645
        AMShiftX:= 0;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   646
        AMShiftY:= 0;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   647
        AMState:= AMShowing;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   648
        end
14430
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   649
    // "Appear" animation
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   650
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   651
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   652
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   653
            AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   654
            AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   655
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   656
                Tint($FF, $ff, $ff, Round($ff * AMAnimState));
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   657
            end
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   658
        else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   659
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   660
            AMShiftX:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   661
            AMShiftY:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   662
            CursorPoint.X:= AmmoRect.x + AmmoRect.w;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   663
            CursorPoint.Y:= AmmoRect.y;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   664
            AMState:= AMShowing;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   665
            end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   666
    end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   667
if AMState = AMHiding then // hide ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   668
    begin
14430
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   669
    // No "disappear" animation (see above)
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   670
    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   671
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   672
        AMShiftX:= AMShiftTargetX;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   673
        AMShiftY:= AMShiftTargetY;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   674
        AMState:= AMHidden;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   675
        end
14430
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14418
diff changeset
   676
    // "Disappear" animation
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   677
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   678
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   679
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   680
            AMShiftX:= Round(AMShiftTargetX * AMAnimState);
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   681
            AMShiftY:= Round(AMShiftTargetY * AMAnimState);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   682
            if (AMAnimType and AMTypeMaskAlpha) <> 0 then
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   683
                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
   684
            end
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   685
         else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   686
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   687
            AMShiftX:= AMShiftTargetX;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   688
            AMShiftY:= AMShiftTargetY;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   689
            prevPoint:= CursorPoint;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   690
            //prevTargetPoint:= TargetCursorPoint;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   691
            AMState:= AMHidden;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   692
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   693
    end;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   694
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   695
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
   696
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   697
if ((AMState = AMHiding) or (AMState = AMShowingUp)) and ((AMAnimType and AMTypeMaskAlpha) <> 0 )then
10032
db65298717da This adds idle hog tinting. Active hog tinting still needed.
nemo
parents: 10009
diff changeset
   698
    untint;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   699
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
   700
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
   701
Slot:= -1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   702
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6796
3e89dbdc7db9 You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents: 6795
diff changeset
   703
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   704
    for i:= 0 to cMaxSlotIndex do
12719
637b1987570e Fix first ammo row being invisible when there's only one weapon in the first row
Wuzzy <almikes@aol.com>
parents: 12708
diff changeset
   705
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 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
   706
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   707
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   708
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   709
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   710
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   711
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   712
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   713
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   714
                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
   715
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   716
                    if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( g    * (AMSlotSize+1))) and
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
   717
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   718
                       (CursorPoint.X >  AmmoRect.x                   + ( c    * (AMSlotSize+1))) and
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   719
                       (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
   720
                        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   721
                        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
   722
                        Pos:= t;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   723
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   724
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   725
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   726
                                       AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding,
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   727
                                       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
   728
                        end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   729
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   730
                   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
   731
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   732
{$ELSE}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   733
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   734
    for i:= 0 to cMaxSlotIndex do
12719
637b1987570e Fix first ammo row being invisible when there's only one weapon in the first row
Wuzzy <almikes@aol.com>
parents: 12708
diff changeset
   735
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   736
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   737
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   738
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   739
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   740
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   741
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   742
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   743
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   744
                if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   745
                    begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   746
                    if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( c    * (AMSlotSize+1))) and
7840
7d86dbcd6325 Fix issue 435, and also unreported bug when 2 or even 4 entries could have selection at the same time in weapons menu.
unc0rr
parents: 7721
diff changeset
   747
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   748
                       (CursorPoint.X >  AmmoRect.x                   + ( g    * (AMSlotSize+1))) and
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   749
                       (CursorPoint.X <= AmmoRect.x                   + ((g+1) * (AMSlotSize+1))) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   750
                        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   751
                        Slot:= i;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   752
                        Pos:= t;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   753
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   754
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   755
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   756
                                       AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding,
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   757
                                       AmmoRect.y + BORDERSIZE + (c  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   758
                        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   759
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   760
                   end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   761
            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
   762
{$ENDIF}
12708
5ef6780b1c05 Move amNothing from F1 slot to new special hidden weapon slot. Move amDuck to F1
Wuzzy <almikes@aol.com>
parents: 12697
diff changeset
   763
    if (Pos >= 0) and (Pos <= cMaxSlotAmmoIndex) and (Slot >= 0) and (Slot <= cMaxSlotIndex) and (Slot <> cHiddenSlotIndex) then
3967
5b9bc77acd04 Extend the >0 / amNothing check
nemo
parents: 3966
diff changeset
   764
        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   765
        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
   766
        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
   767
            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
   768
            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
   769
                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
   770
                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
   771
                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
   772
                end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   773
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   774
            DrawTexture(AmmoRect.x + (AMSlotSize shr 1),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   775
                        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
   776
                        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
   777
            if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   778
                DrawTexture(AmmoRect.x + AmmoRect.w - 20 - (CountTexz[Ammo^[Slot, Pos].Count]^.w),
13638
039ec6dd304b Fix slightly misplaced ammo count in ammo menu if count > 9
Wuzzy <Wuzzy2@mail.ru>
parents: 13637
diff changeset
   779
                            AmmoRect.y + AmmoRect.h - BORDERSIZE - (AMslotSize shr 1) - (CountTexz[Ammo^[Slot, Pos].Count]^.h shr 1),
6608
9305a12f66bf added the background for the weaponnames in MOBILE
Xeli
parents: 6607
diff changeset
   780
                            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
   781
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
   782
            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
   783
                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
   784
                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
   785
                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
   786
                bSelected:= false;
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   787
                FreeAndNilTexture(WeaponTooltipTex);
14562
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
   788
                updateTouchWidgets(Ammo^[Slot, Pos].AmmoType);
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
   789
                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
   790
                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
   791
            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
   792
        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
   793
    else
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
   794
        FreeAndNilTexture(WeaponTooltipTex);
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
   795
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   796
    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
   797
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
   798
        if (not isPhone()) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   799
            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
   800
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   801
        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
   802
{$ENDIF}
961
a9a349b2b3fa Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents: 956
diff changeset
   803
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
   804
    bSelected:= false;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   805
{$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
   806
   if (AMShiftX = 0) and (AMShiftY = 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   807
        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
   808
{$ENDIF}
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   809
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   810
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   811
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
   812
var i, w, h, lw, lh, rw, rh, sw: LongInt;
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   813
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   814
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
   815
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
   816
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   817
    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
   818
    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
   819
    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
   820
    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
   821
        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
   822
    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
   823
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   824
    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
   825
    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
   826
    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
   827
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   828
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
   829
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   830
    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
   831
    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
   832
    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
   833
    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
   834
    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
   835
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   836
        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
   837
        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
   838
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   839
    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
   840
    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
   841
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   842
    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
   843
    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
   844
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   845
        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
   846
        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
   847
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   848
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   849
    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
   850
    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
   851
        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
   852
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   853
            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
   854
            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
   855
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   856
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   857
        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
   858
            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
   859
            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
   860
            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
   861
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   862
    end
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   863
end;
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   864
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   865
956
19003f7fc174 Get rid of unused Surface parameter
unc0rr
parents: 942
diff changeset
   866
procedure DrawWorld(Lag: LongInt);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   867
begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   868
    if ZoomValue < zoom then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   869
    begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   870
        zoom:= zoom - 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   871
        if ZoomValue > zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   872
            zoom:= ZoomValue
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   873
    end
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   874
    else
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   875
        if ZoomValue > zoom then
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   876
        begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   877
        zoom:= zoom + 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   878
        if ZoomValue < zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   879
            zoom:= ZoomValue
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   880
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   881
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   882
        ZoomValue:= zoom;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2375
diff changeset
   883
9670
1954f692e8c6 Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents: 9666
diff changeset
   884
    if (not isPaused) and (not isAFK) and (GameType <> gmtRecord) then
3594
aeca3d8f1b29 turn cReducedQuality into a LongInt and provide a series of quality flags (and best of all, this is still compatible with current frontend)
koda
parents: 3582
diff changeset
   885
        MoveCamera;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
   886
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   887
    if cStereoMode = smNone then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   888
        begin
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   889
        RenderClear();
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   890
        DrawWorldStereo(Lag, rmDefault)
8138
cfb228baa598 Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents: 7946
diff changeset
   891
{$IFDEF USE_S3D_RENDERING}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   892
        end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   893
    else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   894
        begin
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   895
        // draw frame for left eye
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   896
        RenderClear(rmLeftEye);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   897
        DrawWorldStereo(Lag, rmLeftEye);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   898
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   899
        // draw frame for right eye
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   900
        RenderClear(rmRightEye);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   901
        DrawWorldStereo(0, rmRightEye);
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
   902
{$ENDIF}
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   903
        end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   904
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   905
FinishRender();
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   906
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   907
10494
0eb97cf4c78e Fix warnings given by 32-bit fpc
unC0Rr
parents: 10425
diff changeset
   908
procedure RenderWorldEdge;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   909
var
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   910
    //VertexBuffer: array [0..3] of TVertex2f;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   911
    tmp, w: LongInt;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   912
    rect: TSDL_Rect;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   913
    //c1, c2: LongWord; // couple of colours for edges
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   914
begin
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
   915
if (WorldEdge <> weNone) and (WorldEdge <> weSea) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   916
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   917
(* I think for a bounded world, will fill the left and right areas with black or something. Also will probably want various border effects/animations based on border type.  Prob also, say, trigger a border animation timer on an impact. *)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   918
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   919
    rect.y:= ViewTopY;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   920
    rect.h:= ViewHeight;
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
   921
    tmp:= leftX + WorldDx;
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   922
    w:= tmp - ViewLeftX;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   923
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   924
    if w > 0 then
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   925
        begin
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   926
        rect.w:= w;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   927
        rect.x:= ViewLeftX;
10627
07ff179b0d97 darken wrapped world etc. some more
sheepluva
parents: 10562
diff changeset
   928
        DrawRect(rect, $10, $10, $10, $80, true);
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   929
        if WorldEdge = weBounce then
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   930
            DrawLineOnScreen(tmp - 1, ViewTopY, tmp - 1, ViewBottomY, 2, $54, $54, $FF, $FF);
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   931
        end;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   932
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
   933
    tmp:= rightX + WorldDx;
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   934
    w:= ViewRightX - tmp;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   935
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   936
    if w > 0 then
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   937
        begin
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   938
        rect.w:= w;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   939
        rect.x:= tmp;
10627
07ff179b0d97 darken wrapped world etc. some more
sheepluva
parents: 10562
diff changeset
   940
        DrawRect(rect, $10, $10, $10, $80, true);
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   941
        if WorldEdge = weBounce then
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   942
            DrawLineOnScreen(tmp - 1, ViewTopY, tmp - 1, ViewBottomY, 2, $54, $54, $FF, $FF);
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   943
        end;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   944
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   945
    (*
10523
00ac079fa51f fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents: 10510
diff changeset
   946
    WARNING: the following render code is outdated and does not work with
00ac079fa51f fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents: 10510
diff changeset
   947
             current Render.pas ! - don't just uncomment without fixing it first
00ac079fa51f fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents: 10510
diff changeset
   948
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   949
    glDisable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   950
    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
   951
    if (WorldEdge = weWrap) or (worldEdge = weBounce) then
10275
6c91047f59b6 RAR: cleaning up a bit of the IFDEF-clusterf*ck
sheepluva
parents: 10265
diff changeset
   952
        glColor4ub($00, $00, $00, $40)
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   953
    else
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   954
        begin
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   955
        glEnableClientState(GL_COLOR_ARRAY);
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   956
        glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldFade[0]);
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   957
        end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   958
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   959
    glPushMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   960
    glTranslatef(WorldDx, WorldDy, 0);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   961
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   962
    VertexBuffer[0].X:= leftX-20;
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   963
    VertexBuffer[0].Y:= -3500;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   964
    VertexBuffer[1].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   965
    VertexBuffer[1].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   966
    VertexBuffer[2].X:= leftX+30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   967
    VertexBuffer[2].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   968
    VertexBuffer[3].X:= leftX+30;
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   969
    VertexBuffer[3].Y:= -3500;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   970
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   971
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   972
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   973
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   974
    VertexBuffer[0].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   975
    VertexBuffer[1].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   976
    VertexBuffer[2].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   977
    VertexBuffer[3].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   978
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   979
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   980
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   981
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   982
    glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldEnd[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   983
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   984
    VertexBuffer[0].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   985
    VertexBuffer[1].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   986
    VertexBuffer[2].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   987
    VertexBuffer[3].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   988
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   989
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   990
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   991
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   992
    VertexBuffer[0].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   993
    VertexBuffer[1].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   994
    VertexBuffer[2].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   995
    VertexBuffer[3].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   996
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   997
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   998
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   999
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1000
    glPopMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1001
    glDisableClientState(GL_COLOR_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1002
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1003
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1004
    glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1005
    glEnable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1006
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1007
    // I'd still like to have things happen to the border when a wrap or bounce just occurred, based on a timer
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1008
    if WorldEdge = weBounce then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1009
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1010
        // could maybe alternate order of these on a bounce, or maybe drop the outer ones.
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1011
        if LeftImpactTimer mod 2 = 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1012
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1013
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1014
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1015
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1016
            c1:= $FFFFFFFF; c2:= $5454FFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1017
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1018
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 7.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1019
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1020
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 3.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1021
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 1.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1022
        if RightImpactTimer mod 2 = 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1023
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1024
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1025
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1026
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1027
            c1:= $FFFFFFFF; c2:= $5454FFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1028
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1029
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 7.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1030
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1031
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 3.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1032
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 1.0, c2)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1033
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1034
    else if WorldEdge = weWrap then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1035
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1036
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-LeftImpactTimer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1037
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1038
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-RightImpactTimer));
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1039
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1040
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1041
    else
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1042
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1043
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $2E8B5780);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1044
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $2E8B5780)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1045
        end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1046
    if LeftImpactTimer > Lag then dec(LeftImpactTimer,Lag) else LeftImpactTimer:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1047
    if RightImpactTimer > Lag then dec(RightImpactTimer,Lag) else RightImpactTimer:= 0
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1048
    *)
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1049
    end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1050
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1051
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1052
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1053
procedure RenderTeamsHealth;
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1054
var t, i, h, v, smallScreenOffset, TeamHealthBarWidth : LongInt;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1055
    r: TSDL_Rect;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1056
    highlight: boolean;
13140
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1057
    hasVisibleHog: boolean;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1058
    htex: PTexture;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1059
begin
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1060
if VisibleTeamsCount * 20 > Longword(cScreenHeight) div 7 then  // take up less screen on small displays
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1061
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1062
    SetScale(1.5);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1063
    smallScreenOffset:= cScreenHeight div 6;
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1064
    if VisibleTeamsCount * 100 > Longword(cScreenHeight) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1065
        Tint($FF,$FF,$FF,$80);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1066
    end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1067
else smallScreenOffset:= 0;
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1068
v:= 0; // for updating VisibleTeamsCount
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1069
for t:= 0 to Pred(TeamsCount) do
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1070
    with TeamsArray[t]^ do
13140
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1071
      begin
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1072
      hasVisibleHog:= false;
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1073
      for i:= 0 to cMaxHHIndex do
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1074
          if (Hedgehogs[i].Gear <> nil) then
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1075
              hasVisibleHog:= true;
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1076
      if (TeamHealth > 0) and hasVisibleHog then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1077
        begin
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1078
        // count visible teams
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1079
        inc(v);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1080
        highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1081
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1082
        if highlight then
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1083
            begin
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1084
            Tint(Clan^.Color shl 8 or $FF);
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1085
            htex:= GenericHealthTexture
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1086
            end
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1087
        else
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1088
            htex:= Clan^.HealthTex;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1089
9791
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1090
        // draw owner
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1091
        if OwnerTex <> nil then
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1092
            DrawTexture(-OwnerTex^.w - NameTagTex^.w - 18, cScreenHeight + DrawHealthY + smallScreenOffset, OwnerTex);
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1093
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1094
        // draw name
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1095
        DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1096
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1097
        // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1098
        DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1099
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1100
        TeamHealthBarWidth:= cTeamHealthWidth * TeamHealthBarHealth div MaxTeamHealth;
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1101
14757
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1102
        // draw team health bar
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1103
        r.x:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1104
        r.y:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1105
        r.w:= 2 + TeamHealthBarWidth;
14762
37a781d28e43 Fix team bar height depending on NameTex
Wuzzy <Wuzzy2@mail.ru>
parents: 14760
diff changeset
  1106
        r.h:= htex^.h;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1107
        DrawTextureFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1108
14757
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1109
        // draw health bar's right border
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1110
        inc(r.x, cTeamHealthWidth + 2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1111
        r.w:= 3;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1112
        DrawTextureFromRect(TeamHealthBarWidth + 15, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1113
14757
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1114
        // draw hedgehog health separators in team health bar
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1115
        h:= 0;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1116
        if not hasGone then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1117
            for i:= 0 to cMaxHHIndex do
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1118
                begin
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1119
                inc(h, Hedgehogs[i].HealthBarHealth);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1120
                if (h < TeamHealthBarHealth) and (Hedgehogs[i].HealthBarHealth > 0) then
14757
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1121
                    if (IsTooDarkToRead(Clan^.Color)) then
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1122
                        DrawTexture(15 + h * TeamHealthBarWidth div TeamHealthBarHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture)
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1123
                    else
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1124
                        DrawTexture(15 + h * TeamHealthBarWidth div TeamHealthBarHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSliderInverted].Texture);
9720
453a1c29b7e4 Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents: 9693
diff changeset
  1125
                end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1126
13018
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1127
        // draw Lua value, if set
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1128
        if (hasLuaTeamValue) then
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1129
            DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, LuaTeamValueTex)
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1130
        // otherwise, draw AI kill counter for gfAISurvival
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1131
        else if (GameFlags and gfAISurvival) <> 0 then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1132
            DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, AIKillsTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1133
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1134
        // if highlighted, draw flag and other contents again to keep their colors
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1135
        // this approach should be faster than drawing all borders one by one tinted or not
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1136
        if highlight then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1137
            begin
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1138
            if VisibleTeamsCount * 100 > Longword(cScreenHeight) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1139
                Tint($FF,$FF,$FF,$80)
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1140
            else untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1141
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1142
            // draw name
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1143
            r.x:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1144
            r.y:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1145
            r.w:= NameTagTex^.w - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1146
            r.h:= NameTagTex^.h - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1147
            DrawTextureFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex);
10147
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1148
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1149
            if OwnerTex <> nil then
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1150
                begin
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1151
                r.w:= OwnerTex^.w - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1152
                r.h:= OwnerTex^.h - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1153
                DrawTextureFromRect(-OwnerTex^.w - NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, OwnerTex)
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1154
                end;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1155
13018
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1156
            if (hasLuaTeamValue) then
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1157
                begin
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1158
                r.w:= LuaTeamValueTex^.w - 4;
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1159
                r.h:= LuaTeamValueTex^.h - 4;
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1160
                DrawTextureFromRect(TeamHealthBarWidth + 24, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, LuaTeamValueTex);
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1161
                end
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1162
            else if (GameFlags and gfAISurvival) <> 0 then
10147
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1163
                begin
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1164
                r.w:= AIKillsTex^.w - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1165
                r.h:= AIKillsTex^.h - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1166
                DrawTextureFromRect(TeamHealthBarWidth + 24, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, AIKillsTex);
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1167
                end;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1168
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1169
            // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1170
            r.w:= 22;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1171
            r.h:= 15;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1172
            DrawTextureFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex);
10317
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1173
            end
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1174
        // draw an arrow next to active team
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1175
        else if (CurrentTeam = TeamsArray[t]) and (TurnTimeLeft > 0) then
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1176
            begin
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1177
            h:= -NameTagTex^.w - 24;
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1178
            if OwnerTex <> nil then
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1179
                h:= h - OwnerTex^.w - 4;
14757
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1180
            if (IsTooDarkToRead(TeamsArray[t]^.Clan^.Color)) then
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1181
                DrawSpriteRotatedF(sprFingerBackInv, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFingerBackInv].Width div 4, 0, 1, -90)
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1182
            else
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14590
diff changeset
  1183
                DrawSpriteRotatedF(sprFingerBack, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFingerBack].Width div 4, 0, 1, -90);
14416
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14324
diff changeset
  1184
            Tint(TeamsArray[t]^.Clan^.Color shl 8 or $FF);
10317
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1185
            DrawSpriteRotatedF(sprFinger, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFinger].Width div 4, 0, 1, -90);
14416
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14324
diff changeset
  1186
            untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1187
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1188
        end;
13140
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1189
      end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1190
if smallScreenOffset <> 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1191
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1192
    SetScale(cDefaultZoomLevel);
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1193
    if VisibleTeamsCount * 20 > Longword(cScreenHeight) div 5 then
10032
db65298717da This adds idle hog tinting. Active hog tinting still needed.
nemo
parents: 10009
diff changeset
  1194
        untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1195
    end;
13174
061d55939e47 Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents: 13156
diff changeset
  1196
VisibleTeamsCount:= v;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1197
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1198
13637
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1199
procedure RenderAttackBar();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1200
var i: LongInt;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1201
    tdx, tdy: Double;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1202
begin
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1203
    if CurrentTeam <> nil then
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1204
        case AttackBar of
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1205
        2: with CurrentHedgehog^ do
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1206
                begin
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1207
                tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1208
                tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1209
                for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1210
                    DrawSprite(sprPower,
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1211
                            hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16,
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1212
                            hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16,
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1213
                            i)
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1214
                end;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1215
        end;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1216
end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1217
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1218
var preShiftWorldDx: LongInt;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1219
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1220
procedure ShiftWorld(Dir: LongInt); inline;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1221
begin
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1222
    preShiftWorldDx:= WorldDx;
11090
874e477700d5 - Fix for "uWorld.s:4736:8: error: base register is 64-bit, but index register is not leal (%rax,%edx),%eax"
antonc27 <antonc27@mail.ru>
parents: 11000
diff changeset
  1223
    WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1224
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1225
end;
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1226
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1227
procedure UnshiftWorld(); inline;
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1228
begin
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1229
    WorldDx:= preShiftWorldDx;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1230
end;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1231
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1232
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1233
var i, t: LongInt;
11912
d3a852554aa7 Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents: 11895
diff changeset
  1234
    spr: TSprite;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1235
    r: TSDL_Rect;
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1236
    s: shortstring;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1237
    offsetX, offsetY, screenBottom: LongInt;
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1238
    replicateToLeft, replicateToRight, tmp, isNotHiddenByCinematic: boolean;
12697
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1239
{$IFDEF USE_VIDEO_RECORDING}
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1240
    a: Byte;
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1241
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1242
begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1243
if WorldEdge <> weWrap then
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1244
    begin
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1245
    replicateToLeft := false;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1246
    replicateToRight:= false;
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1247
    end
10358
sheepluva
parents: 10332
diff changeset
  1248
else
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1249
    begin
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  1250
    replicateToLeft := (leftX  + WorldDx > ViewLeftX);
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  1251
    replicateToRight:= (rightX + WorldDx < ViewRightX);
10360
c243b6a8ad9a some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents: 10359
diff changeset
  1252
    end;
10358
sheepluva
parents: 10332
diff changeset
  1253
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1254
ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1255
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1256
// note: offsetY is negative!
10319
240775460dc5 fix pas2c build
sheepluva
parents: 10318
diff changeset
  1257
offsetY:= 10 *  Min(0, -145 - ScreenBottom); // TODO limit this in the other direction too
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1258
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1259
// Sky and horizont
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1260
if (cReducedQuality and rqNoBackground) = 0 then
1812
3d4692e825e7 'Reduce quality' patch by nemo
unc0rr
parents: 1807
diff changeset
  1261
    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
  1262
        // 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
  1263
        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
  1264
        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
  1265
        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
  1266
            HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1267
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
  1268
        // background
3688
fd8c22a358de add some comments and fix indentation
koda
parents: 3686
diff changeset
  1269
        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
  1270
        if SuddenDeathDmg then
12097
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 12072
diff changeset
  1271
            Tint(SDTint.r, SDTint.g, SDTint.b, SDTint.a);
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
  1272
        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
  1273
        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
  1274
        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
  1275
        if SuddenDeathDmg then
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1276
            untint;
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1277
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1278
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1279
DrawVisualGears(0, false);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1280
ChangeDepth(RM, -cStereo_MidDistance);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1281
DrawVisualGears(4, false);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1282
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1283
if (cReducedQuality and rq2DWater) = 0 then
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1284
    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
  1285
        // Waves
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1286
        DrawWater(255, SkyOffset, 0);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1287
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1288
        DrawWaves( 1,  0 - WorldDx div 32, offsetY div 35, -49, 64);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1289
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1290
        DrawWaves( -1,  25 + WorldDx div 25, offsetY div 38, -37, 48);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1291
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1292
        DrawWaves( 1,  75 - WorldDx div 19, offsetY div 45, -23, 32);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1293
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1294
        DrawWaves(-1, 100 + WorldDx div 14, offsetY div 70, -7, 24);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1295
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1296
else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1297
    DrawWaves(-1, 100, - cWaveHeight div 2, - cWaveHeight div 2, 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1298
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1299
ChangeDepth(RM, cStereo_Land);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1300
DrawVisualGears(5, false);
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1301
DrawLand(WorldDx, WorldDy);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1302
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1303
if replicateToLeft then
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1304
    begin
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1305
    ShiftWorld(-1);
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1306
    DrawLand(WorldDx, WorldDy);
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1307
    UnshiftWorld();
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1308
    end;
1911
6283bd8a960b use glVertexPointer to render water
unc0rr
parents: 1906
diff changeset
  1309
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1310
if replicateToRight then
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1311
    begin
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1312
    ShiftWorld(1);
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1313
    DrawLand(WorldDx, WorldDy);
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1314
    UnshiftWorld();
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1315
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1316
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1317
DrawWater(255, 0, 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1318
10359
744f1151c707 one finger ought to be enough for everybody
sheepluva
parents: 10358
diff changeset
  1319
tmp:= bShowFinger;
744f1151c707 one finger ought to be enough for everybody
sheepluva
parents: 10358
diff changeset
  1320
bShowFinger:= false;
744f1151c707 one finger ought to be enough for everybody
sheepluva
parents: 10358
diff changeset
  1321
10358
sheepluva
parents: 10332
diff changeset
  1322
if replicateToLeft then
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1323
    begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1324
    ShiftWorld(-1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1325
    DrawVisualGears(1, true);
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1326
    DrawGears();
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1327
    DrawVisualGears(6, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1328
    UnshiftWorld();
10358
sheepluva
parents: 10332
diff changeset
  1329
    end;
sheepluva
parents: 10332
diff changeset
  1330
sheepluva
parents: 10332
diff changeset
  1331
if replicateToRight then
sheepluva
parents: 10332
diff changeset
  1332
    begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1333
    ShiftWorld(1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1334
    DrawVisualGears(1, true);
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1335
    DrawGears();
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1336
    DrawVisualGears(6, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1337
    UnshiftWorld();
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1338
    end;
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1339
10359
744f1151c707 one finger ought to be enough for everybody
sheepluva
parents: 10358
diff changeset
  1340
bShowFinger:= tmp;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1341
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1342
DrawVisualGears(1, false);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1343
DrawGears;
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1344
DrawVisualGears(6, false);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1345
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1346
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1347
if SuddenDeathDmg then
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1348
    DrawWater(SDWaterOpacity, 0, 0)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1349
else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1350
    DrawWater(WaterOpacity, 0, 0);
2269
00f5704f5f39 add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents: 2268
diff changeset
  1351
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1352
// Waves
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1353
ChangeDepth(RM, cStereo_Water_near);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1354
DrawWaves( 1, 25 - WorldDx div 9, 0, 0, 12);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1355
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1356
if (cReducedQuality and rq2DWater) = 0 then
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1357
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1358
    ChangeDepth(RM, cStereo_Water_near);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1359
    DrawWaves(-1, 50 + WorldDx div 6, - offsetY div 40, 23, 8);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1360
    if SuddenDeathDmg then
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1361
        DrawWater(SDWaterOpacity, - offsetY div 20, 23)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1362
    else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1363
        DrawWater(WaterOpacity, - offsetY div 20, 23);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1364
    ChangeDepth(RM, cStereo_Water_near);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1365
    DrawWaves( 1, 75 - WorldDx div 4, - offsetY div 20, 37, 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
  1366
        if SuddenDeathDmg then
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1367
            DrawWater(SDWaterOpacity, - offsetY div 10, 47)
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
  1368
        else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1369
            DrawWater(WaterOpacity, - offsetY div 10, 47);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1370
        ChangeDepth(RM, cStereo_Water_near);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1371
        DrawWaves( -1, 25 + WorldDx div 3, - offsetY div 10, 59, 0);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1372
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1373
    else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1374
        DrawWaves(-1, 50, cWaveHeight div 2, cWaveHeight div 2, 0);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1375
14590
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1376
// line at airplane height for certain airstrike types (when spawning height is important)
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1377
with CurrentHedgehog^ do
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1378
    if (isCursorVisible) and ((CurAmmoType = amNapalm) or (CurAmmoType = amMineStrike) or (((GameFlags and gfMoreWind) <> 0) and ((CurAmmoType = amDrillStrike) or (CurAmmoType = amAirAttack)))) then
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1379
        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);
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1380
0149d5ed5dc5 Fix airplane line being drawn in front of many HUD elements
Wuzzy <Wuzzy2@mail.ru>
parents: 14565
diff changeset
  1381
// gear HUD extras (fuel indicator, secondary ammo, etc.)
13635
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1382
if replicateToLeft then
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1383
    begin
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1384
    ShiftWorld(-1);
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1385
    DrawGearsGui();
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1386
    UnshiftWorld();
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1387
    end;
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1388
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1389
if replicateToRight then
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1390
    begin
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1391
    ShiftWorld(1);
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1392
    DrawGearsGui();
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1393
    UnshiftWorld();
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1394
    end;
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1395
571f8110957e Replicate gear GUI overlays in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13634
diff changeset
  1396
DrawGearsGui();
12210
442bab755bb4 Render gear timers in front of water
Wuzzy <almikes@aol.com>
parents: 12097
diff changeset
  1397
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1398
// 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
  1399
// 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
  1400
    ChangeDepth(RM, cStereo_Outside);
10358
sheepluva
parents: 10332
diff changeset
  1401
sheepluva
parents: 10332
diff changeset
  1402
    if replicateToLeft then
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1403
        begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1404
        ShiftWorld(-1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1405
        DrawVisualGears(2, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1406
        UnshiftWorld();
10358
sheepluva
parents: 10332
diff changeset
  1407
        end;
sheepluva
parents: 10332
diff changeset
  1408
sheepluva
parents: 10332
diff changeset
  1409
    if replicateToRight then
sheepluva
parents: 10332
diff changeset
  1410
        begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1411
        ShiftWorld(1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1412
        DrawVisualGears(2, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1413
        UnshiftWorld();
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1414
        end;
10358
sheepluva
parents: 10332
diff changeset
  1415
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1416
    DrawVisualGears(2, false);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1417
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1418
// 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
  1419
// 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
  1420
    ResetDepth(RM);
10358
sheepluva
parents: 10332
diff changeset
  1421
sheepluva
parents: 10332
diff changeset
  1422
    if replicateToLeft then
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1423
        begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1424
        ShiftWorld(-1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1425
        DrawVisualGears(3, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1426
        UnshiftWorld();
10358
sheepluva
parents: 10332
diff changeset
  1427
        end;
sheepluva
parents: 10332
diff changeset
  1428
sheepluva
parents: 10332
diff changeset
  1429
    if replicateToRight then
sheepluva
parents: 10332
diff changeset
  1430
        begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1431
        ShiftWorld(1);
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1432
        DrawVisualGears(3, true);
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1433
        UnshiftWorld();
10263
6ef900411158 here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents: 10251
diff changeset
  1434
        end;
10358
sheepluva
parents: 10332
diff changeset
  1435
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1436
    DrawVisualGears(3, false);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1437
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1438
// Target (e.g. air attack, bee, ...)
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1439
if (TargetPoint.X <> NoPointX) and (CurrentTeam <> nil) and (CurrentHedgehog <> nil) then
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1440
    begin
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1441
    with PHedgehog(CurrentHedgehog)^ do
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1442
        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
  1443
        if CurAmmoType = amBee then
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1444
            spr:= sprTargetBee
3110
c8d7c852e26a Engine:
smxx
parents: 3107
diff changeset
  1445
        else
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1446
            spr:= sprTargetP;
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1447
        if replicateToLeft then
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1448
            begin
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1449
            ShiftWorld(-1);
14765
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1450
            if spr = sprTargetP then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1451
                begin
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1452
                if IsTooDarkToRead(Team^.Clan^.Color) then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1453
                    DrawSpriteRotatedF(sprTargetPBackInv, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1454
                else
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1455
                    DrawSpriteRotatedF(sprTargetPBack, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1456
                Tint(Team^.Clan^.Color shl 8 or $FF);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1457
                end;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1458
            DrawSpriteRotatedF(spr, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
14765
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1459
            if spr = sprTargetP then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1460
                untint;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1461
            UnshiftWorld();
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1462
            end;
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1463
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1464
        if replicateToRight then
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1465
            begin
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1466
            ShiftWorld(1);
14765
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1467
            if spr = sprTargetP then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1468
                begin
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1469
                if IsTooDarkToRead(Team^.Clan^.Color) then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1470
                    DrawSpriteRotatedF(sprTargetPBackInv, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1471
                else
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1472
                    DrawSpriteRotatedF(sprTargetPBack, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1473
                Tint(Team^.Clan^.Color shl 8 or $FF);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1474
                end;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1475
            DrawSpriteRotatedF(spr, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
14765
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1476
            if spr = sprTargetP then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1477
                untint;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1478
            UnshiftWorld();
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1479
            end;
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1480
14765
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1481
        if spr = sprTargetP then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1482
            begin
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1483
            if IsTooDarkToRead(Team^.Clan^.Color) then
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1484
                DrawSpriteRotatedF(sprTargetPBackInv, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1485
            else
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1486
                DrawSpriteRotatedF(sprTargetPBack, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1487
            Tint(Team^.Clan^.Color shl 8 or $FF);
f5dadf2b7d03 Fix target marker rendering issues in weWrap
Wuzzy <Wuzzy2@mail.ru>
parents: 14762
diff changeset
  1488
            end;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1489
        DrawSpriteRotatedF(spr, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
14416
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14324
diff changeset
  1490
        if spr = sprTargetP then
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14324
diff changeset
  1491
            untint;
13636
fc8c8910a281 Replicate target sprite properly in world wrap
Wuzzy <Wuzzy2@mail.ru>
parents: 13635
diff changeset
  1492
        end;
3104
6cdc45b3b8a6 - Bee sprites for target and HH hand
palewolf
parents: 3093
diff changeset
  1493
    end;
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1494
13637
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1495
// Attack bar
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1496
if replicateToLeft then
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1497
    begin
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1498
    ShiftWorld(-1);
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1499
    RenderAttackBar();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1500
    UnshiftWorld();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1501
    end;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1502
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1503
if replicateToRight then
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1504
    begin
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1505
    ShiftWorld(1);
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1506
    RenderAttackBar();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1507
    UnshiftWorld();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1508
    end;
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1509
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1510
RenderAttackBar();
28e4a9db4690 Fix attack bar render bugs: Invisible beyond world edge; rendered over GUI (e.g. mission panel)
Wuzzy <Wuzzy2@mail.ru>
parents: 13636
diff changeset
  1511
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1512
// World edge
10494
0eb97cf4c78e Fix warnings given by 32-bit fpc
unC0Rr
parents: 10425
diff changeset
  1513
RenderWorldEdge();
9473
a51a69094c24 partial implementation of non-infinite world (edge wrap/warp/bounce)
nemo
parents: 9377
diff changeset
  1514
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1515
// This scale is used to keep the various widgets at the same dimension at all zoom levels
3523
6592fbb969da fix zoom smoothness
koda
parents: 3513
diff changeset
  1516
SetScale(cDefaultZoomLevel);
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1517
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1518
isNotHiddenByCinematic:= true;
14418
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1519
// Cinematic Mode: Determine effects and state
11524
c6bae7605ea4 fixing my math... I think ;p
sheepluva
parents: 11522
diff changeset
  1520
if CinematicScript or (InCinematicMode and autoCameraOn
11519
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1521
    and ((CurrentHedgehog = nil) or CurrentHedgehog^.Team^.ExtDriven
11520
663ecfb05df6 Lua API: SetCinematicMode(enable)
sheepluva
parents: 11519
diff changeset
  1522
    or (CurrentHedgehog^.BotLevel <> 0) or (GameType = gmtDemo))) then
11519
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1523
    begin
11522
17bd1c25670a minor code tweaks
sheepluva
parents: 11520
diff changeset
  1524
    if CinematicSteps < 300 then
17bd1c25670a minor code tweaks
sheepluva
parents: 11520
diff changeset
  1525
        begin
17bd1c25670a minor code tweaks
sheepluva
parents: 11520
diff changeset
  1526
        inc(CinematicSteps, Lag);
17bd1c25670a minor code tweaks
sheepluva
parents: 11520
diff changeset
  1527
        if CinematicSteps > 300 then
14418
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1528
            begin
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1529
            CinematicSteps:= 300;
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1530
            isNotHiddenByCinematic:= false;
14418
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1531
            end;
11522
17bd1c25670a minor code tweaks
sheepluva
parents: 11520
diff changeset
  1532
        end;
11519
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1533
    end
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1534
else if CinematicSteps > 0 then
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1535
    begin
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1536
    dec(CinematicSteps, Lag);
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1537
    if CinematicSteps < 0 then
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1538
        CinematicSteps:= 0;
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1539
    end;
aab4767d9a50 adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents: 11362
diff changeset
  1540
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1541
// Turn time
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1542
if (UIDisplay <> uiNone) and (isNotHiddenByCinematic) then
3774
af0e68ca273e Engine:
smaxx
parents: 3773
diff changeset
  1543
    begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1544
{$IFDEF USE_TOUCH_INTERFACE}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1545
    offsetX:= cScreenHeight - 13;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1546
{$ELSE}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1547
    offsetX:= 48;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1548
{$ENDIF}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1549
    offsetY:= cOffsetY;
11917
d819c04d0cbe Show timer at 999s instead of 1000s
Wuzzy <almikes@aol.com>
parents: 11916
diff changeset
  1550
    if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 999000)) or (ReadyTimeLeft <> 0) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1551
        begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1552
        if ReadyTimeLeft <> 0 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1553
            i:= Succ(Pred(ReadyTimeLeft) div 1000)
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1554
        else
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1555
            i:= Succ(Pred(TurnTimeLeft) div 1000);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1556
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1557
        if i>99 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1558
            t:= 112
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1559
        else if i>9 then
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1560
            t:= 96
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1561
        else
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1562
            t:= 80;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1563
        DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1564
        while i > 0 do
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1565
            begin
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1566
            dec(t, 32);
11916
38fa4583e7f3 Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents: 11913
diff changeset
  1567
            if isPaused or (not IsClockRunning()) then
38fa4583e7f3 Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents: 11913
diff changeset
  1568
                spr := sprBigDigitGray
38fa4583e7f3 Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents: 11913
diff changeset
  1569
            else if (ReadyTimeLeft <> 0) then
11912
d3a852554aa7 Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents: 11895
diff changeset
  1570
                spr := sprBigDigitGreen
11913
232b57a70aca Make the timer red when it is the get-away time
Wuzzy <almikes@aol.com>
parents: 11912
diff changeset
  1571
            else if IsGetAwayTime then
232b57a70aca Make the timer red when it is the get-away time
Wuzzy <almikes@aol.com>
parents: 11912
diff changeset
  1572
                spr := sprBigDigitRed
11912
d3a852554aa7 Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents: 11895
diff changeset
  1573
            else
d3a852554aa7 Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents: 11895
diff changeset
  1574
                spr := sprBigDigit;
d3a852554aa7 Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents: 11895
diff changeset
  1575
            DrawSprite(spr, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1576
            i:= i div 10
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1577
            end;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1578
        DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1579
        end;
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1580
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1581
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1582
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1583
// Team bars
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1584
if (UIDisplay = uiAll) and (isNotHiddenByCinematic) then
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1585
    RenderTeamsHealth;
47
8daf1ee0b9a3 Show team health bars, without sorting yet
unc0rr
parents: 39
diff changeset
  1586
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1587
// Current hedgehog health in top left corner
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1588
if ((UIDisplay = uiAll) or (UIDisplay = uiNoTeams)) and (isNotHiddenByCinematic) and
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1589
        ((GameFlags and gfInvulnerable) = 0) and
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1590
        (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1591
        (CurrentHedgehog^.HealthTagTex <> nil) and
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1592
        ((CurrentHedgehog^.Gear^.State and gstHHDriven) <> 0) then
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1593
    begin
14988
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1594
    t:= 11;
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1595
    i:= t;
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1596
{$IFDEF USE_TOUCH_INTERFACE}
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1597
    i:= t + pauseButton.frame.y + pauseButton.frame.h;
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1598
{$ENDIF}
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1599
    DrawTexture(cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - 16, i, CurrentHedgehog^.HealthTagTex);
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1600
    inc(t, CurrentHedgehog^.HealthTagTex^.h);
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1601
    cDemoClockFPSOffsetY:= t;
14988
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1602
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1603
    t:= SpritesData[sprHealthHud].Width + 18;
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1604
    // Main health icon. Appearance depends on game mode and poisoning state
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1605
    if ((GameFlags and gfResetHealth) = 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1606
        if (CurrentHedgehog^.Effects[hePoisoned] <> 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1607
            DrawSprite(sprHealthPoisonHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0)
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1608
        else
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1609
            DrawSprite(sprHealthHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0)
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1610
    else
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1611
        if (CurrentHedgehog^.Effects[hePoisoned] <> 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1612
            DrawSprite(sprMedicPoisonHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0)
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1613
        else
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1614
            DrawSprite(sprMedicHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1615
    // Put halo above health icon for resurrectable hog
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1616
    if (CurrentHedgehog^.Effects[heResurrectable] <> 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1617
        DrawSprite(sprHaloHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t - 2), i - SpritesData[sprHaloHud].Height + 1, 0);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1618
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1619
    // Additional health-related states
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1620
    inc(t, 2);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1621
    // Invulnerable
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1622
    if (CurrentHedgehog^.Effects[heInvulnerable] <> 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1623
        begin
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1624
        inc(t, SpritesData[sprInvulnHud].Width + 2);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1625
        DrawSprite(sprInvulnHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0)
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1626
        end
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1627
    // Karma
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1628
    else if ((GameFlags and gfKarma) <> 0) then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1629
        begin
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1630
        inc(t, SpritesData[sprKarmaHud].Width + 2);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1631
        DrawSprite(sprKarmaHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0)
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1632
        end;
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1633
    // Vampirism
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1634
    if cVampiric then
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1635
        begin
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1636
        inc(t, SpritesData[sprVampHud].Width + 2);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1637
        DrawSprite(sprVampHud, (cScreenWidth div 2 - CurrentHedgehog^.HealthTagTex^.w - t), i, 0);
9939134b566d Show more health-related icons in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14987
diff changeset
  1638
        end;
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1639
    end
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1640
else
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1641
    cDemoClockFPSOffsetY:= 0;
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1642
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1643
// Wind bar
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1644
if (UIDisplay <> uiNone) and (isNotHiddenByCinematic) then
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1645
    begin
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1646
{$IFDEF USE_TOUCH_INTERFACE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1647
    offsetX:= cScreenHeight - 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1648
    offsetY:= (cScreenWidth shr 1) + 74;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1649
{$ELSE}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1650
    offsetX:= 30;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1651
    offsetY:= 180;
2567
02ff5f9510b5 WE HAVE TOUCH INPUT
koda
parents: 2553
diff changeset
  1652
{$ENDIF}
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1653
    DrawSprite(sprWindBar, (cScreenWidth shr 1) - offsetY, cScreenHeight - offsetX, 0);
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1654
    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
  1655
        begin
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1656
        {$WARNINGS OFF}
14565
3105881d5840 Fix wind bar animation not looping properly
Wuzzy <Wuzzy2@mail.ru>
parents: 14563
diff changeset
  1657
        r.x:= 8 - (RealTicks shr 6) mod 9;
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1658
        {$WARNINGS ON}
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1659
        r.y:= 0;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1660
        r.w:= WindBarWidth;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1661
        r.h:= 13;
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1662
        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
  1663
        end
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1664
    else
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1665
        if WindBarWidth < 0 then
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3395
diff changeset
  1666
        begin
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1667
        {$WARNINGS OFF}
14565
3105881d5840 Fix wind bar animation not looping properly
Wuzzy <Wuzzy2@mail.ru>
parents: 14563
diff changeset
  1668
        r.x:= (Longword(WindBarWidth) + RealTicks shr 6) mod 9;
9693
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1669
        {$WARNINGS ON}
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1670
        r.y:= 0;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1671
        r.w:= - WindBarWidth;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1672
        r.h:= 13;
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1673
        DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0);
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1674
        end
9e31e3bb4476 Delete now toggles hiding team area
nemo
parents: 9670
diff changeset
  1675
    end;
5
0dafbd19a04c Show wind speed on bar
unc0rr
parents: 4
diff changeset
  1676
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1677
// Indicators for global effects (extra damage, low gravity)
14440
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14432
diff changeset
  1678
if (UIDisplay <> uiNone) and (isNotHiddenByCinematic) then
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1679
    begin
14320
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1680
{$IFDEF USE_TOUCH_INTERFACE}
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1681
    offsetX:= (cScreenWidth shr 1) - 95;
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1682
    offsetY:= cScreenHeight - 21;
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1683
{$ELSE}
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1684
    offsetX:= 45;
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1685
    offsetY:= 51;
14320
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1686
{$ENDIF}
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1687
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1688
    if cDamageModifier = _1_5 then
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1689
        begin
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1690
            DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32);
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1691
            DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amExtraDamage) - 1, 1, 32, 32);
14320
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1692
{$IFDEF USE_TOUCH_INTERFACE}
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1693
            offsetX := offsetX - 33
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1694
{$ELSE}
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1695
            offsetX := offsetX + 33
14320
5cff42e1dd92 Add status indicators (low grav / extra dmg) in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1696
{$ENDIF}
11887
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1697
        end;
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1698
    if (cLowGravity) or ((GameFlags and gfLowGravity) <> 0) then
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1699
        begin
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1700
            DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32);
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1701
            DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amLowGravity) - 1, 1, 32, 32);
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1702
        end;
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1703
    end;
083c12795632 Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents: 11881
diff changeset
  1704
14418
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1705
// Cinematic Mode: Render black bars
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1706
if CinematicSteps > 0 then
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1707
    begin
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1708
    r.x:= ViewLeftX;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1709
    r.w:= ViewWidth;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1710
    r.y:= ViewTopY;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1711
    CinematicBarH:= (ViewHeight * CinematicSteps) div 2048;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1712
    r.h:= CinematicBarH;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1713
    DrawRect(r, 0, 0, 0, $FF, true);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1714
    r.y:= ViewBottomY - r.h;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1715
    DrawRect(r, 0, 0, 0, $FF, true);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1716
    end;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1717
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1718
// Touchscreen interface widgets
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1719
{$IFDEF USE_TOUCH_INTERFACE}
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1720
DrawScreenWidget(@arrowLeft);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1721
DrawScreenWidget(@arrowRight);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1722
DrawScreenWidget(@arrowUp);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1723
DrawScreenWidget(@arrowDown);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1724
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1725
DrawScreenWidget(@fireButton);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1726
DrawScreenWidget(@jumpWidget);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1727
DrawScreenWidget(@AMWidget);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1728
DrawScreenWidget(@utilityWidget);
14559
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  1729
DrawScreenWidget(@utilityWidget2);
14418
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1730
DrawScreenWidget(@pauseButton);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1731
{$ENDIF}
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1732
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1733
// Captions
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1734
if UIDisplay <> uiNone then
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1735
    DrawCaptions;
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1736
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1737
// Lag alert
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1738
if isInLag then
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1739
    DrawSprite(sprLag, 32 - (cScreenWidth shr 1), 32, (RealTicks shr 7) mod 12);
f9a3cfdec1df Hide most HUD elements in cinematic mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14416
diff changeset
  1740
14025
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1741
// Chat
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1742
DrawChat;
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1743
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1744
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1745
// Mission panel
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1746
if not isFirstFrame and (missionTimer <> 0) or isShowMission or isPaused or fastUntilLag or (GameState = gsConfirm) then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1747
    begin
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1748
    if (ReadyTimeLeft = 0) and (missionTimer > 0) then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1749
        dec(missionTimer, Lag);
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1750
    if missionTimer < 0 then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1751
        missionTimer:= 0; // avoid subtracting below 0
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1752
    if missionTex <> nil then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1753
        DrawTextureCentered(0, Min((cScreenHeight shr 1) + 100, cScreenHeight - 48 - missionTex^.h), missionTex);
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1754
    end;
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1755
if missionTimer = 0 then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1756
    isForceMission := false;
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1757
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1758
// AmmoMenu
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1759
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
  1760
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1761
    if (AMState = AMHidden) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1762
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1763
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1764
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1765
    AMState:= AMShowingUp;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1766
    end;
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  1767
if (not bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1768
    begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1769
    if (AMState = AMShowing) then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1770
        AMAnimStartTime:= RealTicks
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1771
    else
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1772
        AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1773
    AMState:= AMHiding;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1774
    end;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1775
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
  1776
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
  1777
    ShowAmmoMenu;
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
  1778
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1779
// Centered status/menu messages (synchronizing, auto skip, pause, etc.)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1780
if fastUntilLag then
13734
b83154cc8fad Prevent pause/synchronizing/AFK mode text being rendered at the same time
Wuzzy <Wuzzy2@mail.ru>
parents: 13638
diff changeset
  1781
    DrawTextureCentered(0, (cScreenHeight shr 1), SyncTexture)
b83154cc8fad Prevent pause/synchronizing/AFK mode text being rendered at the same time
Wuzzy <Wuzzy2@mail.ru>
parents: 13638
diff changeset
  1782
else if isAFK then
b83154cc8fad Prevent pause/synchronizing/AFK mode text being rendered at the same time
Wuzzy <Wuzzy2@mail.ru>
parents: 13638
diff changeset
  1783
    DrawTextureCentered(0, (cScreenHeight shr 1), AFKTexture)
b83154cc8fad Prevent pause/synchronizing/AFK mode text being rendered at the same time
Wuzzy <Wuzzy2@mail.ru>
parents: 13638
diff changeset
  1784
else if isPaused then
6999
486db9d26e4b rename a few Draw* routines
koda
parents: 6992
diff changeset
  1785
    DrawTextureCentered(0, (cScreenHeight shr 1), PauseTexture);
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1786
14025
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1787
// Cursor
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1788
if isCursorVisible and bShowAmmoMenu then
97e48a6c2535 Draw mission panel behind ammo menu tooltip
Wuzzy <Wuzzy2@mail.ru>
parents: 14024
diff changeset
  1789
    DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  1790
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1791
// FPS and demo replay time
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
  1792
{$IFDEF USE_TOUCH_INTERFACE}
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1793
offsetY:= cDemoClockFPSOffsetY + 10 + pauseButton.frame.y + pauseButton.frame.h;
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1794
{$ELSE}
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1795
offsetY:= cDemoClockFPSOffsetY + 10;
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1796
{$ENDIF}
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1797
offsetX:= cOffsetY;
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
  1798
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
  1799
    begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1800
    inc(Frames);
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1801
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1802
    if cShowFPS or (GameType = gmtDemo) then
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1803
        inc(CountTicks, Lag);
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1804
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1805
    // Demo replay time
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1806
    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
  1807
        begin
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1808
        i:= GameTicks div 1000;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1809
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1810
        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
  1811
        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
  1812
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1813
        i:= i div 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1814
        t:= i mod 60;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1815
        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
  1816
        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
  1817
            s:= '0' + s;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1818
        s:= inttostr(i div 60) + ':' + s;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1819
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  1820
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1821
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1822
        tmpSurface:= doSurfaceConversion(tmpSurface);
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
  1823
        FreeAndNilTexture(timeTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1824
        timeTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1825
        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
  1826
        end;
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1827
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1828
    if (timeTexture <> nil) and (UIDisplay <> uiNone) then
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1829
        DrawTexture((cScreenWidth shr 1) - 20 - timeTexture^.w - offsetX, offsetY, timeTexture);
2850
f6f8db825ce7 A little clock for convenience in finding things in demos
nemo
parents: 2839
diff changeset
  1830
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1831
    // FPS counter
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1832
    if cShowFPS and (UIDisplay <> uiNone) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1833
        begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1834
        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
  1835
            begin
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1836
            FPS:= Frames;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1837
            Frames:= 0;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1838
            CountTicks:= 0;
13898
8c702a4839ec bunch more of those shortstring/ansistrings
nemo
parents: 13814
diff changeset
  1839
            s:= Format(shortstring(trmsg[sidFPS]), inttostr(FPS));
13983
9be2926890cd Support CJK fonts for sidFPS as well
Wuzzy <Wuzzy2@mail.ru>
parents: 13898
diff changeset
  1840
            tmpSurface:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(trmsg[sidFPS],fnt16)].Handle, Str2PChar(s), cWhiteColorChannels);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1841
            tmpSurface:= doSurfaceConversion(tmpSurface);
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
  1842
            FreeAndNilTexture(fpsTexture);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1843
            fpsTexture:= Surface2Tex(tmpSurface, false);
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1844
            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
  1845
            end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1846
        if fpsTexture <> nil then
14985
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1847
            begin
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1848
            if timeTexture <> nil then
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1849
                i:= fpsTexture^.h + 5
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1850
            else
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1851
                i:= 0;
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1852
            DrawTexture((cScreenWidth shr 1) - 60 - offsetX, offsetY + i, fpsTexture);
bcecb3349948 Display current health in top right corner
Wuzzy <Wuzzy2@mail.ru>
parents: 14935
diff changeset
  1853
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1854
        end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1855
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1856
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1857
// Quit Y/N question
2724
601158aaa201 redo LANDSCAPE MODE in a saner way with lots of fps
koda
parents: 2716
diff changeset
  1858
if GameState = gsConfirm then
8675
3fb25201d303 This has bothered me for the longest time. Move texture so it doesn't overlap. I'd initially had a test for isPaused, but jumping texture bothered me.
nemo
parents: 8471
diff changeset
  1859
    DrawTextureCentered(0, (cScreenHeight shr 1)-40, ConfirmTexture);
2161
0c8634241fa4 Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents: 2152
diff changeset
  1860
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1861
if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1862
    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  1863
    if (not isFirstFrame) then
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1864
        case ScreenFade of
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1865
            sfToBlack, sfToWhite:     if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1866
                                          inc(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1867
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1868
                                          ScreenFadeValue:= sfMax;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1869
            sfFromBlack, sfFromWhite: if ScreenFadeValue - Lag * ScreenFadeSpeed > 0 then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1870
                                          dec(ScreenFadeValue, Lag * ScreenFadeSpeed)
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1871
                                      else
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1872
                                          ScreenFadeValue:= 0;
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1873
            end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1874
    if ScreenFade <> sfNone then
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1875
        begin
10871
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1876
        r.x:= ViewLeftX;
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1877
        r.y:= ViewTopY;
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1878
        r.w:= ViewWidth;
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1879
        r.h:= ViewHeight;
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1880
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1881
        case ScreenFade of
10871
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1882
            sfToBlack, sfFromBlack: DrawRect(r, 0, 0, 0, ScreenFadeValue * 255 div 1000, true);
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1883
            sfToWhite, sfFromWhite: DrawRect(r, $FF, $FF, $FF, ScreenFadeValue * 255 div 1000, true);
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1884
            end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1885
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1886
        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
  1887
            ScreenFade:= sfNone
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1888
        end
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1889
    end;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1890
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1891
{$IFDEF USE_VIDEO_RECORDING}
14024
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13983
diff changeset
  1892
// During video prerecording draw red blinking circle and text 'rec'
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1893
if flagPrerecording then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1894
    begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1895
    if recTexture = nil then
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1896
        begin
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1897
        s:= 'rec';
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1898
        tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fntBig].Handle, Str2PChar(s), cWhiteColorChannels);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1899
        tmpSurface:= doSurfaceConversion(tmpSurface);
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
  1900
        FreeAndNilTexture(recTexture);
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1901
        recTexture:= Surface2Tex(tmpSurface, false);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1902
        SDL_FreeSurface(tmpSurface)
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1903
        end;
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1904
    DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture);
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1905
14935
9ab78e08a34c Fix Pas2C unable to compile with VIDEOREC
Wuzzy <Wuzzy2@mail.ru>
parents: 14830
diff changeset
  1906
    t:= -255 + ((RealTicks div 2) and 511);
9ab78e08a34c Fix Pas2C unable to compile with VIDEOREC
Wuzzy <Wuzzy2@mail.ru>
parents: 14830
diff changeset
  1907
    a:= Byte(min(255, abs(t)));
10871
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1908
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1909
    // draw red circle
10871
570af168cc74 rendering tweaks cont.
sheepluva
parents: 10870
diff changeset
  1910
    DrawCircleFilled(-(cScreenWidth shr 1) + 30, 35, 10, $FF, $00, $00, a);
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1911
    end;
7198
5debd5fe526e 1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents: 7194
diff changeset
  1912
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  1913
3123
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1914
SetScale(zoom);
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1915
b0a02930a1dc Engine:
smxx
parents: 3113
diff changeset
  1916
// Cursor
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1917
if isCursorVisible and (not bShowAmmoMenu) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1918
    begin
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1919
    if not CurrentTeam^.ExtDriven then TargetCursorPoint:= CursorPoint;
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1920
    with CurrentHedgehog^ do
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1921
        if (Gear <> nil) and ((Gear^.State and gstChooseTarget) <> 0) then
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1922
            begin
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1923
        i:= GetCurAmmoEntry(CurrentHedgehog^)^.Pos;
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1924
        with Ammoz[CurAmmoType] do
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1925
            if PosCount > 1 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1926
                begin
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1927
                if (CurAmmoType = amGirder) or (CurAmmoType = amTeleport) then
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10160
diff changeset
  1928
                    begin
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1929
                // pulsating transparency
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1930
                    if ((GameTicks div 16) mod $80) >= $40 then
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1931
                        Tint($FF, $FF, $FF, $C0 - (GameTicks div 16) mod $40)
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1932
                    else
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1933
                        Tint($FF, $FF, $FF, $80 + (GameTicks div 16) mod $40);
10251
a3b42e81803c collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents: 10160
diff changeset
  1934
                    end;
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1935
                DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1936
                Untint();
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1937
                end;
10978
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1938
            end;
54a49174dbec cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents: 10939
diff changeset
  1939
    DrawTextureF(SpritesData[sprArrow].Texture, cDefaultZoomLevel / cScaleFactor, TargetCursorPoint.X + round(SpritesData[sprArrow].Width / cScaleFactor), cScreenHeight + round(SpritesData[sprArrow].Height / cScaleFactor) - TargetCursorPoint.Y, (RealTicks shr 6) mod 8, 1, SpritesData[sprArrow].Width, SpritesData[sprArrow].Height);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1940
    end;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7946
diff changeset
  1941
10304
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1942
// debug stuff
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1943
if cViewLimitsDebug then
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1944
    begin
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1945
    r.x:= ViewLeftX;
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1946
    r.y:= ViewTopY;
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1947
    r.w:= ViewWidth;
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1948
    r.h:= ViewHeight;
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1949
    DrawRect(r, 255, 0, 0, 128, false);
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1950
    end;
7e40820b7ed6 fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents: 10300
diff changeset
  1951
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
  1952
isFirstFrame:= false
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1953
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1954
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1955
var PrevSentPointTime: LongWord = 0;
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  1956
79
29b477319854 - New test map
unc0rr
parents: 75
diff changeset
  1957
procedure MoveCamera;
10939
55ed72ad3a57 reduce volume a bit more. also fix engine hint
sheepluva
parents: 10917
diff changeset
  1958
var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY, dstX: LongInt;
9755
6306b54dd8fc don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
sheepluva
parents: 9720
diff changeset
  1959
    inbtwnTrgtAttks: Boolean;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1960
begin
5502
0d1a1aeed00a changed iphone specific ifdefs to mobile
Xeli
parents: 5495
diff changeset
  1961
{$IFNDEF MOBILE}
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  1962
if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
  1963
    uCursor.updatePosition();
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3537
diff changeset
  1964
{$ENDIF}
5852
nemo
parents: 5851
diff changeset
  1965
z:= round(200/zoom);
13622
358ccb060cb3 Backed out changeset 0c797469d16d
Wuzzy <Wuzzy2@mail.ru>
parents: 13621
diff changeset
  1966
inbtwnTrgtAttks := ((GameFlags and gfInfAttack) <> 0) and (CurrentHedgehog <> nil) and ((CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear <> FollowGear)) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0);
9954
bf51bc7e2808 - Fix build via pas2c
unc0rr
parents: 9952
diff changeset
  1967
if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then
7187
aff30d80bd7b - Allow camera movement while current hedgehog is falling
unc0rr
parents: 7167
diff changeset
  1968
    if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1969
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1970
        FollowGear:= nil;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1971
        prevPoint:= CursorPoint;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  1972
        exit
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1973
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  1974
    else
6296
0cd63375e80b not sure why this condition wasn't here before
nemo
parents: 6289
diff changeset
  1975
        begin
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1976
            dstX:= hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx;
10662
e0d7d499c851 make camera in wrap mode a bit smarter
sheepluva
parents: 10634
diff changeset
  1977
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1978
            if (WorldEdge = weWrap) then
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1979
                begin
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  1980
                    if dstX - prevPoint.X < (leftX - rightX) div 2 then
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1981
                        CursorPoint.X:= (prevPoint.X * 7 + dstX - (leftX - rightX)) div 8
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  1982
                    else if dstX - prevPoint.X > (rightX - leftX) div 2 then
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1983
                        CursorPoint.X:= (prevPoint.X * 7 + dstX - (rightX - leftX)) div 8
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1984
                    else
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1985
                        CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8;
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1986
                end
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1987
            else // usual camera movement routine
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1988
                begin
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1989
                    CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8;
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1990
                end;
10160
4608f10ae65f - Make world wrap edges not depend on gear radius
unc0rr
parents: 10147
diff changeset
  1991
11156
efea685933ae fix pas2c build, it was broken in the long long ago ( 97f9a25024e6 )
sheepluva
parents: 11151
diff changeset
  1992
        if isPhone() or (cScreenHeight < 600) or (hwFloat(FollowGear^.dY * z).Round < 10) then
6016
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1993
            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
  1994
        else
85410eef7ba4 disable the followgear vertical offset for small screen devices
koda
parents: 6011
diff changeset
  1995
            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
  1996
        end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1997
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1998
if (WorldEdge = weWrap) then
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  1999
    begin
14303
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  2000
        if -WorldDx < leftX then
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  2001
            WorldDx:= WorldDx - rightX + leftX
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  2002
        else if -WorldDx > rightX then
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14302
diff changeset
  2003
            WorldDx:= WorldDx + rightX - leftX;
10917
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  2004
    end;
97f9a25024e6 - ?Fix? nemo's attempt in r959219241c67
unc0rr
parents: 10871
diff changeset
  2005
11524
c6bae7605ea4 fixing my math... I think ;p
sheepluva
parents: 11522
diff changeset
  2006
wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - (cVisibleWater + trunc(CinematicBarH / (cScaleFactor / 2.0)));
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2007
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
  2008
    WorldDy:= wdy;
2375
99f05a01a6a3 Don't allow to look too deep
unc0rr
parents: 2374
diff changeset
  2009
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2010
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
  2011
    exit;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2012
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
  2013
if (AMState = AMShowingUp) or (AMState = AMShowing) then
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2014
begin
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2015
{$IFDEF USE_LANDSCAPE_AMMOMENU}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2016
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2017
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2018
    amNumOffsetY:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2019
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2020
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2021
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2022
{$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2023
    amNumOffsetY:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2024
    {$IFDEF USE_AM_NUMCOLUMN}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2025
    amNumOffsetX:= AMSlotSize;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2026
    {$ELSE}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2027
    amNumOffsetX:= 0;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2028
    {$ENDIF}
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2029
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2030
{$ENDIF}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  2031
    if CursorPoint.X < AmmoRect.x + amNumOffsetX + 3 then//check left
7841
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2032
        CursorPoint.X:= AmmoRect.x + amNumOffsetX + 3;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2033
    if CursorPoint.X > AmmoRect.x + AmmoRect.w - 3 then//check right
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2034
        CursorPoint.X:= AmmoRect.x + AmmoRect.w - 3;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2035
    if CursorPoint.Y > cScreenHeight - AmmoRect.y -amNumOffsetY - 1 then//check top
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2036
        CursorPoint.Y:= cScreenHeight - AmmoRect.y - amNumOffsetY - 1;
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2037
    if CursorPoint.Y < cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5) then//check bottom
43e68ac28d79 apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents: 7840
diff changeset
  2038
        CursorPoint.Y:= cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2039
    prevPoint:= CursorPoint;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2040
    exit
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2041
end;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
  2042
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2043
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
  2044
    begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2045
    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
  2046
        begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2047
        SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2048
        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
  2049
        end;
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2050
    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
  2051
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2052
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2053
    EdgesDist:= cGearScrEdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2054
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2055
// this generates the border around the screen that moves the camera when cursor is near it
8373
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  2056
if (CurrentTeam^.ExtDriven and isCursorVisible and autoCameraOn) or
209c9ba77a09 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents: 8370
diff changeset
  2057
   (not CurrentTeam^.ExtDriven and isCursorVisible) or ((FollowGear <> nil) and autoCameraOn) then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2058
    begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2059
    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
  2060
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2061
        WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2062
        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
  2063
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2064
    else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2065
        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
  2066
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2067
            WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2068
            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
  2069
            end;
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  2070
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  2071
    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
  2072
    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
  2073
        begin
5149
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  2074
        WorldDy:= WorldDy + CursorPoint.Y - shs;
9aa840fdf922 Try to allow cursor to reach water when zooming out
unc0rr
parents: 5022
diff changeset
  2075
        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
  2076
        end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2077
    else
5302
eaa445230124 Fix camera jerking on zoom in
unc0rr
parents: 5294
diff changeset
  2078
        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
  2079
            begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2080
           WorldDy:= WorldDy + CursorPoint.Y - cScreenHeight + EdgesDist;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2081
           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
  2082
            end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2083
    end
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2084
else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2085
    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
  2086
        begin
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2087
        WorldDx:= WorldDx - CursorPoint.X + prevPoint.X;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2088
        WorldDy:= WorldDy + CursorPoint.Y - prevPoint.Y;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2089
        CursorPoint.X:= 0;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2090
        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
  2091
        end;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 308
diff changeset
  2092
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3663
diff changeset
  2093
// this moves the camera according to CursorPoint X and Y
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2094
prevPoint:= CursorPoint;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2095
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
  2096
    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
  2097
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
  2098
    WorldDy:= wdy;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2099
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
  2100
    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
  2101
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
  2102
    WorldDx:= 1024;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2103
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2104
2905
f3c79f7193a9 Engine:
smxx
parents: 2904
diff changeset
  2105
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
13467
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2106
begin
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2107
    ShowMission(caption, subcaption, text, icon, time, false);
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2108
end;
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2109
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2110
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt; forceDisplay : boolean);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2111
var r: TSDL_Rect;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2112
begin
10139
9046f69dae4c In stats-only mode:
unc0rr
parents: 10124
diff changeset
  2113
if cOnlyStats then exit;
9046f69dae4c In stats-only mode:
unc0rr
parents: 10124
diff changeset
  2114
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2115
r.w:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2116
r.h:= 32;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2117
13467
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2118
// If true, then mission panel cannot be hidden by releasing the mission panel key.
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2119
// Is in effect until timer runs out, is hidden with HideMission or ShowMission is called with forceDisplay=false.
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2120
isForceMission := forceDisplay;
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2121
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2122
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
  2123
    time:= 5000;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2124
missionTimer:= time;
10634
35d059bd0932 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents: 10628
diff changeset
  2125
FreeAndNilTexture(missionTex);
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2126
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2127
if icon > -1 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2128
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2129
    r.x:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2130
    r.y:= icon * 32;
10124
aabd1b75d5a3 Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents: 10122
diff changeset
  2131
    missionTex:= RenderHelpWindow(caption, subcaption, text, ansistring(''), 0, MissionIcons, @r)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2132
    end
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2133
else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2134
    begin
4626
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  2135
    r.x:= ((-icon - 1) shr 4) * 32;
775f43e90383 fixed showmission so it actually displays the right icons
Henek
parents: 4482
diff changeset
  2136
    r.y:= ((-icon - 1) mod 16) * 32;
10124
aabd1b75d5a3 Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents: 10122
diff changeset
  2137
    missionTex:= RenderHelpWindow(caption, subcaption, text, ansistring(''), 0, SpritesData[sprAMAmmos].Surface, @r)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
  2138
    end;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2139
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2140
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2141
procedure HideMission;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2142
begin
3045
41732f986b4f Clean Augean stables
unc0rr
parents: 3038
diff changeset
  2143
    missionTimer:= 0;
13467
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13465
diff changeset
  2144
    isForceMission:= false;
2786
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2145
end;
85f6425a4d74 Engine:
smxx
parents: 2765
diff changeset
  2146
13370
e202d58236b1 Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents: 13174
diff changeset
  2147
procedure SetAmmoTexts(ammoType: TAmmoType; name: ansistring; caption: ansistring; description: ansistring; autoLabels: boolean);
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2148
var
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2149
    ammoStrId: TAmmoStrId;
11940
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2150
    ammoStr: ansistring;
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2151
    tmpsurf: PSDL_Surface;
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2152
begin
13814
fdae1ed9b6db Fix SetAmmoTexts not working in stats-only mode
unc0rr
parents: 13734
diff changeset
  2153
    if cOnlyStats then exit;
fdae1ed9b6db Fix SetAmmoTexts not working in stats-only mode
unc0rr
parents: 13734
diff changeset
  2154
    
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2155
    ammoStrId := Ammoz[ammoType].NameId;
11940
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2156
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2157
    trluaammo[ammoStrId] := name;
11940
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2158
    if length(trluaammo[ammoStrId]) > 0 then
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2159
        ammoStr:= trluaammo[ammoStrId]
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2160
    else
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2161
        ammoStr:= trammo[ammoStrId];
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2162
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2163
    if checkFails(length(ammoStr) > 0,'No default text/translation found for ammo type #' + intToStr(ord(ammoType)) + '!',true) then exit;
13814
fdae1ed9b6db Fix SetAmmoTexts not working in stats-only mode
unc0rr
parents: 13734
diff changeset
  2164
11940
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2165
    tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(ammoStr,fnt16)].Handle, PChar(ammoStr), cWhiteColorChannels);
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2166
    if checkFails(tmpsurf <> nil,'Name-texture creation for ammo type #' + intToStr(ord(ammoType)) + ' failed!',true) then exit;
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2167
    tmpsurf:= doSurfaceConversion(tmpsurf);
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2168
    FreeAndNilTexture(Ammoz[ammoType].NameTex);
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2169
    Ammoz[ammoType].NameTex:= Surface2Tex(tmpsurf, false);
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2170
    SDL_FreeSurface(tmpsurf);
156f1866b8bd Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
  2171
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2172
    trluaammoc[ammoStrId] := caption;
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2173
    trluaammod[ammoStrId] := description;
13370
e202d58236b1 Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents: 13174
diff changeset
  2174
    trluaammoe[ammoStrId] := autoLabels;
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2175
end;
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11917
diff changeset
  2176
6011
519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents: 5862
diff changeset
  2177
procedure ShakeCamera(amount: LongInt);
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  2178
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2179
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
  2180
    exit;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  2181
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
  2182
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
  2183
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
  2184
//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
  2185
//CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2))
3032
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  2186
end;
9c190d3c165b Insert commit message here
palewolf
parents: 3025
diff changeset
  2187
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2188
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2189
procedure onFocusStateChanged;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2190
begin
9688
98024c99e58d - Fix TryPut, so really large maps could load
unc0rr
parents: 9686
diff changeset
  2191
{$IFDEF MOBILE}
13224
01ab48b253ef - Pause game when it goes background (do not show anymore annoying 'confirm quit')
antonc27 <antonc27@mail.ru>
parents: 12831
diff changeset
  2192
if (not cHasFocus) and (not isPaused) then
01ab48b253ef - Pause game when it goes background (do not show anymore annoying 'confirm quit')
antonc27 <antonc27@mail.ru>
parents: 12831
diff changeset
  2193
    ParseCommand('pause', true);
7847
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2194
// when created SDL receives an exposure event that calls UndampenAudio at full power, muting audio
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2195
exit;
a595d4f4837d disable audio dampening on mobile
koda
parents: 7841
diff changeset
  2196
{$ENDIF}
13224
01ab48b253ef - Pause game when it goes background (do not show anymore annoying 'confirm quit')
antonc27 <antonc27@mail.ru>
parents: 12831
diff changeset
  2197
if (not cHasFocus) and (GameState <> gsConfirm) then
01ab48b253ef - Pause game when it goes background (do not show anymore annoying 'confirm quit')
antonc27 <antonc27@mail.ru>
parents: 12831
diff changeset
  2198
    ParseCommand('quit', true);
6862
87e060b69926 when focus is lost lower the volume to a minimum
koda
parents: 6806
diff changeset
  2199
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  2200
{$IFDEF USE_VIDEO_RECORDING}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2201
// do not change volume during prerecording as it will affect sound in video file
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  2202
if (not flagPrerecording) then
7286
068adc6948e3 remaining IFDEFs
Stepan777 <stepik-777@mail.ru>
parents: 7278
diff changeset
  2203
{$ENDIF}
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2204
    begin
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
  2205
    if (not cHasFocus) then DampenAudio()
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2206
    else UndampenAudio();
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2207
    end;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2208
end;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2209
10392
5012e1f9e893 - Support for pausing multiplayer games
alfadur
parents: 10360
diff changeset
  2210
procedure updateCursorVisibility;
10510
9329dab04490 some whitespace fixes
sheepluva
parents: 10507
diff changeset
  2211
begin
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2212
    if isPaused or isAFK or (GameState = gsConfirm) then
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2213
        begin
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2214
{$IFNDEF USE_TOUCH_INTERFACE}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2215
        SDL_SetRelativeMouseMode(SDL_FALSE);
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2216
{$ENDIF}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2217
        if SDL_ShowCursor(SDL_QUERY) = SDL_DISABLE then
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2218
            begin
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2219
            uCursor.resetPosition;
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2220
{$IFNDEF USE_TOUCH_INTERFACE}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2221
            SDL_ShowCursor(SDL_ENABLE);
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2222
{$ENDIF}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2223
            end;
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2224
        end
10392
5012e1f9e893 - Support for pausing multiplayer games
alfadur
parents: 10360
diff changeset
  2225
    else
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2226
        begin
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2227
        uCursor.resetPositionDelta;
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2228
{$IFNDEF USE_TOUCH_INTERFACE}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2229
        SDL_ShowCursor(SDL_DISABLE);
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2230
        SDL_SetRelativeMouseMode(SDL_TRUE);
14830
c2793ff4e887 Fix camera jumping around in touchscreen mode
Wuzzy <Wuzzy2@mail.ru>
parents: 14829
diff changeset
  2231
{$ENDIF}
14829
9443dc6663ba Refactor mouse movement handling
Wuzzy <Wuzzy2@mail.ru>
parents: 14787
diff changeset
  2232
        end;
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2233
end;
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2234
14562
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2235
procedure updateTouchWidgets(ammoType: TAmmoType);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2236
begin
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2237
{$IFDEF USE_TOUCH_INTERFACE}
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2238
//show the aiming buttons + animation
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2239
if (Ammoz[ammoType].Ammo.Propz and ammoprop_NeedUpDown) <> 0 then
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2240
    begin
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2241
    if (not arrowUp.show) then
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2242
        begin
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2243
        animateWidget(@arrowUp, true, true);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2244
        animateWidget(@arrowDown, true, true);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2245
        end;
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2246
    end
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2247
else
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2248
    if arrowUp.show then
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2249
        begin
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2250
        animateWidget(@arrowUp, true, false);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2251
        animateWidget(@arrowDown, true, false);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2252
        end;
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2253
SetUtilityWidgetState(ammoType);
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2254
{$ELSE}
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2255
ammoType:= ammoType; // avoid hint
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2256
{$ENDIF}
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2257
end;
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14559
diff changeset
  2258
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2259
procedure SetUtilityWidgetState(ammoType: TAmmoType);
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2260
begin
7086
e99944b25764 android typo/sabotage
Xeli
parents: 7069
diff changeset
  2261
{$IFDEF USE_TOUCH_INTERFACE}
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2262
if(ammoType = amNothing)then
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2263
    ammoType:= CurrentHedgehog^.CurAmmoType;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2264
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2265
if(CurrentHedgehog <> nil)then
11211
1fa57188a469 - Workaround for wrong sprite in utility widget when selecting DrillStrike
antonc27 <antonc27@mail.ru>
parents: 11210
diff changeset
  2266
    if ((Ammoz[ammoType].Ammo.Propz and ammoprop_Timerable) <> 0) and (ammoType <> amDrillStrike) then
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2267
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2268
        utilityWidget.sprite:= sprTimerButton;
14563
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2269
        if (not utilityWidget.show) then
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2270
            animateWidget(@utilityWidget, true, true);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  2271
        end
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2272
    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
  2273
        begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2274
        utilityWidget.sprite:= sprTargetButton;
14563
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2275
        if (not utilityWidget.show) then
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2276
            animateWidget(@utilityWidget, true, true);
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2277
        end
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2278
    else if ammoType = amSwitch then
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2279
        begin
11210
22f2e072d31e - Target button added to mobile touch controls
antonc27 <antonc27@mail.ru>
parents: 11156
diff changeset
  2280
        utilityWidget.sprite:= sprSwitchButton;
14563
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2281
        if (not utilityWidget.show) then
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2282
            animateWidget(@utilityWidget, true, true);
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
  2283
        end
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2284
    else if utilityWidget.show then
6992
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2285
        animateWidget(@utilityWidget, true, false);
14559
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2286
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2287
    if ((Ammoz[ammoType].Ammo.Propz and ammoprop_SetBounce) <> 0) then
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2288
        begin
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2289
        utilityWidget2.sprite:= sprBounceButton;
14563
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2290
        if (not utilityWidget2.show) then
e68b91abbcf5 Tweak appear/disappear animation of touch widgets
Wuzzy <Wuzzy2@mail.ru>
parents: 14562
diff changeset
  2291
            animateWidget(@utilityWidget2, true, true);
14559
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2292
        end
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2293
    else if utilityWidget2.show then
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14440
diff changeset
  2294
        animateWidget(@utilityWidget2, true, false);
6992
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2295
{$ELSE}
b8f3d8991e92 marked a couple of functions as inline
koda
parents: 6986
diff changeset
  2296
ammoType:= ammoType; // avoid hint
6963
Xeli
parents: 6962
diff changeset
  2297
{$ENDIF}
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2298
end;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
  2299
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2300
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2301
begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2302
with widget^ do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2303
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2304
    show:= showWidget;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2305
    if fade then fadeAnimStart:= RealTicks;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
  2306
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2307
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2308
        begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2309
        animate:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2310
        startTime:= RealTicks;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
  2311
        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
  2312
        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
  2313
        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
  2314
        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
  2315
        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
  2316
        source.y:= source.y xor target.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2317
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2318
    end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2319
end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
  2320
5521
3be9fda5c3c2 Enter gsConfirm state when loosing focus
unc0rr
parents: 5485
diff changeset
  2321
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  2322
procedure initModule;
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  2323
begin
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2324
    fpsTexture:= nil;
7180
53ffc8853008 here it is
Stepan777 <stepik-777@mail.ru>
parents: 7167
diff changeset
  2325
    recTexture:= nil;
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2326
    FollowGear:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2327
    WindBarWidth:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2328
    bShowAmmoMenu:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2329
    bSelected:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2330
    bShowFinger:= false;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2331
    Frames:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2332
    WorldDx:= -512;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2333
    WorldDy:= -256;
7343
ddb196c41387 It is global var
unc0rr
parents: 7237
diff changeset
  2334
    PrevSentPointTime:= 0;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  2335
7027
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2336
    FPS:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2337
    CountTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2338
    SoundTimerTicks:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2339
    prevPoint.X:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2340
    prevPoint.Y:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2341
    missionTimer:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2342
    missionTex:= nil;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2343
    cOffsetY:= 0;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2344
    AMState:= AMHidden;
f264ad9d8965 the scope cleanup continues...
koda
parents: 7023
diff changeset
  2345
    isFirstFrame:= true;
9557
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2346
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2347
    FillChar(WorldFade, sizeof(WorldFade), 0);
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2348
    WorldFade[0].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2349
    WorldFade[1].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2350
    FillChar(WorldEnd, sizeof(WorldEnd), 0);
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2351
    WorldEnd[0].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2352
    WorldEnd[1].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2353
    WorldEnd[2].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2354
    WorldEnd[3].a:= 255;
a5005b7ca305 differentiate borders a bit
nemo
parents: 9485
diff changeset
  2355
9983
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
  2356
    AmmoMenuTex:= nil;
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
  2357
    AmmoMenuInvalidated:= true
2699
249adefa9c1c replace initialization/finalization statements with custom init functions
koda
parents: 2682
diff changeset
  2358
end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2359
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3032
diff changeset
  2360
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2361
begin
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7847
diff changeset
  2362
    ResetWorldTex();
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2363
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2713
diff changeset
  2364
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  2365
end.