hedgewars/uWorld.pas
author Wuzzy <Wuzzy2@mail.ru>
Tue, 02 Apr 2019 01:34:13 +0200
changeset 14741 37a781d28e43
parent 14739 5d5d7db9f417
child 14744 f5dadf2b7d03
permissions -rw-r--r--
Fix team bar height depending on NameTex
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);
13461
854caa3c9212 Lua API: Add parameter forceDisplay to ShowMission to prevent manual hiding
Wuzzy <Wuzzy2@mail.ru>
parents: 13459
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;
14541
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14538
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
14411
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14409
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
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   169
// 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
   170
g:= ''; // no text/things to note yet
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   171
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   172
// 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
   173
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
   174
    g:= LuaGoals + '|';
4883
7cddc9201a1d added dummy for tardis and ugly icons for tardis and structure
Henek
parents: 4850
diff changeset
   175
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
   176
// 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
   177
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   178
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
   179
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
   180
    g:= AddGoal(g, gfAny, gidPlaceKing);
5022
d2a2f6c9b236 some final work and buggfix for Tag Team, it is now playable
Henek
parents: 4976
diff changeset
   181
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
   182
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
   183
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
   184
g:= AddGoal(g, gfMoreWind, gidMoreWind);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   185
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
   186
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   187
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
4132
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   188
g:= AddGoal(g, gfInfAttack, gidInfAttack);
ca33a3737064 Add some more game goals. Sorry translators.
nemo
parents: 4003
diff changeset
   189
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
   190
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
   191
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
   192
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
   193
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
   194
g:= AddGoal(g, gfAISurvival, gidAISurvival);
2958
e6f7620da87e Engine:
smxx
parents: 2948
diff changeset
   195
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   196
// modified damage modificator?
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   197
if cDamagePercent <> 100 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   198
    g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   199
3107
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   200
// fade in
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   201
ScreenFade:= sfFromBlack;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   202
ScreenFadeValue:= sfMax;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   203
ScreenFadeSpeed:= 1;
1fa539758c10 Engine:
smxx
parents: 3104
diff changeset
   204
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   205
// modified mine timers?
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   206
if cMinesTime <> 3000 then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   207
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   208
    if cMinesTime = 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   209
        g:= AddGoal(g, gfAny, gidNoMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   210
    else if cMinesTime < 0 then
4003
ca0600ab38bf disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents: 3976
diff changeset
   211
        g:= AddGoal(g, gfAny, gidRandomMineTimer)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   212
    else
4482
34393349f96e Restore millisecond precision for mines time
nemo
parents: 4393
diff changeset
   213
        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   214
    end;
2908
bd1909984a09 Engine:
smxx
parents: 2905
diff changeset
   215
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   216
// if the string has been set, show it for (default timeframe) seconds
10120
b7f632c12784 Pas2C recognizes ansistrings
unc0rr
parents: 10108
diff changeset
   217
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
   218
    ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0);
2863
9eb53b1f1842 Engine:
smxx
parents: 2857
diff changeset
   219
10331
cb6c33839d2a cleanup and lol
sheepluva
parents: 10330
diff changeset
   220
//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
   221
//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
   222
cWaveHeight:= 32;
2292
87af4ad0ec98 New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents: 2290
diff changeset
   223
5682
06d5f561f772 some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents: 5675
diff changeset
   224
InitCameraBorders();
5191
c7000a6b397b - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents: 5149
diff changeset
   225
uCursor.init();
2197
a02adcdaa939 Some work on camera
unc0rr
parents: 2178
diff changeset
   226
prevPoint.X:= 0;
74
42257fee61ae - Unicode support for team and hedgehogs names
unc0rr
parents: 71
diff changeset
   227
prevPoint.Y:= cScreenHeight div 2;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   228
//prevTargetPoint.X:= 0;
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   229
//prevTargetPoint.Y:= 0;
10628
9361e7d7c410 better initial camera position
sheepluva
parents: 10627
diff changeset
   230
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
   231
WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   232
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   233
//aligns it to the bottom of the screen, minus the border
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   234
SkyOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   235
HorizontOffset:= 0;
5861b2cc991f minor cleanup, gather AMSlotSize in uConsts
koda
parents: 6608
diff changeset
   236
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   237
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
   238
AMAnimType:= AMTypeMaskX or AMTypeMaskAlpha;
6682
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   239
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   240
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   241
procedure InitCameraBorders;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   242
begin
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   243
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5);
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   244
end;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   245
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   246
procedure InitTouchInterface;
bf3cf6e60673 update position of on screen buttons on resize
koda
parents: 6676
diff changeset
   247
begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   248
{$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
   249
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   250
//positioning of the buttons
9377
48ab6dea8d2f remove old and unused getScreenDPI code
koda
parents: 9080
diff changeset
   251
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
   252
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
   253
f2f93017132c moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents: 6710
diff changeset
   254
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
   255
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   256
    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
   257
    sprite:= sprJumpWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   258
    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
   259
    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
   260
    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
   261
    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
   262
    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
   263
    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
   264
    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
   265
    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
   266
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   267
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
   268
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
   269
    begin
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   270
    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
   271
    sprite:= sprAMWidget;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   272
    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
   273
    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
   274
    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
   275
    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
   276
    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
   277
    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
   278
    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
   279
    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
   280
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   281
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   282
with arrowLeft do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   283
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   284
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   285
    sprite:= sprArrowLeft;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   286
    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
   287
    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
   288
    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
   289
    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
   290
    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
   291
    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
   292
    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
   293
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   294
    end;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   295
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   296
with arrowRight do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   297
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   298
    show:= true;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   299
    sprite:= sprArrowRight;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   300
    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
   301
    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
   302
    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
   303
    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
   304
    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
   305
    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
   306
    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
   307
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   308
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   309
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
   310
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
   311
    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
   312
    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
   313
    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
   314
    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
   315
    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
   316
    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
   317
    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
   318
    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
   319
    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
   320
    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
   321
    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
   322
    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
   323
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   324
with arrowUp do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   325
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   326
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   327
    sprite:= sprArrowUp;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   328
    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
   329
    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
   330
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   331
    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
   332
    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
   333
    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
   334
    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
   335
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   336
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   337
         begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   338
         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
   339
         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
   340
         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
   341
         source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   342
         end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   343
    end;
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   344
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   345
with arrowDown do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   346
    begin
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   347
    show:= false;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   348
    sprite:= sprArrowDown;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   349
    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
   350
    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
   351
    frame.x:= (cScreenWidth shr 1) - frame.w * 2;
6798
4822b7d41aaa touchinterface, move the up/down arrows a bit down
Xeli
parents: 6796
diff changeset
   352
    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
   353
    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
   354
    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
   355
    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
   356
    active.h:= frame.h;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   357
    with moveAnim do
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   358
        begin
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   359
        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
   360
        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
   361
        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
   362
        source.y:= frame.y;
6688
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   363
        end;
b2084a00a4cf added translate/fade animations for OnScreenWidgets
Xeli
parents: 6685
diff changeset
   364
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   365
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   366
with pauseButton do
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   367
    begin
14303
2978d6405d88 Backed out changeset 8d2983ff939b
Wuzzy <Wuzzy2@mail.ru>
parents: 14302
diff changeset
   368
    show:= true;
6695
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   369
    sprite:= sprPauseButton;
32de8965c62c refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents: 6692
diff changeset
   370
    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
   371
    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
   372
    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
   373
    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
   374
    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
   375
    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
   376
    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
   377
    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
   378
    end;
6685
ef706fccfb0a moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents: 6683
diff changeset
   379
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   380
with utilityWidget do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   381
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   382
    show:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   383
    sprite:= sprTimerButton;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   384
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   385
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   386
    frame.x:= arrowLeft.frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   387
    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
   388
    active.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   389
    active.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   390
    active.w:= frame.w;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   391
    active.h:= frame.h;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   392
    with moveAnim do
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   393
        begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   394
        target.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   395
        target.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   396
        source.x:= frame.x;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   397
        source.y:= frame.y;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   398
        end;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6802
diff changeset
   399
    end;
14538
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   400
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   401
with utilityWidget2 do
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   402
    begin
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   403
    show:= false;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   404
    sprite:= sprBounceButton;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   405
    frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   406
    frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   407
    frame.x:= utilityWidget.frame.x + Round(frame.w * 1.25);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   408
    frame.y:= arrowLeft.frame.y - Round(frame.h * 1.25);
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   409
    active.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   410
    active.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   411
    active.w:= frame.w;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   412
    active.h:= frame.h;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   413
    with moveAnim do
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   414
        begin
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   415
        target.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   416
        target.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   417
        source.x:= frame.x;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   418
        source.y:= frame.y;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   419
        end;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   420
    end;
1dab5d92aca7 Add button to set bounciness in touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14419
diff changeset
   421
6637
b4a3310f2974 show buttons on the screen, similar to the iOS overlay
Xeli
parents: 6631
diff changeset
   422
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   423
end;
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   424
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
   425
// 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
   426
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
   427
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
   428
    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
   429
    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
   430
    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
   431
    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
   432
    FreeAndNilTexture(AmmoMenuTex);
9983
1b62d993cd2f Free cached ammo menu tex on quit.
nemo
parents: 9812
diff changeset
   433
    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
   434
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
   435
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   436
function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture;
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   437
const BORDERSIZE = 2;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   438
var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   439
    STurns: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   440
    amSurface: PSDL_Surface;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   441
    AMRect: TSDL_Rect;
14411
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14409
diff changeset
   442
{$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: 14409
diff changeset
   443
    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: 14409
diff changeset
   444
    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: 14409
diff changeset
   445
{$ENDIF}
161
d8870bbf960e - AmmoMenu
unc0rr
parents: 154
diff changeset
   446
begin
10141
3be894730bd6 Fix build
unc0rr
parents: 10139
diff changeset
   447
    if cOnlyStats then exit(nil);
10139
9046f69dae4c In stats-only mode:
unc0rr
parents: 10124
diff changeset
   448
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
   449
    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
   450
    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
   451
        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
   452
            inc(SlotsNum);
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   453
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   454
    SlotsNumX:= SlotsNum;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   455
    SlotsNumY:= cMaxSlotAmmoIndex + 2;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   456
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   457
    inc(SlotsNumY);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   458
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   459
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   460
    SlotsNumX:= cMaxSlotAmmoIndex + 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   461
    SlotsNumY:= SlotsNum + 1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   462
    {$IFDEF USE_AM_NUMCOLUMN}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   463
    inc(SlotsNumX);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   464
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   465
{$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
   466
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   467
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   468
    AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   469
    AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   470
    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
   471
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   472
    AMRect.x:= BORDERSIZE;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   473
    AMRect.y:= BORDERSIZE;
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   474
    AMRect.w:= AmmoRect.w - (BORDERSIZE*2);
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   475
    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
   476
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   477
    SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   478
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   479
    x:= AMRect.x;
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   480
    y:= AMRect.y;
14411
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14409
diff changeset
   481
{$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: 14409
diff changeset
   482
    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: 14409
diff changeset
   483
{$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
   484
    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
   485
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   486
            begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   487
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   488
            y:= AMRect.y;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   489
{$ELSE}
6650
56a0b7bf6c15 fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents: 6648
diff changeset
   490
            x:= AMRect.x;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   491
{$ENDIF}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   492
{$IFDEF USE_AM_NUMCOLUMN}
14411
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14409
diff changeset
   493
            // 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: 14409
diff changeset
   494
            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: 14409
diff changeset
   495
                // 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: 14409
diff changeset
   496
                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: 14409
diff changeset
   497
            else
71359339a493 Ammo menu: Show number instead F1, etc. if slot keys differ from default or in Touch interface
Wuzzy <Wuzzy2@mail.ru>
parents: 14409
diff changeset
   498
                // 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: 14409
diff changeset
   499
                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
   500
            copyToXY(tmpsurf, amSurface,
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   501
                     x + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.w shr 1),
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   502
                     y + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.h shr 1));
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   503
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   504
            SDL_FreeSurface(tmpsurf);
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   505
    {$IFDEF USE_LANDSCAPE_AMMOMENU}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   506
            y:= AMRect.y + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   507
    {$ELSE}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   508
            x:= AMRect.x + AMSlotSize + 1;
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   509
    {$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   510
{$ENDIF}
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   511
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   512
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
   513
            for t:=0 to cMaxSlotAmmoIndex do
3434
6af73e7f2438 Henek makes AmmoMenu more flexible
nemo
parents: 3407
diff changeset
   514
                begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   515
                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
   516
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   517
                    STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   518
                    AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   519
                    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
   520
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   521
                        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
   522
                                                                 y + AMSlotPadding, AMFrame);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   523
                        if STurns < 100 then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   524
                            DrawSpriteFrame2Surf(sprTurnsLeft, amSurface,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   525
                                x + AMSlotSize-16,
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   526
                                y + AMSlotSize + 1 - 16, STurns);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   527
                        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   528
                    else //draw colored version
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   529
                        begin
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   530
                        DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding,
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   531
                                                               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
   532
                        end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   533
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   534
        inc(y, AMSlotSize + 1); //the plus one is for the border
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   535
{$ELSE}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   536
        inc(x, AMSlotSize + 1);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   537
{$ENDIF}
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   538
        end;
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   539
    end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   540
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   541
    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
   542
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   543
    inc(y, AMSlotSize + 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   544
{$ENDIF}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   545
    end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   546
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   547
for i:= 1 to SlotsNumX -1 do
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   548
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
   549
for i:= 1 to SlotsNumY -1 do
6652
b043665dea3d and oooone last off-by-1 in ammo menu
nemo
parents: 6650
diff changeset
   550
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
   551
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   552
//draw outer border
7013
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   553
DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0                    , 0                    , 0);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   554
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.y             , 1);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   555
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.x             , AMRect.h + BORDERSIZE, 2);
54db061b5710 Get rid of overloaded functions in uRenderUtils
unc0rr
parents: 6999
diff changeset
   556
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.h + BORDERSIZE, 3);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   557
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   558
for i:=0 to BORDERSIZE-1 do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   559
begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   560
DrawLine2Surf(amSurface, BORDERSIZE, i, AMRect.w + BORDERSIZE, i,160,160,160);//top
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   561
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
   562
DrawLine2Surf(amSurface, i, BORDERSIZE, i, AMRect.h + BORDERSIZE,160,160,160);//left
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   563
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
   564
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   565
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   566
GetAmmoMenuTexture:= Surface2Tex(amSurface, false);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   567
if amSurface <> nil then SDL_FreeSurface(amSurface);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   568
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   569
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   570
procedure ShowAmmoMenu;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   571
const BORDERSIZE = 2;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   572
var Slot, Pos: LongInt;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   573
    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
   574
    c,i,g,t,STurns: LongInt;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   575
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
   576
if TurnTimeLeft = 0 then bShowAmmoMenu:= false;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   577
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   578
// give the assigned ammo to hedgehog
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   579
Ammo:= nil;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   580
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil)
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   581
and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   582
    Ammo:= CurrentHedgehog^.Ammo
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   583
else if (LocalAmmo <> -1) then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   584
    Ammo:= GetAmmoByNum(LocalAmmo);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   585
Pos:= -1;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   586
if Ammo = nil then
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   587
    begin
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   588
    bShowAmmoMenu:= false;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   589
    AMState:= AMHidden;
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   590
    exit
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   591
    end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   592
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   593
//Init the menu
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   594
if(AmmoMenuInvalidated) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   595
    begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   596
    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
   597
    FreeAndNilTexture(AmmoMenuTex);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   598
    AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   599
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6652
diff changeset
   600
{$IFDEF USE_LANDSCAPE_AMMOMENU}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   601
    if isPhone() then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   602
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   603
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   604
        AmmoRect.y:= (cScreenHeight shr 1) - (AmmoRect.h shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   605
        end
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   606
    else
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   607
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   608
        AmmoRect.x:= -(AmmoRect.w shr 1);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   609
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   610
        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   611
{$ELSE}
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   612
        AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   613
        AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   614
{$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
   615
    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
   616
        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
   617
        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
   618
        AMShiftTargetY:= cScreenHeight        - AmmoRect.y;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   619
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
   620
        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
   621
        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
   622
        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
   623
        else AMShiftTargetY:= 0;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   624
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
   625
        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
   626
        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
   627
        end
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   628
end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   629
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   630
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
6802
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   631
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   632
if AMState = AMShowing then
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   633
    begin
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   634
    FollowGear:=nil;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   635
    end;
8701007d58c0 fix ammomenu, the cursor actually works now -_-
Xeli
parents: 6799
diff changeset
   636
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   637
if AMState = AMShowingUp then // show ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   638
    begin
14409
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14397
diff changeset
   639
    // 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: 14397
diff changeset
   640
    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   641
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   642
        AMShiftX:= 0;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   643
        AMShiftY:= 0;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   644
        AMState:= AMShowing;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   645
        end
14409
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14397
diff changeset
   646
    // "Appear" animation
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   647
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   648
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   649
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   650
            AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   651
            AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   652
            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
   653
                Tint($FF, $ff, $ff, Round($ff * AMAnimState));
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   654
            end
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   655
        else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   656
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   657
            AMShiftX:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   658
            AMShiftY:= 0;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   659
            CursorPoint.X:= AmmoRect.x + AmmoRect.w;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   660
            CursorPoint.Y:= AmmoRect.y;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   661
            AMState:= AMShowing;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   662
            end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   663
    end;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   664
if AMState = AMHiding then // hide ammo menu
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   665
    begin
14409
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14397
diff changeset
   666
    // No "disappear" animation (see above)
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14397
diff changeset
   667
    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   668
        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   669
        AMShiftX:= AMShiftTargetX;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   670
        AMShiftY:= AMShiftTargetY;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   671
        AMState:= AMHidden;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   672
        end
14409
85008b73e118 Skip ammo menu open animation if playing with TurnTime <= 10s
Wuzzy <Wuzzy2@mail.ru>
parents: 14397
diff changeset
   673
    // "Disappear" animation
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   674
    else
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   675
        if AMAnimState < 1 then
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   676
            begin
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   677
            AMShiftX:= Round(AMShiftTargetX * AMAnimState);
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   678
            AMShiftY:= Round(AMShiftTargetY * AMAnimState);
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   679
            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
   680
                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
   681
            end
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   682
         else
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   683
            begin
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   684
            AMShiftX:= AMShiftTargetX;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   685
            AMShiftY:= AMShiftTargetY;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   686
            prevPoint:= CursorPoint;
8773
7d3af949dd34 remove engine warnings
sheepluva
parents: 8675
diff changeset
   687
            //prevTargetPoint:= TargetCursorPoint;
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   688
            AMState:= AMHidden;
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   689
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   690
    end;
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   691
6795
e4831e13e04a make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents: 6794
diff changeset
   692
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
   693
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   694
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
   695
    untint;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   696
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
   697
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
   698
Slot:= -1;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   699
{$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
   700
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   701
    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
   702
        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
   703
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   704
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   705
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   706
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   707
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   708
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   709
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   710
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   711
                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
   712
                    begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   713
                    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
   714
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   715
                       (CursorPoint.X >  AmmoRect.x                   + ( c    * (AMSlotSize+1))) and
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   716
                       (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
   717
                        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   718
                        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
   719
                        Pos:= t;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   720
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   721
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   722
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   723
                                       AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding,
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   724
                                       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
   725
                        end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   726
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   727
                   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
   728
            end;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   729
{$ELSE}
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   730
c:= -1;
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   731
    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
   732
        if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   733
            begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   734
            inc(c);
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   735
    {$IFDEF USE_AM_NUMCOLUMN}
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   736
            g:= 1;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   737
    {$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   738
            g:= 0;
6918
13d6cce2056c fix the ammomenu F# buttons
Xeli
parents: 6899
diff changeset
   739
    {$ENDIF}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   740
            for t:=0 to cMaxSlotAmmoIndex do
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   741
                if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   742
                    begin
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   743
                    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
   744
                       (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   745
                       (CursorPoint.X >  AmmoRect.x                   + ( g    * (AMSlotSize+1))) and
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   746
                       (CursorPoint.X <= AmmoRect.x                   + ((g+1) * (AMSlotSize+1))) then
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   747
                        begin
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   748
                        Slot:= i;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   749
                        Pos:= t;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   750
                        STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   751
                        if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
8330
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   752
                            DrawSprite(sprAMSlot,
aaefa587e277 update branch with default
koda
parents: 8099 8204
diff changeset
   753
                                       AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding,
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6627
diff changeset
   754
                                       AmmoRect.y + BORDERSIZE + (c  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   755
                        end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   756
                        inc(g);
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   757
                   end;
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   758
            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
   759
{$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
   760
    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
   761
        begin
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   762
        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
   763
        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
   764
            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
   765
            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
   766
                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
   767
                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
   768
                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
   769
                end;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
   770
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   771
            DrawTexture(AmmoRect.x + (AMSlotSize shr 1),
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   772
                        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
   773
                        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
   774
            if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   775
                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
   776
                            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
   777
                            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
   778
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
   779
            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
   780
                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
   781
                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
   782
                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
   783
                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
   784
                FreeAndNilTexture(WeaponTooltipTex);
14541
42f7ce0f5bc6 Minor touch refactor
Wuzzy <Wuzzy2@mail.ru>
parents: 14538
diff changeset
   785
                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
   786
                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
   787
                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
   788
            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
   789
        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
   790
    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
   791
        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
   792
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   793
    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
   794
{$IFDEF USE_LANDSCAPE_AMMOMENU}
8099
a7f02b902b6f throw in some 'nots' trying to restore pas2c functionality
koda
parents: 8026
diff changeset
   795
        if (not isPhone()) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   796
            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
   797
{$ELSE}
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   798
        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
   799
{$ENDIF}
961
a9a349b2b3fa Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents: 956
diff changeset
   800
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
   801
    bSelected:= false;
6899
c3d44a836086 - Return of the F<numbers> in the ammomenu
Xeli
parents: 6862
diff changeset
   802
{$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
   803
   if (AMShiftX = 0) and (AMShiftY = 0) then
6622
01889d5bc79b Rewrote the Ammomenu:
Xeli
parents: 6610
diff changeset
   804
        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
   805
{$ENDIF}
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   806
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   807
3089
8ad00781be08 First go at water depth
palewolf
parents: 3045
diff changeset
   808
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
   809
var i, w, h, lw, lh, rw, rh, sw: LongInt;
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   810
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   811
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
   812
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
   813
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   814
    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
   815
    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
   816
    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
   817
    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
   818
        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
   819
    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
   820
    repeat
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   821
    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
   822
    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
   823
    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
   824
    end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   825
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
   826
    begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   827
    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
   828
    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
   829
    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
   830
    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
   831
    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
   832
        begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   833
        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
   834
        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
   835
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   836
    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
   837
    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
   838
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   839
    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
   840
    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
   841
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   842
        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
   843
        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
   844
        end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   845
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   846
    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
   847
    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
   848
        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
   849
            begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   850
            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
   851
            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
   852
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   853
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   854
        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
   855
            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
   856
            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
   857
            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
   858
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
   859
    end
2426
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   860
end;
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   861
9d674c5c828d - Fix camera area with different zoom levels
unc0rr
parents: 2413
diff changeset
   862
956
19003f7fc174 Get rid of unused Surface parameter
unc0rr
parents: 942
diff changeset
   863
procedure DrawWorld(Lag: LongInt);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   864
begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   865
    if ZoomValue < zoom then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2931
diff changeset
   866
    begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   867
        zoom:= zoom - 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   868
        if ZoomValue > zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   869
            zoom:= ZoomValue
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   870
    end
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   871
    else
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   872
        if ZoomValue > zoom then
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   873
        begin
6734
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   874
        zoom:= zoom + 0.002 * Lag;
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   875
        if ZoomValue < zoom then
9709d15dabfa Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents: 6714
diff changeset
   876
            zoom:= ZoomValue
3444
9d501dc22f71 * no zooming when game is paused
sheepluva
parents: 3434
diff changeset
   877
        end
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   878
    else
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
   879
        ZoomValue:= zoom;
2376
ece7b87f1334 Strip trailing spaces
nemo
parents: 2375
diff changeset
   880
9670
1954f692e8c6 Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents: 9666
diff changeset
   881
    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
   882
        MoveCamera;
162
4822f6face35 Ammo menu now works!
unc0rr
parents: 161
diff changeset
   883
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   884
    if cStereoMode = smNone then
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   885
        begin
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   886
        RenderClear();
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   887
        DrawWorldStereo(Lag, rmDefault)
8138
cfb228baa598 Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents: 7946
diff changeset
   888
{$IFDEF USE_S3D_RENDERING}
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   889
        end
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   890
    else
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   891
        begin
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   892
        // draw frame for left eye
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   893
        RenderClear(rmLeftEye);
3696
6009d8378422 Engine:
smaxx
parents: 3692
diff changeset
   894
        DrawWorldStereo(Lag, rmLeftEye);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   895
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   896
        // draw frame for right eye
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   897
        RenderClear(rmRightEye);
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   898
        DrawWorldStereo(0, rmRightEye);
4347
0ddb100fea61 add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents: 4345
diff changeset
   899
{$ENDIF}
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   900
        end;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   901
10869
f23763bbac1b rendering tweaks/cleanup cont.
sheepluva
parents: 10818
diff changeset
   902
FinishRender();
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   903
end;
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   904
10494
0eb97cf4c78e Fix warnings given by 32-bit fpc
unC0Rr
parents: 10425
diff changeset
   905
procedure RenderWorldEdge;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   906
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
   907
    //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
   908
    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
   909
    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
   910
    //c1, c2: LongWord; // couple of colours for edges
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   911
begin
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
   912
if (WorldEdge <> weNone) and (WorldEdge <> weSea) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   913
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   914
(* 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
   915
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
   916
    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
   917
    rect.h:= ViewHeight;
14282
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14281
diff changeset
   918
    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
   919
    w:= tmp - ViewLeftX;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
   920
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
   921
    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
   922
        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
   923
        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
   924
        rect.x:= ViewLeftX;
10627
07ff179b0d97 darken wrapped world etc. some more
sheepluva
parents: 10562
diff changeset
   925
        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
   926
        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
   927
            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
   928
        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
   929
14282
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14281
diff changeset
   930
    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
   931
    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
   932
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
   933
    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
   934
        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
   935
        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
   936
        rect.x:= tmp;
10627
07ff179b0d97 darken wrapped world etc. some more
sheepluva
parents: 10562
diff changeset
   937
        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
   938
        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
   939
            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
   940
        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
   941
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
    (*
10523
00ac079fa51f fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents: 10510
diff changeset
   943
    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
   944
             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
   945
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   946
    glDisable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   947
    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
   948
    if (WorldEdge = weWrap) or (worldEdge = weBounce) then
10275
6c91047f59b6 RAR: cleaning up a bit of the IFDEF-clusterf*ck
sheepluva
parents: 10265
diff changeset
   949
        glColor4ub($00, $00, $00, $40)
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   950
    else
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   951
        begin
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   952
        glEnableClientState(GL_COLOR_ARRAY);
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   953
        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
   954
        end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   955
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   956
    glPushMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   957
    glTranslatef(WorldDx, WorldDy, 0);
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
    VertexBuffer[0].X:= leftX-20;
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   960
    VertexBuffer[0].Y:= -3500;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   961
    VertexBuffer[1].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   962
    VertexBuffer[1].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   963
    VertexBuffer[2].X:= leftX+30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   964
    VertexBuffer[2].Y:= cWaterLine+cVisibleWater;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   965
    VertexBuffer[3].X:= leftX+30;
10265
7e8d4cd76ce7 darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents: 10263
diff changeset
   966
    VertexBuffer[3].Y:= -3500;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   967
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   968
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   969
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
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
    VertexBuffer[0].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   972
    VertexBuffer[1].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   973
    VertexBuffer[2].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   974
    VertexBuffer[3].X:= rightX-30;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   975
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   976
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   977
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
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
    glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldEnd[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   980
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   981
    VertexBuffer[0].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   982
    VertexBuffer[1].X:= -5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   983
    VertexBuffer[2].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   984
    VertexBuffer[3].X:= leftX-20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   985
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   986
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   987
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
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
    VertexBuffer[0].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   990
    VertexBuffer[1].X:= rightX+5000;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   991
    VertexBuffer[2].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   992
    VertexBuffer[3].X:= rightX+20;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   993
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   994
    glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   995
    glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
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
    glPopMatrix;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   998
    glDisableClientState(GL_COLOR_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
   999
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1000
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1001
    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
  1002
    glEnable(GL_TEXTURE_2D);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1003
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1004
    // 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
  1005
    if WorldEdge = weBounce then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1006
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1007
        // 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
  1008
        if LeftImpactTimer mod 2 = 0 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
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1011
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1012
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1013
            c1:= $FFFFFFFF; c2:= $5454FFFF;
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
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 7.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1016
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1017
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 3.0,   c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1018
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 1.0,   c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1019
        if RightImpactTimer mod 2 = 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1020
            begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1021
            c1:= $5454FFFF; c2:= $FFFFFFFF;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1022
            end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1023
        else begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1024
            c1:= $FFFFFFFF; c2:= $5454FFFF;
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
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 7.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1027
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, c2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1028
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 3.0, c1);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1029
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 1.0, c2)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1030
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1031
    else if WorldEdge = weWrap then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1032
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1033
        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
  1034
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1035
        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
  1036
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 2.0, $FF0000FF);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1037
        end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1038
    else
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1039
        begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1040
        DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $2E8B5780);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1041
        DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $2E8B5780)
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1042
        end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1043
    if LeftImpactTimer > Lag then dec(LeftImpactTimer,Lag) else LeftImpactTimer:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1044
    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
  1045
    *)
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1046
    end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1047
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1048
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1049
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1050
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
  1051
var t, i, h, v, smallScreenOffset, TeamHealthBarWidth : LongInt;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1052
    r: TSDL_Rect;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1053
    highlight: boolean;
13140
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1054
    hasVisibleHog: boolean;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1055
    htex: PTexture;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1056
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
  1057
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
  1058
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1059
    SetScale(1.5);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1060
    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
  1061
    if VisibleTeamsCount * 100 > Longword(cScreenHeight) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1062
        Tint($FF,$FF,$FF,$80);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1063
    end
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1064
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
  1065
v:= 0; // for updating VisibleTeamsCount
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1066
for t:= 0 to Pred(TeamsCount) do
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1067
    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
  1068
      begin
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1069
      hasVisibleHog:= false;
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1070
      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
  1071
          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
  1072
              hasVisibleHog:= true;
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1073
      if (TeamHealth > 0) and hasVisibleHog then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1074
        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
  1075
        // 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
  1076
        inc(v);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1077
        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
  1078
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1079
        if highlight then
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1080
            begin
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1081
            Tint(Clan^.Color shl 8 or $FF);
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1082
            htex:= GenericHealthTexture
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1083
            end
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1084
        else
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1085
            htex:= Clan^.HealthTex;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1086
9791
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1087
        // draw owner
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1088
        if OwnerTex <> nil then
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1089
            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
  1090
446e4919b738 Display team owner in teams widget (addresses issue 174)
unc0rr
parents: 9755
diff changeset
  1091
        // draw name
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1092
        DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1093
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1094
        // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1095
        DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1096
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
  1097
        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
  1098
14736
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1099
        // draw team health bar
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1100
        r.x:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1101
        r.y:= 0;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1102
        r.w:= 2 + TeamHealthBarWidth;
14741
37a781d28e43 Fix team bar height depending on NameTex
Wuzzy <Wuzzy2@mail.ru>
parents: 14739
diff changeset
  1103
        r.h:= htex^.h;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1104
        DrawTextureFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1105
14736
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1106
        // draw health bar's right border
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1107
        inc(r.x, cTeamHealthWidth + 2);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1108
        r.w:= 3;
9656
18422d205080 - More HealthTex to clan structure
unc0rr
parents: 9654
diff changeset
  1109
        DrawTextureFromRect(TeamHealthBarWidth + 15, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1110
14736
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1111
        // 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
  1112
        h:= 0;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1113
        if not hasGone then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1114
            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
  1115
                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
  1116
                inc(h, Hedgehogs[i].HealthBarHealth);
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 10009 9954
diff changeset
  1117
                if (h < TeamHealthBarHealth) and (Hedgehogs[i].HealthBarHealth > 0) then
14736
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1118
                    if (IsTooDarkToRead(Clan^.Color)) then
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1119
                        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: 14569
diff changeset
  1120
                    else
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1121
                        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
  1122
                end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1123
13018
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1124
        // 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
  1125
        if (hasLuaTeamValue) then
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1126
            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
  1127
        // 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
  1128
        else if (GameFlags and gfAISurvival) <> 0 then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1129
            DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, AIKillsTex);
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1130
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1131
        // 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
  1132
        // 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
  1133
        if highlight then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1134
            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
  1135
            if VisibleTeamsCount * 100 > Longword(cScreenHeight) then
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1136
                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
  1137
            else untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1138
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1139
            // draw name
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1140
            r.x:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1141
            r.y:= 2;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1142
            r.w:= NameTagTex^.w - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1143
            r.h:= NameTagTex^.h - 4;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1144
            DrawTextureFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex);
10147
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1145
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1146
            if OwnerTex <> nil then
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1147
                begin
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1148
                r.w:= OwnerTex^.w - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1149
                r.h:= OwnerTex^.h - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1150
                DrawTextureFromRect(-OwnerTex^.w - NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, OwnerTex)
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1151
                end;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1152
13018
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1153
            if (hasLuaTeamValue) then
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1154
                begin
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1155
                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
  1156
                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
  1157
                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
  1158
                end
0248cf0da834 Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents: 12831
diff changeset
  1159
            else if (GameFlags and gfAISurvival) <> 0 then
10147
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1160
                begin
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1161
                r.w:= AIKillsTex^.w - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1162
                r.h:= AIKillsTex^.h - 4;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1163
                DrawTextureFromRect(TeamHealthBarWidth + 24, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, AIKillsTex);
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1164
                end;
9a772dc5dfbe Fix tinting of AI kills counter
unc0rr
parents: 10141
diff changeset
  1165
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1166
            // draw flag
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1167
            r.w:= 22;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1168
            r.h:= 15;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1169
            DrawTextureFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex);
10317
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1170
            end
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1171
        // draw an arrow next to active team
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1172
        else if (CurrentTeam = TeamsArray[t]) and (TurnTimeLeft > 0) then
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1173
            begin
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1174
            h:= -NameTagTex^.w - 24;
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1175
            if OwnerTex <> nil then
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1176
                h:= h - OwnerTex^.w - 4;
14736
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1177
            if (IsTooDarkToRead(TeamsArray[t]^.Clan^.Color)) then
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1178
                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: 14569
diff changeset
  1179
            else
8563cc40fc1e Invert colors if clan color is very dark
Wuzzy <Wuzzy2@mail.ru>
parents: 14569
diff changeset
  1180
                DrawSpriteRotatedF(sprFingerBack, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFingerBack].Width div 4, 0, 1, -90);
14395
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1181
            Tint(TeamsArray[t]^.Clan^.Color shl 8 or $FF);
10317
fe2721f870ab adding some arrow
sheepluva
parents: 10312
diff changeset
  1182
            DrawSpriteRotatedF(sprFinger, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFinger].Width div 4, 0, 1, -90);
14395
f39d34d78028 Colorize switching arrows, pointing arrow and target cross in clan color
Wuzzy <Wuzzy2@mail.ru>
parents: 14303
diff changeset
  1183
            untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1184
            end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1185
        end;
13140
e330feceb662 Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents: 13018
diff changeset
  1186
      end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1187
if smallScreenOffset <> 0 then
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1188
    begin
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1189
    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
  1190
    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
  1191
        untint;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1192
    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
  1193
VisibleTeamsCount:= v;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1194
end;
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1195
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
  1196
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
  1197
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
  1198
    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
  1199
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
  1200
    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
  1201
        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
  1202
        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
  1203
                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
  1204
                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
  1205
                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
  1206
                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
  1207
                    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
  1208
                            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
  1209
                            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
  1210
                            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
  1211
                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
  1212
        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
  1213
end;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1214
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
  1215
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
  1216
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1217
procedure ShiftWorld(Dir: LongInt); inline;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1218
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
  1219
    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
  1220
    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
  1221
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1222
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
  1223
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1224
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
  1225
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
  1226
    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
  1227
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
  1228
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1229
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1230
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
  1231
    spr: TSprite;
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1232
    r: TSDL_Rect;
7016
8b34f46e10c1 HAPPY 7000th COMMIT HEDGEWARS
koda
parents: 7013
diff changeset
  1233
    s: shortstring;
9654
47332746e6d9 - Cut code with bug to fix issue 713
unc0rr
parents: 9557
diff changeset
  1234
    offsetX, offsetY, screenBottom: LongInt;
14419
b33d1c694b1d dumbest pas2c fix ever?
nemo
parents: 14411
diff changeset
  1235
    replicateToLeft, replicateToRight, tmp, isNotHiddenByCinematic: boolean;
12697
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1236
{$IFDEF USE_VIDEO_RECORDING}
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1237
    a: Byte;
c71e330d5094 Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents: 12694
diff changeset
  1238
{$ENDIF}
3692
bbec1275e46f these were removed by mistake
koda
parents: 3690
diff changeset
  1239
begin
10507
ed5df9cd251f I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents: 10494
diff changeset
  1240
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
  1241
    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
  1242
    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
  1243
    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
  1244
    end
10358
sheepluva
parents: 10332
diff changeset
  1245
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
  1246
    begin
14282
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14281
diff changeset
  1247
    replicateToLeft := (leftX  + WorldDx > ViewLeftX);
6015b74eea55 overall, using LongInt for leftX/rightX results in fewer casts, since most comparisons are against ints.
nemo
parents: 14281
diff changeset
  1248
    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
  1249
    end;
10358
sheepluva
parents: 10332
diff changeset
  1250
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1251
ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1252
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1253
// note: offsetY is negative!
10319
240775460dc5 fix pas2c build
sheepluva
parents: 10318
diff changeset
  1254
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
  1255
14003
58e54e737279 Tweak commenting in uWorld render routine
Wuzzy <Wuzzy2@mail.ru>
parents: 13962
diff changeset
  1256
// 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
  1257
if (cReducedQuality and rqNoBackground) = 0 then
1812
3d4692e825e7 'Reduce quality' patch by nemo
unc0rr
parents: 1807
diff changeset
  1258
    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
  1259
        // 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
  1260
        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
  1261
        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
  1262
        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
  1263
            HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20);
3265
5fe62296fdea - Parallax effect for horizont when water is out of sight
palewolf
parents: 3249
diff changeset
  1264
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
  1265
        // background
3688
fd8c22a358de add some comments and fix indentation
koda
parents: 3686
diff changeset
  1266
        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
  1267
        if SuddenDeathDmg then
12097
ebe87b6ed182 add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents: 12072
diff changeset
  1268
            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
  1269
        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
  1270
        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
  1271
        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
  1272
        if SuddenDeathDmg then
9666
8dcb25112d96 - Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents: 9656
diff changeset
  1273
            untint;
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1274
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1275
13633
35d93b1e7fef Fix foreground flakes (layer 2+6) disappearing when moving camera in world wrap world
Wuzzy <Wuzzy2@mail.ru>
parents: 13622
diff changeset
  1276
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
  1277
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
  1278
DrawVisualGears(4, false);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3695
diff changeset
  1279
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1280
if (cReducedQuality and rq2DWater) = 0 then
3611
ed00aa2b339e interpret parameters before initializing everything
koda
parents: 3594
diff changeset
  1281
    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
  1282
        // Waves
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1283
        DrawWater(255, SkyOffset, 0);
4816
c2575faeac3d use a different depth for different layers (land, water, explosions)
koda
parents: 4812
diff changeset
  1284
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1285
        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
  1286
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1287
        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
  1288
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1289
        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
  1290
        ChangeDepth(RM, -cStereo_Water_distant);
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1291
        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
  1292
    end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6492
diff changeset
  1293
else
10318
c2e81eea375f little visual tweak to weSea rendering
sheepluva
parents: 10317
diff changeset
  1294
    DrawWaves(-1, 100, - cWaveHeight div 2, - cWaveHeight div 2, 0);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1295
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1296
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
  1297
DrawVisualGears(5, false);
10533
57b4d411f77d fix some indentation
sheepluva
parents: 10532
diff changeset
  1298
DrawLand(WorldDx, WorldDy);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
  1299