author | alfadur |
Tue, 22 May 2018 17:53:53 -0400 | |
changeset 13397 | 166f8f31de3e |
parent 13370 | e202d58236b1 |
child 13412 | 236cc4cf2448 |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 5 |
* This program is free software; you can redistribute it and/or modify |
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
4 | 8 |
* |
183 | 9 |
* This program is distributed in the hope that it will be useful, |
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
4 | 13 |
* |
183 | 14 |
* You should have received a copy of the GNU General Public License |
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 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
4 | 21 |
unit uWorld; |
22 |
interface |
|
6622 | 23 |
uses SDLh, uGears, uConsts, uFloat, uRandom, uTypes, uRenderUtils; |
3697 | 24 |
|
3038 | 25 |
procedure initModule; |
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 | 32 |
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode); |
2905 | 33 |
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt); |
2786 | 34 |
procedure HideMission; |
13370
e202d58236b1
Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents:
13174
diff
changeset
|
35 |
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
|
36 |
procedure ShakeCamera(amount: LongInt); |
5682
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
37 |
procedure InitCameraBorders; |
6682 | 38 |
procedure InitTouchInterface; |
7023 | 39 |
procedure SetUtilityWidgetState(ammoType: TAmmoType); |
6688 | 40 |
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean); |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3629
diff
changeset
|
41 |
procedure MoveCamera; |
5521 | 42 |
procedure onFocusStateChanged; |
10392 | 43 |
procedure updateCursorVisibility; |
4 | 44 |
|
45 |
implementation |
|
4359 | 46 |
uses |
7721 | 47 |
uStore |
48 |
, uMisc |
|
49 |
, uIO |
|
50 |
, uLocale |
|
51 |
, uSound |
|
52 |
, uAmmos |
|
53 |
, uVisualGears |
|
54 |
, uChat |
|
55 |
, uLandTexture |
|
56 |
, uVariables |
|
57 |
, uUtils |
|
58 |
, uTextures |
|
59 |
, uRender |
|
60 |
, uCaptions |
|
61 |
, uCursor |
|
62 |
, uCommands |
|
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9693
diff
changeset
|
63 |
, uTeams |
11940
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
64 |
, uDebug |
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 |
{$IFDEF USE_VIDEO_RECORDING} |
7721 | 66 |
, 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
|
67 |
{$ENDIF} |
4359 | 68 |
; |
4 | 69 |
|
10331 | 70 |
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
|
71 |
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
|
72 |
AMAnimState: Single; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
73 |
tmpSurface: PSDL_Surface; |
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
74 |
fpsTexture: PTexture; |
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
75 |
timeTexture: PTexture; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
76 |
FPS: Longword; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
77 |
CountTicks: Longword; |
8773 | 78 |
prevPoint{, prevTargetPoint}: TPoint; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
79 |
amSel: TAmmoType = amNothing; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
80 |
missionTex: PTexture; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
81 |
missionTimer: LongInt; |
7027 | 82 |
isFirstFrame: boolean; |
7028 | 83 |
AMAnimType: LongInt; |
7180 | 84 |
recTexture: PTexture; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
85 |
AmmoMenuTex : PTexture; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
86 |
HorizontOffset: LongInt; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
87 |
cOffsetY: LongInt; |
9557 | 88 |
WorldEnd, WorldFade : array[0..3] of HwColor4f; |
3692 | 89 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
90 |
const cStereo_Sky = 0.0500; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
91 |
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
|
92 |
cStereo_MidDistance = 0.0175; |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
93 |
cStereo_Water_distant = 0.0125; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
94 |
cStereo_Land = 0.0075; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
95 |
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
|
96 |
cStereo_Outside = -0.0400; |
4 | 97 |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
98 |
AMAnimDuration = 200; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
99 |
AMHidden = 0;//AMState values |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
100 |
AMShowingUp = 1; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
101 |
AMShowing = 2; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
102 |
AMHiding = 3; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
103 |
|
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
104 |
AMTypeMaskX = $00000001; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
105 |
AMTypeMaskY = $00000002; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
106 |
AMTypeMaskAlpha = $00000004; |
8370 | 107 |
//AMTypeMaskSlide = $00000008; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
108 |
|
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
109 |
{$IFDEF MOBILE} |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
110 |
AMSlotSize = 48; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
111 |
{$ELSE} |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
112 |
AMSlotSize = 32; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
113 |
{$ENDIF} |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
114 |
AMSlotPadding = (AMSlotSize - 32) shr 1; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
115 |
|
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
116 |
cSendCursorPosTime = 50; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
117 |
cCursorEdgesDist = 100; |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8138
diff
changeset
|
118 |
|
6492 | 119 |
// helper functions to create the goal/game mode string |
120 |
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring; |
|
121 |
var t: ansistring; |
|
122 |
begin |
|
10080 | 123 |
{$IFNDEF PAS2C} |
6492 | 124 |
if (GameFlags and gf) <> 0 then |
125 |
begin |
|
126 |
t:= inttostr(i); |
|
7069 | 127 |
s:= s + FormatA(trgoal[si], t) + '|' |
6492 | 128 |
end; |
10080 | 129 |
{$ENDIF} |
6492 | 130 |
AddGoal:= s; |
131 |
end; |
|
132 |
||
133 |
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring; |
|
134 |
begin |
|
10080 | 135 |
{$IFNDEF PAS2C} |
6492 | 136 |
if (GameFlags and gf) <> 0 then |
137 |
s:= s + trgoal[si] + '|'; |
|
10080 | 138 |
{$ENDIF} |
6492 | 139 |
AddGoal:= s; |
140 |
end; |
|
141 |
||
4 | 142 |
procedure InitWorld; |
2704
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
143 |
var i, t: LongInt; |
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
144 |
cp: PClan; |
2863 | 145 |
g: ansistring; |
4 | 146 |
begin |
3764 | 147 |
missionTimer:= 0; |
2786 | 148 |
|
2704
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
149 |
if (GameFlags and gfRandomOrder) <> 0 then // shuffle them up a bit |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
150 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
151 |
for i:= 0 to ClansCount * 4 do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
152 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
153 |
t:= GetRandom(ClansCount); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
154 |
if t <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
155 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
156 |
cp:= ClansArray[0]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
157 |
ClansArray[0]:= ClansArray[t]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
158 |
ClansArray[t]:= cp; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
159 |
ClansArray[t]^.ClanIndex:= t; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
160 |
ClansArray[0]^.ClanIndex:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
161 |
if (LocalClan = t) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
162 |
LocalClan:= 0 |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
163 |
else if (LocalClan = 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
164 |
LocalClan:= t |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
165 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
166 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
167 |
CurrentTeam:= ClansArray[0]^.Teams[0]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
168 |
end; |
2704
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
169 |
|
2908 | 170 |
// if special game flags/settings are changed, add them to the game mode notice window and then show it |
2863 | 171 |
g:= ''; // no text/things to note yet |
2908 | 172 |
|
4883
7cddc9201a1d
added dummy for tardis and ugly icons for tardis and structure
Henek
parents:
4850
diff
changeset
|
173 |
// add custom goals from lua script if there are any |
12787
a6f51ac9a3f2
Fix bad LuaGoals comparison for pas2c builds
Wuzzy <Wuzzy2@mail.ru>
parents:
12719
diff
changeset
|
174 |
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
|
175 |
g:= LuaGoals + '|'; |
4883
7cddc9201a1d
added dummy for tardis and ugly icons for tardis and structure
Henek
parents:
4850
diff
changeset
|
176 |
|
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
|
177 |
// 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
|
178 |
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement? |
2958 | 179 |
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
|
180 |
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
|
181 |
g:= AddGoal(g, gfAny, gidPlaceKing); |
5022
d2a2f6c9b236
some final work and buggfix for Tag Team, it is now playable
Henek
parents:
4976
diff
changeset
|
182 |
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
|
183 |
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
|
184 |
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
|
185 |
g:= AddGoal(g, gfMoreWind, gidMoreWind); |
2958 | 186 |
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
|
187 |
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land? |
2958 | 188 |
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery? |
4132 | 189 |
g:= AddGoal(g, gfInfAttack, gidInfAttack); |
190 |
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
|
191 |
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
|
192 |
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
|
193 |
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
|
194 |
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
|
195 |
g:= AddGoal(g, gfAISurvival, gidAISurvival); |
2958 | 196 |
|
2908 | 197 |
// modified damage modificator? |
198 |
if cDamagePercent <> 100 then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
199 |
g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent); |
2908 | 200 |
|
3107 | 201 |
// fade in |
202 |
ScreenFade:= sfFromBlack; |
|
203 |
ScreenFadeValue:= sfMax; |
|
204 |
ScreenFadeSpeed:= 1; |
|
205 |
||
2908 | 206 |
// modified mine timers? |
4482 | 207 |
if cMinesTime <> 3000 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
208 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
209 |
if cMinesTime = 0 then |
4003
ca0600ab38bf
disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents:
3976
diff
changeset
|
210 |
g:= AddGoal(g, gfAny, gidNoMineTimer) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
211 |
else if cMinesTime < 0 then |
4003
ca0600ab38bf
disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents:
3976
diff
changeset
|
212 |
g:= AddGoal(g, gfAny, gidRandomMineTimer) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
213 |
else |
4482 | 214 |
g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
215 |
end; |
2908 | 216 |
|
2863 | 217 |
// if the string has been set, show it for (default timeframe) seconds |
10120 | 218 |
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
|
219 |
ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0); |
2863 | 220 |
|
10331 | 221 |
//cWaveWidth:= SpritesData[sprWater].Width; |
2268
053eb81e60ee
little experiment to see if this improve appearance of laser/ufo/cake/laser guided missile - of course, can't actually see it until unc0rr restores waves
nemo
parents:
2226
diff
changeset
|
222 |
//cWaveHeight:= SpritesData[sprWater].Height; |
053eb81e60ee
little experiment to see if this improve appearance of laser/ufo/cake/laser guided missile - of course, can't actually see it until unc0rr restores waves
nemo
parents:
2226
diff
changeset
|
223 |
cWaveHeight:= 32; |
2292
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
224 |
|
5682
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
225 |
InitCameraBorders(); |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
226 |
uCursor.init(); |
2197 | 227 |
prevPoint.X:= 0; |
74 | 228 |
prevPoint.Y:= cScreenHeight div 2; |
8773 | 229 |
//prevTargetPoint.X:= 0; |
230 |
//prevTargetPoint.Y:= 0; |
|
10628 | 231 |
WorldDx:= -(LongInt(leftX + (playWidth div 2))); // -(LAND_WIDTH div 2);// + cScreenWidth div 2; |
6609 | 232 |
WorldDy:= -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2); |
233 |
||
234 |
//aligns it to the bottom of the screen, minus the border |
|
235 |
SkyOffset:= 0; |
|
236 |
HorizontOffset:= 0; |
|
237 |
||
6682 | 238 |
InitTouchInterface(); |
6796
3e89dbdc7db9
You can now change AMAnimType to enable the animation through the x/y axis and alpha for example
Xeli
parents:
6795
diff
changeset
|
239 |
AMAnimType:= AMTypeMaskX or AMTypeMaskAlpha; |
6682 | 240 |
end; |
241 |
||
242 |
procedure InitCameraBorders; |
|
243 |
begin |
|
244 |
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5); |
|
245 |
end; |
|
246 |
||
247 |
procedure InitTouchInterface; |
|
248 |
begin |
|
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
249 |
{$IFDEF USE_TOUCH_INTERFACE} |
7167
0b3b306f129a
Android: added a callback to java to determine dpi/dip how much we should scale the ui
Xeli
parents:
7086
diff
changeset
|
250 |
|
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
251 |
//positioning of the buttons |
9377 | 252 |
buttonScale:= 1 / cDefaultZoomLevel; |
6683
75a1d84ac606
small refactoring to touch screen buttons, use a record to store values, added 'offset' fields to adjust active button area
koda
parents:
6682
diff
changeset
|
253 |
|
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
254 |
|
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
255 |
with JumpWidget do |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
256 |
begin |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
257 |
show:= true; |
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
258 |
sprite:= sprJumpWidget; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
259 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
260 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
261 |
frame.x:= (cScreenWidth shr 1) - Round(frame.w * 1.2); |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
262 |
frame.y:= cScreenHeight - frame.h * 2; |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
263 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
264 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
265 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
266 |
active.h:= frame.h; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
267 |
end; |
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
268 |
|
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
269 |
with AMWidget do |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
270 |
begin |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
271 |
show:= true; |
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
272 |
sprite:= sprAMWidget; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
273 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
274 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
275 |
frame.x:= (cScreenWidth shr 1) - frame.w * 2; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
276 |
frame.y:= cScreenHeight - Round(frame.h * 1.2); |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
277 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
278 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
279 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
280 |
active.h:= frame.h; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
281 |
end; |
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
282 |
|
6688 | 283 |
with arrowLeft do |
284 |
begin |
|
285 |
show:= true; |
|
286 |
sprite:= sprArrowLeft; |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
287 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
288 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
289 |
frame.x:= -(cScreenWidth shr 1) + Round(frame.w * 0.25); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
290 |
frame.y:= cScreenHeight - Round(frame.h * 1.5); |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
291 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
292 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
293 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
294 |
active.h:= frame.h; |
6688 | 295 |
end; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
296 |
|
6688 | 297 |
with arrowRight do |
298 |
begin |
|
299 |
show:= true; |
|
300 |
sprite:= sprArrowRight; |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
301 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
302 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
303 |
frame.x:= -(cScreenWidth shr 1) + Round(frame.w * 1.5); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
304 |
frame.y:= cScreenHeight - Round(frame.h * 1.5); |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
305 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
306 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
307 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
308 |
active.h:= frame.h; |
6688 | 309 |
end; |
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
310 |
|
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
311 |
with firebutton do |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
312 |
begin |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
313 |
show:= true; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
314 |
sprite:= sprFireButton; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
315 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
316 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
317 |
frame.x:= arrowRight.frame.x + arrowRight.frame.w; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
318 |
frame.y:= arrowRight.frame.y + (arrowRight.frame.w shr 1) - (frame.w shr 1); |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
319 |
active.x:= frame.x; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
320 |
active.y:= frame.y; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
321 |
active.w:= frame.w; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
322 |
active.h:= frame.h; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
323 |
end; |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
324 |
|
6688 | 325 |
with arrowUp do |
326 |
begin |
|
327 |
show:= false; |
|
328 |
sprite:= sprArrowUp; |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
329 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
330 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
331 |
frame.x:= (cScreenWidth shr 1) - frame.w * 2; |
6798 | 332 |
frame.y:= jumpWidget.frame.y - Round(frame.h * 1.25); |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
333 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
334 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
335 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
336 |
active.h:= frame.h; |
6688 | 337 |
with moveAnim do |
338 |
begin |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
339 |
target.x:= frame.x; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
340 |
target.y:= frame.y; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
341 |
source.x:= frame.x - Round(frame.w * 0.75); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
342 |
source.y:= frame.y; |
6688 | 343 |
end; |
344 |
end; |
|
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
345 |
|
6688 | 346 |
with arrowDown do |
347 |
begin |
|
348 |
show:= false; |
|
349 |
sprite:= sprArrowDown; |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
350 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
351 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
352 |
frame.x:= (cScreenWidth shr 1) - frame.w * 2; |
6798 | 353 |
frame.y:= jumpWidget.frame.y - Round(frame.h * 1.25); |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
354 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
355 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
356 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
357 |
active.h:= frame.h; |
6688 | 358 |
with moveAnim do |
359 |
begin |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
360 |
target.x:= frame.x; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
361 |
target.y:= frame.y; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
362 |
source.x:= frame.x + Round(frame.w * 0.75); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
363 |
source.y:= frame.y; |
6688 | 364 |
end; |
365 |
end; |
|
6685
ef706fccfb0a
moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents:
6683
diff
changeset
|
366 |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
367 |
with pauseButton do |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
368 |
begin |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
369 |
show:= true; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
370 |
sprite:= sprPauseButton; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
371 |
frame.w:= Round(spritesData[sprPauseButton].Texture^.w * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
372 |
frame.h:= Round(spritesData[sprPauseButton].Texture^.h * buttonScale); |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
373 |
frame.x:= cScreenWidth div 2 - frame.w; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
374 |
frame.y:= 0; |
6710
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
375 |
active.x:= frame.x; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
376 |
active.y:= frame.y; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
377 |
active.w:= frame.w; |
42504695122d
fixed the active region on widgets when they are animated, added active.x:= in uWorld too
Xeli
parents:
6706
diff
changeset
|
378 |
active.h:= frame.h; |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
379 |
end; |
6685
ef706fccfb0a
moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents:
6683
diff
changeset
|
380 |
|
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
381 |
with utilityWidget do |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
382 |
begin |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
383 |
show:= false; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
384 |
sprite:= sprTimerButton; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
385 |
frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
386 |
frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
387 |
frame.x:= arrowLeft.frame.x; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
388 |
frame.y:= arrowLeft.frame.y - Round(frame.h * 1.25); |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
389 |
active.x:= frame.x; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
390 |
active.y:= frame.y; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
391 |
active.w:= frame.w; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
392 |
active.h:= frame.h; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
393 |
with moveAnim do |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
394 |
begin |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
395 |
target.x:= frame.x; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
396 |
target.y:= frame.y; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
397 |
source.x:= frame.x; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
398 |
source.y:= frame.y; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
399 |
end; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
400 |
end; |
6637
b4a3310f2974
show buttons on the screen, similar to the iOS overlay
Xeli
parents:
6631
diff
changeset
|
401 |
{$ENDIF} |
161 | 402 |
end; |
403 |
||
6394
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6380
diff
changeset
|
404 |
// for uStore texture resetting |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6380
diff
changeset
|
405 |
procedure ResetWorldTex; |
f0a9042e7387
yay, finally osx (and likely windows) fullscreen switch works like on linux! ALL textures had to be destroyed and recreated only after the new window got created. In other news, the new window must be cleaned with glClear to skip a first frame of garbage and AddProgress is only called the first time.
koda
parents:
6380
diff
changeset
|
406 |
begin |
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
|
407 |
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
|
408 |
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
|
409 |
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
|
410 |
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
|
411 |
FreeAndNilTexture(AmmoMenuTex); |
9983 | 412 |
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
|
413 |
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
|
414 |
|
6622 | 415 |
function GetAmmoMenuTexture(Ammo: PHHAmmo): PTexture; |
3434 | 416 |
const BORDERSIZE = 2; |
6622 | 417 |
var x, y, i, t, SlotsNumY, SlotsNumX, AMFrame: LongInt; |
418 |
STurns: LongInt; |
|
419 |
amSurface: PSDL_Surface; |
|
420 |
AMRect: TSDL_Rect; |
|
7049 | 421 |
{$IFDEF USE_AM_NUMCOLUMN}tmpsurf: PSDL_Surface;{$ENDIF} |
161 | 422 |
begin |
10141 | 423 |
if cOnlyStats then exit(nil); |
10139 | 424 |
|
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
|
425 |
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
|
426 |
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
|
427 |
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
|
428 |
inc(SlotsNum); |
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
429 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
6622 | 430 |
SlotsNumX:= SlotsNum; |
431 |
SlotsNumY:= cMaxSlotAmmoIndex + 2; |
|
6899 | 432 |
{$IFDEF USE_AM_NUMCOLUMN} |
433 |
inc(SlotsNumY); |
|
434 |
{$ENDIF} |
|
6622 | 435 |
{$ELSE} |
436 |
SlotsNumX:= cMaxSlotAmmoIndex + 1; |
|
437 |
SlotsNumY:= SlotsNum + 1; |
|
6899 | 438 |
{$IFDEF USE_AM_NUMCOLUMN} |
439 |
inc(SlotsNumX); |
|
440 |
{$ENDIF} |
|
6622 | 441 |
{$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
|
442 |
|
6899 | 443 |
|
6631 | 444 |
AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1); |
445 |
AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1); |
|
446 |
amSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, AmmoRect.w, AmmoRect.h, 32, RMask, GMask, BMask, AMask); |
|
8330 | 447 |
|
6622 | 448 |
AMRect.x:= BORDERSIZE; |
449 |
AMRect.y:= BORDERSIZE; |
|
6631 | 450 |
AMRect.w:= AmmoRect.w - (BORDERSIZE*2); |
451 |
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
|
452 |
|
6622 | 453 |
SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0)); |
8330 | 454 |
|
6650
56a0b7bf6c15
fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents:
6648
diff
changeset
|
455 |
x:= AMRect.x; |
56a0b7bf6c15
fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents:
6648
diff
changeset
|
456 |
y:= AMRect.y; |
6276
1e2f8da1860a
while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents:
6250
diff
changeset
|
457 |
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
|
458 |
if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then |
3434 | 459 |
begin |
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
460 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
6650
56a0b7bf6c15
fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents:
6648
diff
changeset
|
461 |
y:= AMRect.y; |
6622 | 462 |
{$ELSE} |
6650
56a0b7bf6c15
fixed the blackpixel in the ammomenu, x,y in GetAmmoMenuTexture now initialized correctly
Xeli
parents:
6648
diff
changeset
|
463 |
x:= AMRect.x; |
6622 | 464 |
{$ENDIF} |
6899 | 465 |
{$IFDEF USE_AM_NUMCOLUMN} |
6918 | 466 |
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar('F' + IntToStr(i+1)), cWhiteColorChannels); |
6899 | 467 |
copyToXY(tmpsurf, amSurface, |
468 |
x + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.w shr 1), |
|
469 |
y + AMSlotPadding + (AMSlotSize shr 1) - (tmpsurf^.h shr 1)); |
|
470 |
||
471 |
SDL_FreeSurface(tmpsurf); |
|
472 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
|
473 |
y:= AMRect.y + AMSlotSize + 1; |
|
474 |
{$ELSE} |
|
475 |
x:= AMRect.x + AMSlotSize + 1; |
|
476 |
{$ENDIF} |
|
477 |
{$ENDIF} |
|
478 |
||
479 |
||
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
|
480 |
for t:=0 to cMaxSlotAmmoIndex do |
3434 | 481 |
begin |
6622 | 482 |
if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then |
3434 | 483 |
begin |
6622 | 484 |
STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber; |
485 |
AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1; |
|
486 |
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
|
487 |
begin |
8330 | 488 |
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
|
489 |
y + AMSlotPadding, AMFrame); |
6622 | 490 |
if STurns < 100 then |
8330 | 491 |
DrawSpriteFrame2Surf(sprTurnsLeft, amSurface, |
492 |
x + AMSlotSize-16, |
|
7013 | 493 |
y + AMSlotSize + 1 - 16, STurns); |
6622 | 494 |
end |
495 |
else //draw colored version |
|
496 |
begin |
|
8330 | 497 |
DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding, |
6899 | 498 |
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
|
499 |
end; |
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
500 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
8330 | 501 |
inc(y, AMSlotSize + 1); //the plus one is for the border |
6622 | 502 |
{$ELSE} |
8330 | 503 |
inc(x, AMSlotSize + 1); |
6622 | 504 |
{$ENDIF} |
8330 | 505 |
end; |
506 |
end; |
|
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
507 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
6622 | 508 |
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
|
509 |
{$ELSE} |
6622 | 510 |
inc(y, AMSlotSize + 1); |
511 |
{$ENDIF} |
|
512 |
end; |
|
513 |
||
514 |
for i:= 1 to SlotsNumX -1 do |
|
8330 | 515 |
DrawLine2Surf(amSurface, i * (AMSlotSize+1)+1, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.h + BORDERSIZE - AMSlotSize - 2,160,160,160); |
6622 | 516 |
for i:= 1 to SlotsNumY -1 do |
6652 | 517 |
DrawLine2Surf(amSurface, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.w + BORDERSIZE, i * (AMSlotSize+1)+1,160,160,160); |
6622 | 518 |
|
519 |
//draw outer border |
|
7013 | 520 |
DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0 , 0 , 0); |
521 |
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.y , 1); |
|
522 |
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.x , AMRect.h + BORDERSIZE, 2); |
|
523 |
DrawSpriteFrame2Surf(sprAMCorners, amSurface, AMRect.w + BORDERSIZE, AMRect.h + BORDERSIZE, 3); |
|
6622 | 524 |
|
525 |
for i:=0 to BORDERSIZE-1 do |
|
526 |
begin |
|
527 |
DrawLine2Surf(amSurface, BORDERSIZE, i, AMRect.w + BORDERSIZE, i,160,160,160);//top |
|
528 |
DrawLine2Surf(amSurface, BORDERSIZE, AMRect.h+BORDERSIZE+i, AMRect.w + BORDERSIZE, AMRect.h+BORDERSIZE+i,160,160,160);//bottom |
|
529 |
DrawLine2Surf(amSurface, i, BORDERSIZE, i, AMRect.h + BORDERSIZE,160,160,160);//left |
|
530 |
DrawLine2Surf(amSurface, AMRect.w+BORDERSIZE+i, BORDERSIZE, AMRect.w + BORDERSIZE+i, AMRect.h + BORDERSIZE, 160,160,160);//right |
|
531 |
end; |
|
532 |
||
533 |
GetAmmoMenuTexture:= Surface2Tex(amSurface, false); |
|
534 |
if amSurface <> nil then SDL_FreeSurface(amSurface); |
|
535 |
end; |
|
536 |
||
537 |
procedure ShowAmmoMenu; |
|
538 |
const BORDERSIZE = 2; |
|
539 |
var Slot, Pos: LongInt; |
|
540 |
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
|
541 |
c,i,g,t,STurns: LongInt; |
6622 | 542 |
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
|
543 |
if TurnTimeLeft = 0 then bShowAmmoMenu:= false; |
6622 | 544 |
|
545 |
// give the assigned ammo to hedgehog |
|
546 |
Ammo:= nil; |
|
547 |
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil) |
|
548 |
and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then |
|
6918 | 549 |
Ammo:= CurrentHedgehog^.Ammo |
6622 | 550 |
else if (LocalAmmo <> -1) then |
6918 | 551 |
Ammo:= GetAmmoByNum(LocalAmmo); |
6622 | 552 |
Pos:= -1; |
553 |
if Ammo = nil then |
|
6918 | 554 |
begin |
555 |
bShowAmmoMenu:= false; |
|
556 |
AMState:= AMHidden; |
|
557 |
exit |
|
558 |
end; |
|
6622 | 559 |
|
8330 | 560 |
//Init the menu |
561 |
if(AmmoMenuInvalidated) then |
|
6622 | 562 |
begin |
563 |
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
|
564 |
FreeAndNilTexture(AmmoMenuTex); |
6622 | 565 |
AmmoMenuTex:= GetAmmoMenuTexture(Ammo); |
3697 | 566 |
|
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
567 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
6622 | 568 |
if isPhone() then |
569 |
begin |
|
570 |
AmmoRect.x:= -(AmmoRect.w shr 1); |
|
571 |
AmmoRect.y:= (cScreenHeight shr 1) - (AmmoRect.h shr 1); |
|
572 |
end |
|
573 |
else |
|
574 |
begin |
|
575 |
AmmoRect.x:= -(AmmoRect.w shr 1); |
|
576 |
AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize); |
|
577 |
end; |
|
578 |
{$ELSE} |
|
579 |
AmmoRect.x:= (cScreenWidth shr 1) - AmmoRect.w - AMSlotSize; |
|
580 |
AmmoRect.y:= cScreenHeight - (AmmoRect.h + AMSlotSize); |
|
581 |
{$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
|
582 |
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
|
583 |
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
|
584 |
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
|
585 |
AMShiftTargetY:= cScreenHeight - AmmoRect.y; |
6802 | 586 |
|
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
|
587 |
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
|
588 |
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
|
589 |
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
|
590 |
else AMShiftTargetY:= 0; |
6802 | 591 |
|
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
|
592 |
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
|
593 |
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
|
594 |
end |
6622 | 595 |
end; |
596 |
||
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
597 |
AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration; |
6802 | 598 |
|
599 |
if AMState = AMShowing then |
|
600 |
begin |
|
601 |
FollowGear:=nil; |
|
602 |
end; |
|
603 |
||
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
604 |
if AMState = AMShowingUp then // show ammo menu |
6622 | 605 |
begin |
606 |
if (cReducedQuality and rqSlowMenu) <> 0 then |
|
607 |
begin |
|
608 |
AMShiftX:= 0; |
|
609 |
AMShiftY:= 0; |
|
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
610 |
AMState:= AMShowing; |
6622 | 611 |
end |
612 |
else |
|
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
613 |
if AMAnimState < 1 then |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
614 |
begin |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
615 |
AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState)); |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
616 |
AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState)); |
8330 | 617 |
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
|
618 |
Tint($FF, $ff, $ff, Round($ff * AMAnimState)); |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
619 |
end |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
620 |
else |
6622 | 621 |
begin |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
622 |
AMShiftX:= 0; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
623 |
AMShiftY:= 0; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
624 |
CursorPoint.X:= AmmoRect.x + AmmoRect.w; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
625 |
CursorPoint.Y:= AmmoRect.y; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
626 |
AMState:= AMShowing; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
627 |
end; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
628 |
end; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
629 |
if AMState = AMHiding then // hide ammo menu |
6622 | 630 |
begin |
631 |
if (cReducedQuality and rqSlowMenu) <> 0 then |
|
632 |
begin |
|
633 |
AMShiftX:= AMShiftTargetX; |
|
634 |
AMShiftY:= AMShiftTargetY; |
|
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
635 |
AMState:= AMHidden; |
6622 | 636 |
end |
637 |
else |
|
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
638 |
if AMAnimState < 1 then |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
639 |
begin |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
640 |
AMShiftX:= Round(AMShiftTargetX * AMAnimState); |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
641 |
AMShiftY:= Round(AMShiftTargetY * AMAnimState); |
8330 | 642 |
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
|
643 |
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
|
644 |
end |
8330 | 645 |
else |
6622 | 646 |
begin |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
647 |
AMShiftX:= AMShiftTargetX; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
648 |
AMShiftY:= AMShiftTargetY; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
649 |
prevPoint:= CursorPoint; |
8773 | 650 |
//prevTargetPoint:= TargetCursorPoint; |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
651 |
AMState:= AMHidden; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
652 |
end; |
6622 | 653 |
end; |
8330 | 654 |
|
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
655 |
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
|
656 |
|
8330 | 657 |
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
|
658 |
untint; |
6622 | 659 |
|
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
|
660 |
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
|
661 |
Slot:= -1; |
6899 | 662 |
{$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
|
663 |
c:= -1; |
6622 | 664 |
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
|
665 |
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
|
666 |
begin |
6631 | 667 |
inc(c); |
6918 | 668 |
{$IFDEF USE_AM_NUMCOLUMN} |
6899 | 669 |
g:= 1; |
6918 | 670 |
{$ELSE} |
6622 | 671 |
g:= 0; |
6918 | 672 |
{$ENDIF} |
6622 | 673 |
for t:=0 to cMaxSlotAmmoIndex do |
674 |
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
|
675 |
begin |
6622 | 676 |
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
|
677 |
(CursorPoint.Y > (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and |
8330 | 678 |
(CursorPoint.X > AmmoRect.x + ( c * (AMSlotSize+1))) and |
6631 | 679 |
(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
|
680 |
begin |
6622 | 681 |
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
|
682 |
Pos:= t; |
6622 | 683 |
STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber; |
684 |
if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then |
|
8330 | 685 |
DrawSprite(sprAMSlot, |
686 |
AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding, |
|
6622 | 687 |
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
|
688 |
end; |
6622 | 689 |
inc(g); |
690 |
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
|
691 |
end; |
6622 | 692 |
{$ELSE} |
6918 | 693 |
c:= -1; |
6622 | 694 |
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
|
695 |
if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then |
6622 | 696 |
begin |
6631 | 697 |
inc(c); |
6918 | 698 |
{$IFDEF USE_AM_NUMCOLUMN} |
6899 | 699 |
g:= 1; |
6918 | 700 |
{$ELSE} |
6622 | 701 |
g:= 0; |
6918 | 702 |
{$ENDIF} |
6622 | 703 |
for t:=0 to cMaxSlotAmmoIndex do |
704 |
if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then |
|
705 |
begin |
|
6631 | 706 |
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
|
707 |
(CursorPoint.Y > (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and |
8330 | 708 |
(CursorPoint.X > AmmoRect.x + ( g * (AMSlotSize+1))) and |
6622 | 709 |
(CursorPoint.X <= AmmoRect.x + ((g+1) * (AMSlotSize+1))) then |
710 |
begin |
|
711 |
Slot:= i; |
|
712 |
Pos:= t; |
|
713 |
STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber; |
|
714 |
if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then |
|
8330 | 715 |
DrawSprite(sprAMSlot, |
716 |
AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding, |
|
6631 | 717 |
AmmoRect.y + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding -1, 0); |
6622 | 718 |
end; |
719 |
inc(g); |
|
720 |
end; |
|
721 |
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
|
722 |
{$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
|
723 |
if (Pos >= 0) and (Pos <= cMaxSlotAmmoIndex) and (Slot >= 0) and (Slot <= cMaxSlotIndex) and (Slot <> cHiddenSlotIndex) then |
3967 | 724 |
begin |
6622 | 725 |
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
|
726 |
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
|
727 |
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
|
728 |
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
|
729 |
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
|
730 |
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
|
731 |
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
|
732 |
end; |
3697 | 733 |
|
6622 | 734 |
DrawTexture(AmmoRect.x + (AMSlotSize shr 1), |
735 |
AmmoRect.y + AmmoRect.h - BORDERSIZE - (AMSlotSize shr 1) - (Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex^.h shr 1), |
|
6608 | 736 |
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
|
737 |
if Ammo^[Slot, Pos].Count < AMMO_INFINITE then |
6622 | 738 |
DrawTexture(AmmoRect.x + AmmoRect.w - 20 - (CountTexz[Ammo^[Slot, Pos].Count]^.w), |
739 |
AmmoRect.y + AmmoRect.h - BORDERSIZE - (AMslotSize shr 1) - (CountTexz[Ammo^[Slot, Pos].Count]^.w shr 1), |
|
6608 | 740 |
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
|
741 |
|
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
|
742 |
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
|
743 |
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
|
744 |
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
|
745 |
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
|
746 |
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
|
747 |
FreeAndNilTexture(WeaponTooltipTex); |
6691
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
748 |
{$IFDEF USE_TOUCH_INTERFACE}//show the aiming buttons + animation |
6941
228c0ab239f1
add ammoprop to enable to up and down buttons on for the touch interface
Xeli
parents:
6924
diff
changeset
|
749 |
if (Ammo^[Slot, Pos].Propz and ammoprop_NeedUpDown) <> 0 then |
6691
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
750 |
begin |
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
751 |
if (not arrowUp.show) then |
6691
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
752 |
begin |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
753 |
animateWidget(@arrowUp, true, true); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
754 |
animateWidget(@arrowDown, true, true); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
755 |
end; |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
756 |
end |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
757 |
else |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
758 |
if arrowUp.show then |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
759 |
begin |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
760 |
animateWidget(@arrowUp, true, false); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
761 |
animateWidget(@arrowDown, true, false); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
762 |
end; |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
763 |
SetUtilityWidgetState(Ammo^[Slot, Pos].AmmoType); |
6691
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6688
diff
changeset
|
764 |
{$ENDIF} |
6276
1e2f8da1860a
while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents:
6250
diff
changeset
|
765 |
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
|
766 |
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
|
767 |
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
|
768 |
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
|
769 |
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
|
770 |
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
|
771 |
|
6622 | 772 |
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
|
773 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
774 |
if (not isPhone()) then |
6622 | 775 |
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
|
776 |
{$ELSE} |
6622 | 777 |
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
|
778 |
{$ENDIF} |
961
a9a349b2b3fa
Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents:
956
diff
changeset
|
779 |
|
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
|
780 |
bSelected:= false; |
6899 | 781 |
{$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
|
782 |
if (AMShiftX = 0) and (AMShiftY = 0) then |
6622 | 783 |
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
|
784 |
{$ENDIF} |
4 | 785 |
end; |
786 |
||
3089 | 787 |
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
|
788 |
var i, w, h, lw, lh, rw, rh, sw: LongInt; |
2426 | 789 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
790 |
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
|
791 |
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
|
792 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
793 |
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
|
794 |
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
|
795 |
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
|
796 |
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
|
797 |
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
|
798 |
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
|
799 |
repeat |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
800 |
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
|
801 |
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
|
802 |
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
|
803 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
804 |
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
|
805 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
806 |
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
|
807 |
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
|
808 |
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
|
809 |
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
|
810 |
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
|
811 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
812 |
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
|
813 |
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
|
814 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
815 |
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
|
816 |
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
|
817 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
818 |
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
|
819 |
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
|
820 |
begin |
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 - 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
|
822 |
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
|
823 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
824 |
|
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
825 |
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
|
826 |
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
|
827 |
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
|
828 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
829 |
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
|
830 |
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
|
831 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
832 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
833 |
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
|
834 |
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
|
835 |
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
|
836 |
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
|
837 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
838 |
end |
2426 | 839 |
end; |
840 |
||
841 |
||
956 | 842 |
procedure DrawWorld(Lag: LongInt); |
4 | 843 |
begin |
6734
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
844 |
if ZoomValue < zoom then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
845 |
begin |
6734
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
846 |
zoom:= zoom - 0.002 * Lag; |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
847 |
if ZoomValue > zoom then |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
848 |
zoom:= ZoomValue |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
849 |
end |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
850 |
else |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
851 |
if ZoomValue > zoom then |
3444 | 852 |
begin |
6734
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
853 |
zoom:= zoom + 0.002 * Lag; |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
854 |
if ZoomValue < zoom then |
9709d15dabfa
Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362)
nemo
parents:
6714
diff
changeset
|
855 |
zoom:= ZoomValue |
3444 | 856 |
end |
3611 | 857 |
else |
858 |
ZoomValue:= zoom; |
|
2376 | 859 |
|
9670
1954f692e8c6
Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents:
9666
diff
changeset
|
860 |
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
|
861 |
MoveCamera; |
162 | 862 |
|
3696 | 863 |
if cStereoMode = smNone then |
864 |
begin |
|
10869 | 865 |
RenderClear(); |
3692 | 866 |
DrawWorldStereo(Lag, rmDefault) |
8138
cfb228baa598
Invert S3D_DISABLED to more consistent USE_S3D_RENDERING
Chris Wong <lambda.fairy@gmail.com>
parents:
7946
diff
changeset
|
867 |
{$IFDEF USE_S3D_RENDERING} |
3696 | 868 |
end |
869 |
else |
|
870 |
begin |
|
10869 | 871 |
// draw frame for left eye |
872 |
RenderClear(rmLeftEye); |
|
3696 | 873 |
DrawWorldStereo(Lag, rmLeftEye); |
3692 | 874 |
|
10869 | 875 |
// draw frame for right eye |
876 |
RenderClear(rmRightEye); |
|
3692 | 877 |
DrawWorldStereo(0, rmRightEye); |
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
878 |
{$ENDIF} |
10869 | 879 |
end; |
3692 | 880 |
|
10869 | 881 |
FinishRender(); |
3692 | 882 |
end; |
883 |
||
10494 | 884 |
procedure RenderWorldEdge; |
9654 | 885 |
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
|
886 |
//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
|
887 |
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
|
888 |
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
|
889 |
//c1, c2: LongWord; // couple of colours for edges |
3692 | 890 |
begin |
10318 | 891 |
if (WorldEdge <> weNone) and (WorldEdge <> weSea) then |
9654 | 892 |
begin |
893 |
(* 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. *) |
|
894 |
||
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
|
895 |
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
|
896 |
rect.h:= ViewHeight; |
10494 | 897 |
tmp:= LongInt(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
|
898 |
w:= tmp - ViewLeftX; |
3692 | 899 |
|
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
|
900 |
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
|
901 |
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
|
902 |
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
|
903 |
rect.x:= ViewLeftX; |
10627 | 904 |
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
|
905 |
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
|
906 |
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
|
907 |
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
|
908 |
|
10494 | 909 |
tmp:= LongInt(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
|
910 |
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
|
911 |
|
c243b6a8ad9a
some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping
sheepluva
parents:
10359
diff
changeset
|
912 |
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
|
913 |
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
|
914 |
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
|
915 |
rect.x:= tmp; |
10627 | 916 |
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
|
917 |
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
|
918 |
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
|
919 |
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
|
920 |
|
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 |
(* |
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10510
diff
changeset
|
922 |
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
|
923 |
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
|
924 |
|
9654 | 925 |
glDisable(GL_TEXTURE_2D); |
926 |
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
|
927 |
if (WorldEdge = weWrap) or (worldEdge = weBounce) then |
10275
6c91047f59b6
RAR: cleaning up a bit of the IFDEF-clusterf*ck
sheepluva
parents:
10265
diff
changeset
|
928 |
glColor4ub($00, $00, $00, $40) |
10265
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
929 |
else |
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
930 |
begin |
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
931 |
glEnableClientState(GL_COLOR_ARRAY); |
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
932 |
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
|
933 |
end; |
9654 | 934 |
|
935 |
glPushMatrix; |
|
936 |
glTranslatef(WorldDx, WorldDy, 0); |
|
937 |
||
938 |
VertexBuffer[0].X:= leftX-20; |
|
10265
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
939 |
VertexBuffer[0].Y:= -3500; |
9654 | 940 |
VertexBuffer[1].X:= leftX-20; |
941 |
VertexBuffer[1].Y:= cWaterLine+cVisibleWater; |
|
942 |
VertexBuffer[2].X:= leftX+30; |
|
943 |
VertexBuffer[2].Y:= cWaterLine+cVisibleWater; |
|
944 |
VertexBuffer[3].X:= leftX+30; |
|
10265
7e8d4cd76ce7
darken wrapped areas, which was a very nice suggestion by nemo
sheepluva
parents:
10263
diff
changeset
|
945 |
VertexBuffer[3].Y:= -3500; |
9654 | 946 |
|
947 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
|
948 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
|
949 |
||
950 |
VertexBuffer[0].X:= rightX+20; |
|
951 |
VertexBuffer[1].X:= rightX+20; |
|
952 |
VertexBuffer[2].X:= rightX-30; |
|
953 |
VertexBuffer[3].X:= rightX-30; |
|
954 |
||
955 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
|
956 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
|
957 |
||
958 |
glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WorldEnd[0]); |
|
959 |
||
960 |
VertexBuffer[0].X:= -5000; |
|
961 |
VertexBuffer[1].X:= -5000; |
|
962 |
VertexBuffer[2].X:= leftX-20; |
|
963 |
VertexBuffer[3].X:= leftX-20; |
|
964 |
||
965 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
|
966 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
|
967 |
||
968 |
VertexBuffer[0].X:= rightX+5000; |
|
969 |
VertexBuffer[1].X:= rightX+5000; |
|
970 |
VertexBuffer[2].X:= rightX+20; |
|
971 |
VertexBuffer[3].X:= rightX+20; |
|
972 |
||
973 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
|
974 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
|
975 |
||
976 |
glPopMatrix; |
|
977 |
glDisableClientState(GL_COLOR_ARRAY); |
|
978 |
glEnableClientState(GL_TEXTURE_COORD_ARRAY); |
|
979 |
||
980 |
glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required |
|
981 |
glEnable(GL_TEXTURE_2D); |
|
982 |
||
10015 | 983 |
// I'd still like to have things happen to the border when a wrap or bounce just occurred, based on a timer |
9654 | 984 |
if WorldEdge = weBounce then |
985 |
begin |
|
986 |
// could maybe alternate order of these on a bounce, or maybe drop the outer ones. |
|
987 |
if LeftImpactTimer mod 2 = 0 then |
|
988 |
begin |
|
989 |
c1:= $5454FFFF; c2:= $FFFFFFFF; |
|
990 |
end |
|
991 |
else begin |
|
992 |
c1:= $FFFFFFFF; c2:= $5454FFFF; |
|
993 |
end; |
|
994 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 7.0, c1); |
|
995 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, c2); |
|
996 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 3.0, c1); |
|
997 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 1.0, c2); |
|
998 |
if RightImpactTimer mod 2 = 0 then |
|
999 |
begin |
|
1000 |
c1:= $5454FFFF; c2:= $FFFFFFFF; |
|
1001 |
end |
|
1002 |
else begin |
|
1003 |
c1:= $FFFFFFFF; c2:= $5454FFFF; |
|
1004 |
end; |
|
1005 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 7.0, c1); |
|
1006 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, c2); |
|
1007 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 3.0, c1); |
|
1008 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 1.0, c2) |
|
1009 |
end |
|
1010 |
else if WorldEdge = weWrap then |
|
1011 |
begin |
|
1012 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-LeftImpactTimer)); |
|
1013 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 2.0, $FF0000FF); |
|
1014 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $A0, $30, $60, max(50,255-RightImpactTimer)); |
|
1015 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 2.0, $FF0000FF); |
|
1016 |
end |
|
1017 |
else |
|
1018 |
begin |
|
1019 |
DrawLine(leftX, -3000, leftX, cWaterLine+cVisibleWater, 5.0, $2E8B5780); |
|
1020 |
DrawLine(rightX, -3000, rightX, cWaterLine+cVisibleWater, 5.0, $2E8B5780) |
|
1021 |
end; |
|
1022 |
if LeftImpactTimer > Lag then dec(LeftImpactTimer,Lag) else LeftImpactTimer:= 0; |
|
1023 |
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
|
1024 |
*) |
9654 | 1025 |
end; |
1026 |
end; |
|
1027 |
||
1028 |
||
1029 |
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
|
1030 |
var t, i, h, v, smallScreenOffset, TeamHealthBarWidth : LongInt; |
9654 | 1031 |
r: TSDL_Rect; |
1032 |
highlight: boolean; |
|
13140
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13018
diff
changeset
|
1033 |
hasVisibleHog: boolean; |
9656 | 1034 |
htex: PTexture; |
9654 | 1035 |
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
|
1036 |
if VisibleTeamsCount * 20 > Longword(cScreenHeight) div 7 then // take up less screen on small displays |
9654 | 1037 |
begin |
1038 |
SetScale(1.5); |
|
1039 |
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
|
1040 |
if VisibleTeamsCount * 100 > Longword(cScreenHeight) then |
9654 | 1041 |
Tint($FF,$FF,$FF,$80); |
1042 |
end |
|
1043 |
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
|
1044 |
v:= 0; // for updating VisibleTeamsCount |
9654 | 1045 |
for t:= 0 to Pred(TeamsCount) do |
1046 |
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
|
1047 |
begin |
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13018
diff
changeset
|
1048 |
hasVisibleHog:= false; |
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13018
diff
changeset
|
1049 |
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
|
1050 |
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
|
1051 |
hasVisibleHog:= true; |
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13018
diff
changeset
|
1052 |
if (TeamHealth > 0) and hasVisibleHog then |
9654 | 1053 |
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
|
1054 |
// 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
|
1055 |
inc(v); |
9654 | 1056 |
highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500); |
1057 |
||
1058 |
if highlight then |
|
9656 | 1059 |
begin |
9654 | 1060 |
Tint(Clan^.Color shl 8 or $FF); |
9656 | 1061 |
htex:= GenericHealthTexture |
1062 |
end |
|
1063 |
else |
|
1064 |
htex:= Clan^.HealthTex; |
|
9654 | 1065 |
|
9791
446e4919b738
Display team owner in teams widget (addresses issue 174)
unc0rr
parents:
9755
diff
changeset
|
1066 |
// draw owner |
446e4919b738
Display team owner in teams widget (addresses issue 174)
unc0rr
parents:
9755
diff
changeset
|
1067 |
if OwnerTex <> nil then |
446e4919b738
Display team owner in teams widget (addresses issue 174)
unc0rr
parents:
9755
diff
changeset
|
1068 |
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
|
1069 |
|
446e4919b738
Display team owner in teams widget (addresses issue 174)
unc0rr
parents:
9755
diff
changeset
|
1070 |
// draw name |
9654 | 1071 |
DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex); |
1072 |
||
1073 |
// draw flag |
|
1074 |
DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex); |
|
1075 |
||
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
|
1076 |
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
|
1077 |
|
9654 | 1078 |
// draw health bar |
1079 |
r.x:= 0; |
|
1080 |
r.y:= 0; |
|
1081 |
r.w:= 2 + TeamHealthBarWidth; |
|
9656 | 1082 |
r.h:= htex^.h; |
1083 |
DrawTextureFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex); |
|
9654 | 1084 |
|
1085 |
// draw health bars right border |
|
1086 |
inc(r.x, cTeamHealthWidth + 2); |
|
1087 |
r.w:= 3; |
|
9656 | 1088 |
DrawTextureFromRect(TeamHealthBarWidth + 15, cScreenHeight + DrawHealthY + smallScreenOffset, @r, htex); |
9654 | 1089 |
|
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
|
1090 |
h:= 0; |
9654 | 1091 |
if not hasGone then |
1092 |
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
|
1093 |
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
|
1094 |
inc(h, Hedgehogs[i].HealthBarHealth); |
10015 | 1095 |
if (h < TeamHealthBarHealth) and (Hedgehogs[i].HealthBarHealth > 0) then |
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9693
diff
changeset
|
1096 |
DrawTexture(15 + h * TeamHealthBarWidth div TeamHealthBarHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture); |
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9693
diff
changeset
|
1097 |
end; |
9654 | 1098 |
|
13018
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1099 |
// 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
|
1100 |
if (hasLuaTeamValue) then |
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1101 |
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
|
1102 |
// 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
|
1103 |
else if (GameFlags and gfAISurvival) <> 0 then |
9654 | 1104 |
DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, AIKillsTex); |
1105 |
||
1106 |
// if highlighted, draw flag and other contents again to keep their colors |
|
1107 |
// this approach should be faster than drawing all borders one by one tinted or not |
|
1108 |
if highlight then |
|
1109 |
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
|
1110 |
if VisibleTeamsCount * 100 > Longword(cScreenHeight) then |
9654 | 1111 |
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
|
1112 |
else untint; |
9654 | 1113 |
|
1114 |
// draw name |
|
1115 |
r.x:= 2; |
|
1116 |
r.y:= 2; |
|
1117 |
r.w:= NameTagTex^.w - 4; |
|
1118 |
r.h:= NameTagTex^.h - 4; |
|
1119 |
DrawTextureFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex); |
|
10147 | 1120 |
|
1121 |
if OwnerTex <> nil then |
|
1122 |
begin |
|
1123 |
r.w:= OwnerTex^.w - 4; |
|
1124 |
r.h:= OwnerTex^.h - 4; |
|
1125 |
DrawTextureFromRect(-OwnerTex^.w - NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, OwnerTex) |
|
1126 |
end; |
|
1127 |
||
13018
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1128 |
if (hasLuaTeamValue) then |
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1129 |
begin |
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1130 |
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
|
1131 |
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
|
1132 |
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
|
1133 |
end |
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12831
diff
changeset
|
1134 |
else if (GameFlags and gfAISurvival) <> 0 then |
10147 | 1135 |
begin |
1136 |
r.w:= AIKillsTex^.w - 4; |
|
1137 |
r.h:= AIKillsTex^.h - 4; |
|
1138 |
DrawTextureFromRect(TeamHealthBarWidth + 24, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, AIKillsTex); |
|
1139 |
end; |
|
1140 |
||
9654 | 1141 |
// draw flag |
1142 |
r.w:= 22; |
|
1143 |
r.h:= 15; |
|
1144 |
DrawTextureFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex); |
|
10317 | 1145 |
end |
1146 |
// draw an arrow next to active team |
|
1147 |
else if (CurrentTeam = TeamsArray[t]) and (TurnTimeLeft > 0) then |
|
1148 |
begin |
|
1149 |
h:= -NameTagTex^.w - 24; |
|
1150 |
if OwnerTex <> nil then |
|
1151 |
h:= h - OwnerTex^.w - 4; |
|
1152 |
DrawSpriteRotatedF(sprFinger, h, cScreenHeight + DrawHealthY + smallScreenOffset + 2 + SpritesData[sprFinger].Width div 4, 0, 1, -90); |
|
9654 | 1153 |
end; |
1154 |
end; |
|
13140
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13018
diff
changeset
|
1155 |
end; |
9654 | 1156 |
if smallScreenOffset <> 0 then |
1157 |
begin |
|
1158 |
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
|
1159 |
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
|
1160 |
untint; |
9654 | 1161 |
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
|
1162 |
VisibleTeamsCount:= v; |
9654 | 1163 |
end; |
1164 |
||
1165 |
||
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
|
1166 |
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
|
1167 |
|
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1168 |
procedure ShiftWorld(Dir: LongInt); inline; |
3692 | 1169 |
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
|
1170 |
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
|
1171 |
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
|
1172 |
|
3692 | 1173 |
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
|
1174 |
|
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1175 |
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
|
1176 |
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
|
1177 |
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
|
1178 |
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
|
1179 |
|
3692 | 1180 |
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode); |
9654 | 1181 |
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
|
1182 |
spr: TSprite; |
3692 | 1183 |
r: TSDL_Rect; |
1184 |
tdx, tdy: Double; |
|
7016 | 1185 |
s: shortstring; |
9654 | 1186 |
offsetX, offsetY, screenBottom: LongInt; |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1187 |
replicateToLeft, replicateToRight, tmp: boolean; |
12697
c71e330d5094
Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents:
12694
diff
changeset
|
1188 |
{$IFDEF USE_VIDEO_RECORDING} |
c71e330d5094
Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents:
12694
diff
changeset
|
1189 |
a: Byte; |
c71e330d5094
Add missing variable in uWorld.pas in videorec builds
Wuzzy <almikes@aol.com>
parents:
12694
diff
changeset
|
1190 |
{$ENDIF} |
3692 | 1191 |
begin |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1192 |
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
|
1193 |
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
|
1194 |
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
|
1195 |
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
|
1196 |
end |
10358 | 1197 |
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
|
1198 |
begin |
10494 | 1199 |
replicateToLeft := (LongInt(leftX) + WorldDx > ViewLeftX); |
1200 |
replicateToRight:= (LongInt(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
|
1201 |
end; |
10358 | 1202 |
|
10318 | 1203 |
ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine); |
1204 |
||
1205 |
// note: offsetY is negative! |
|
10319 | 1206 |
offsetY:= 10 * Min(0, -145 - ScreenBottom); // TODO limit this in the other direction too |
10318 | 1207 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1208 |
if (cReducedQuality and rqNoBackground) = 0 then |
1812 | 1209 |
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
|
1210 |
// 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
|
1211 |
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
|
1212 |
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
|
1213 |
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
|
1214 |
HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20); |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
1215 |
|
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
|
1216 |
// background |
3688 | 1217 |
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
|
1218 |
if SuddenDeathDmg then |
12097
ebe87b6ed182
add alpha for sd-tint, since CopherNeue thinks the textures might need fading
nemo
parents:
12072
diff
changeset
|
1219 |
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
|
1220 |
DrawRepeated(sprSky, sprSkyL, sprSkyR, (WorldDx + LAND_WIDTH div 2) * 3 div 8, SkyOffset); |
3688 | 1221 |
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
|
1222 |
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
|
1223 |
if SuddenDeathDmg then |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9656
diff
changeset
|
1224 |
untint; |
3611 | 1225 |
end; |
4 | 1226 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1227 |
DrawVisualGears(0); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1228 |
ChangeDepth(RM, -cStereo_MidDistance); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1229 |
DrawVisualGears(4); |
3697 | 1230 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1231 |
if (cReducedQuality and rq2DWater) = 0 then |
3611 | 1232 |
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
|
1233 |
// Waves |
10318 | 1234 |
DrawWater(255, SkyOffset, 0); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1235 |
ChangeDepth(RM, -cStereo_Water_distant); |
10318 | 1236 |
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
|
1237 |
ChangeDepth(RM, -cStereo_Water_distant); |
10318 | 1238 |
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
|
1239 |
ChangeDepth(RM, -cStereo_Water_distant); |
10318 | 1240 |
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
|
1241 |
ChangeDepth(RM, -cStereo_Water_distant); |
10318 | 1242 |
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
|
1243 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1244 |
else |
10318 | 1245 |
DrawWaves(-1, 100, - cWaveHeight div 2, - cWaveHeight div 2, 0); |
4 | 1246 |
|
10533 | 1247 |
ChangeDepth(RM, cStereo_Land); |
1248 |
DrawVisualGears(5); |
|
1249 |
DrawLand(WorldDx, WorldDy); |
|
4 | 1250 |
|
10533 | 1251 |
if replicateToLeft then |
1252 |
begin |
|
1253 |
ShiftWorld(-1); |
|
3611 | 1254 |
DrawLand(WorldDx, WorldDy); |
10533 | 1255 |
UnshiftWorld(); |
1256 |
end; |
|
1911 | 1257 |
|
10533 | 1258 |
if replicateToRight then |
1259 |
begin |
|
1260 |
ShiftWorld(1); |
|
1261 |
DrawLand(WorldDx, WorldDy); |
|
1262 |
UnshiftWorld(); |
|
1263 |
end; |
|
4 | 1264 |
|
10533 | 1265 |
DrawWater(255, 0, 0); |
4 | 1266 |
|
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1267 |
(* |
1660 | 1268 |
// Attack bar |
5862 | 1269 |
if CurrentTeam <> nil then |
3611 | 1270 |
case AttackBar of |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1271 |
//1: begin |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1272 |
//r:= StuffPoz[sPowerBar]; |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1273 |
//{$WARNINGS OFF} |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1274 |
//r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor; |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1275 |
//{$WARNINGS ON} |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1276 |
//DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface); |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1277 |
//end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1278 |
2: with CurrentHedgehog^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1279 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1280 |
tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1281 |
tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1282 |
for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1283 |
DrawSprite(sprPower, |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
4132
diff
changeset
|
1284 |
hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16, |
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
4132
diff
changeset
|
1285 |
hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16, |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1286 |
i) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1287 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1288 |
end; |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1289 |
*) |
1911 | 1290 |
|
10359 | 1291 |
tmp:= bShowFinger; |
1292 |
bShowFinger:= false; |
|
1293 |
||
10358 | 1294 |
if replicateToLeft then |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1295 |
begin |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1296 |
ShiftWorld(-1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1297 |
DrawVisualGears(1); |
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1298 |
DrawGears(); |
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1299 |
DrawVisualGears(6); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1300 |
UnshiftWorld(); |
10358 | 1301 |
end; |
1302 |
||
1303 |
if replicateToRight then |
|
1304 |
begin |
|
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1305 |
ShiftWorld(1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1306 |
DrawVisualGears(1); |
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1307 |
DrawGears(); |
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1308 |
DrawVisualGears(6); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1309 |
UnshiftWorld(); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1310 |
end; |
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1311 |
|
10359 | 1312 |
bShowFinger:= tmp; |
4 | 1313 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1314 |
DrawVisualGears(1); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1315 |
DrawGears; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1316 |
DrawVisualGears(6); |
4 | 1317 |
|
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1318 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1319 |
if SuddenDeathDmg then |
10318 | 1320 |
DrawWater(SDWaterOpacity, 0, 0) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1321 |
else |
10318 | 1322 |
DrawWater(WaterOpacity, 0, 0); |
2269
00f5704f5f39
add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents:
2268
diff
changeset
|
1323 |
|
3611 | 1324 |
// Waves |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1325 |
ChangeDepth(RM, cStereo_Water_near); |
10318 | 1326 |
DrawWaves( 1, 25 - WorldDx div 9, 0, 0, 12); |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
1327 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1328 |
if (cReducedQuality and rq2DWater) = 0 then |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
1329 |
begin |
6982 | 1330 |
//DrawWater(WaterOpacity, - offsetY div 40); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1331 |
ChangeDepth(RM, cStereo_Water_near); |
10318 | 1332 |
DrawWaves(-1, 50 + WorldDx div 6, - offsetY div 40, 23, 8); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1333 |
if SuddenDeathDmg then |
10318 | 1334 |
DrawWater(SDWaterOpacity, - offsetY div 20, 23) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1335 |
else |
10318 | 1336 |
DrawWater(WaterOpacity, - offsetY div 20, 23); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1337 |
ChangeDepth(RM, cStereo_Water_near); |
10318 | 1338 |
DrawWaves( 1, 75 - WorldDx div 4, - offsetY div 20, 37, 2); |
4792
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4748
diff
changeset
|
1339 |
if SuddenDeathDmg then |
10318 | 1340 |
DrawWater(SDWaterOpacity, - offsetY div 10, 47) |
4792
68f9b331014a
sudden death changes: only change visual bit on health decrease and support for water transparancy change and clouds number change
Henek
parents:
4748
diff
changeset
|
1341 |
else |
10318 | 1342 |
DrawWater(WaterOpacity, - offsetY div 10, 47); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1343 |
ChangeDepth(RM, cStereo_Water_near); |
10318 | 1344 |
DrawWaves( -1, 25 + WorldDx div 3, - offsetY div 10, 59, 0); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1345 |
end |
3611 | 1346 |
else |
10318 | 1347 |
DrawWaves(-1, 50, cWaveHeight div 2, cWaveHeight div 2, 0); |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1348 |
|
12210
442bab755bb4
Render gear timers in front of water
Wuzzy <almikes@aol.com>
parents:
12097
diff
changeset
|
1349 |
DrawGearsTimers; |
442bab755bb4
Render gear timers in front of water
Wuzzy <almikes@aol.com>
parents:
12097
diff
changeset
|
1350 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1351 |
// everything after this ChangeDepth will be drawn outside the screen |
4818
202eef454354
rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents:
4816
diff
changeset
|
1352 |
// note: negative parallax gears should last very little for a smooth stereo effect |
202eef454354
rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents:
4816
diff
changeset
|
1353 |
ChangeDepth(RM, cStereo_Outside); |
10358 | 1354 |
|
1355 |
if replicateToLeft then |
|
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1356 |
begin |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1357 |
ShiftWorld(-1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1358 |
DrawVisualGears(2); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1359 |
UnshiftWorld(); |
10358 | 1360 |
end; |
1361 |
||
1362 |
if replicateToRight then |
|
1363 |
begin |
|
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1364 |
ShiftWorld(1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1365 |
DrawVisualGears(2); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1366 |
UnshiftWorld(); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1367 |
end; |
10358 | 1368 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1369 |
DrawVisualGears(2); |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1370 |
|
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1371 |
// everything after this ResetDepth will be drawn at screen level (depth = 0) |
4818
202eef454354
rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents:
4816
diff
changeset
|
1372 |
// note: everything that needs to be readable should be on this level |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1373 |
ResetDepth(RM); |
10358 | 1374 |
|
1375 |
if replicateToLeft then |
|
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1376 |
begin |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1377 |
ShiftWorld(-1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1378 |
DrawVisualGears(3); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1379 |
UnshiftWorld(); |
10358 | 1380 |
end; |
1381 |
||
1382 |
if replicateToRight then |
|
1383 |
begin |
|
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1384 |
ShiftWorld(1); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1385 |
DrawVisualGears(3); |
10507
ed5df9cd251f
I'm such a dirty boi... cleaning up my own mess a little
sheepluva
parents:
10494
diff
changeset
|
1386 |
UnshiftWorld(); |
10263
6ef900411158
here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam
sheepluva
parents:
10251
diff
changeset
|
1387 |
end; |
10358 | 1388 |
|
4818
202eef454354
rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents:
4816
diff
changeset
|
1389 |
DrawVisualGears(3); |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1390 |
|
2288 | 1391 |
{$WARNINGS OFF} |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1392 |
// Target |
3104 | 1393 |
if (TargetPoint.X <> NoPointX) and (CurrentTeam <> nil) and (CurrentHedgehog <> nil) then |
1394 |
begin |
|
1395 |
with PHedgehog(CurrentHedgehog)^ do |
|
1396 |
begin |
|
5372
7283bc768228
Change bee pos sprite, make aiming napalm a little easier, adjust napalm flames to be more centred on the target
nemo
parents:
5302
diff
changeset
|
1397 |
if CurAmmoType = amBee then |
6999 | 1398 |
DrawSpriteRotatedF(sprTargetBee, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360) |
3110 | 1399 |
else |
6999 | 1400 |
DrawSpriteRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360) |
5372
7283bc768228
Change bee pos sprite, make aiming napalm a little easier, adjust napalm flames to be more centred on the target
nemo
parents:
5302
diff
changeset
|
1401 |
end |
3104 | 1402 |
end; |
4 | 1403 |
{$WARNINGS ON} |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1404 |
|
10494 | 1405 |
RenderWorldEdge(); |
9473
a51a69094c24
partial implementation of non-infinite world (edge wrap/warp/bounce)
nemo
parents:
9377
diff
changeset
|
1406 |
|
3523 | 1407 |
// this scale is used to keep the various widgets at the same dimension at all zoom levels |
1408 |
SetScale(cDefaultZoomLevel); |
|
2724 | 1409 |
|
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1410 |
// cinematic effects |
11524 | 1411 |
if CinematicScript or (InCinematicMode and autoCameraOn |
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1412 |
and ((CurrentHedgehog = nil) or CurrentHedgehog^.Team^.ExtDriven |
11520 | 1413 |
or (CurrentHedgehog^.BotLevel <> 0) or (GameType = gmtDemo))) then |
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1414 |
begin |
11522 | 1415 |
if CinematicSteps < 300 then |
1416 |
begin |
|
1417 |
inc(CinematicSteps, Lag); |
|
1418 |
if CinematicSteps > 300 then |
|
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1419 |
CinematicSteps:= 300; |
11522 | 1420 |
end; |
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1421 |
end |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1422 |
else if CinematicSteps > 0 then |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1423 |
begin |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1424 |
dec(CinematicSteps, Lag); |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1425 |
if CinematicSteps < 0 then |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1426 |
CinematicSteps:= 0; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1427 |
end; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1428 |
|
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1429 |
// render black bars |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1430 |
if CinematicSteps > 0 then |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1431 |
begin |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1432 |
r.x:= ViewLeftX; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1433 |
r.w:= ViewWidth; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1434 |
r.y:= ViewTopY; |
11525 | 1435 |
CinematicBarH:= (ViewHeight * CinematicSteps) div 2048; |
11519
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1436 |
r.h:= CinematicBarH; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1437 |
DrawRect(r, 0, 0, 0, $FF, true); |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1438 |
r.y:= ViewBottomY - r.h; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1439 |
DrawRect(r, 0, 0, 0, $FF, true); |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1440 |
end; |
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1441 |
|
aab4767d9a50
adding a "cinematic mode" - currently: black bars on bottom/top. triggered by rcplane when pressing enter
sheepluva
parents:
11362
diff
changeset
|
1442 |
|
2724 | 1443 |
// Turn time |
9693 | 1444 |
if UIDisplay <> uiNone then |
3774 | 1445 |
begin |
9693 | 1446 |
{$IFDEF USE_TOUCH_INTERFACE} |
1447 |
offsetX:= cScreenHeight - 13; |
|
1448 |
{$ELSE} |
|
1449 |
offsetX:= 48; |
|
1450 |
{$ENDIF} |
|
1451 |
offsetY:= cOffsetY; |
|
11917
d819c04d0cbe
Show timer at 999s instead of 1000s
Wuzzy <almikes@aol.com>
parents:
11916
diff
changeset
|
1452 |
if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 999000)) or (ReadyTimeLeft <> 0) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1453 |
begin |
9693 | 1454 |
if ReadyTimeLeft <> 0 then |
1455 |
i:= Succ(Pred(ReadyTimeLeft) div 1000) |
|
1456 |
else |
|
1457 |
i:= Succ(Pred(TurnTimeLeft) div 1000); |
|
10015 | 1458 |
|
9693 | 1459 |
if i>99 then |
1460 |
t:= 112 |
|
1461 |
else if i>9 then |
|
1462 |
t:= 96 |
|
1463 |
else |
|
1464 |
t:= 80; |
|
1465 |
DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1); |
|
1466 |
while i > 0 do |
|
1467 |
begin |
|
1468 |
dec(t, 32); |
|
11916
38fa4583e7f3
Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents:
11913
diff
changeset
|
1469 |
if isPaused or (not IsClockRunning()) then |
38fa4583e7f3
Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents:
11913
diff
changeset
|
1470 |
spr := sprBigDigitGray |
38fa4583e7f3
Make timer gray while the time is not running or while it is paused
Wuzzy <almikes@aol.com>
parents:
11913
diff
changeset
|
1471 |
else if (ReadyTimeLeft <> 0) then |
11912
d3a852554aa7
Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents:
11895
diff
changeset
|
1472 |
spr := sprBigDigitGreen |
11913
232b57a70aca
Make the timer red when it is the get-away time
Wuzzy <almikes@aol.com>
parents:
11912
diff
changeset
|
1473 |
else if IsGetAwayTime then |
232b57a70aca
Make the timer red when it is the get-away time
Wuzzy <almikes@aol.com>
parents:
11912
diff
changeset
|
1474 |
spr := sprBigDigitRed |
11912
d3a852554aa7
Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents:
11895
diff
changeset
|
1475 |
else |
d3a852554aa7
Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents:
11895
diff
changeset
|
1476 |
spr := sprBigDigit; |
d3a852554aa7
Turn timer digits green when it's still the ready timer
Wuzzy <almikes@aol.com>
parents:
11895
diff
changeset
|
1477 |
DrawSprite(spr, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10); |
9693 | 1478 |
i:= i div 10 |
1479 |
end; |
|
1480 |
DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1481 |
end; |
79 | 1482 |
|
4 | 1483 |
// Captions |
9693 | 1484 |
DrawCaptions |
1485 |
end; |
|
4 | 1486 |
|
6676
21cf35a570a7
add keywords for landscape ammomenu and touch interface
koda
parents:
6652
diff
changeset
|
1487 |
{$IFDEF USE_TOUCH_INTERFACE} |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5824
diff
changeset
|
1488 |
// Draw buttons Related to the Touch interface |
6688 | 1489 |
DrawScreenWidget(@arrowLeft); |
1490 |
DrawScreenWidget(@arrowRight); |
|
1491 |
DrawScreenWidget(@arrowUp); |
|
1492 |
DrawScreenWidget(@arrowDown); |
|
1493 |
||
1494 |
DrawScreenWidget(@fireButton); |
|
6714
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
1495 |
DrawScreenWidget(@jumpWidget); |
f2f93017132c
moved the firebutton, added the AMWidget button and removed the forwardjump widget(it's longpress on backjump now)
Xeli
parents:
6710
diff
changeset
|
1496 |
DrawScreenWidget(@AMWidget); |
6688 | 1497 |
DrawScreenWidget(@pauseButton); |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6802
diff
changeset
|
1498 |
DrawScreenWidget(@utilityWidget); |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
1499 |
{$ENDIF} |
6601
5965e2927b3d
fixed the ammo menu on android, on tablets all weapons are 'choosable' and on phones I've moved the ammomenu up a bit
Xeli
parents:
6580
diff
changeset
|
1500 |
|
9693 | 1501 |
if UIDisplay = uiAll then |
1502 |
RenderTeamsHealth; |
|
47 | 1503 |
|
5 | 1504 |
// Lag alert |
7392
bc3306c59a08
Correctly distinguish between game and real ticks while recording video,
Stepan777 <stepik-777@mail.ru>
parents:
7386
diff
changeset
|
1505 |
if isInLag then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1506 |
DrawSprite(sprLag, 32 - (cScreenWidth shr 1), 32, (RealTicks shr 7) mod 12); |
4 | 1507 |
|
5 | 1508 |
// Wind bar |
9693 | 1509 |
if UIDisplay <> uiNone then |
1510 |
begin |
|
6685
ef706fccfb0a
moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents:
6683
diff
changeset
|
1511 |
{$IFDEF USE_TOUCH_INTERFACE} |
3405 | 1512 |
offsetX:= cScreenHeight - 13; |
1513 |
offsetY:= (cScreenWidth shr 1) + 74; |
|
2567 | 1514 |
{$ELSE} |
3405 | 1515 |
offsetX:= 30; |
1516 |
offsetY:= 180; |
|
2567 | 1517 |
{$ENDIF} |
3405 | 1518 |
DrawSprite(sprWindBar, (cScreenWidth shr 1) - offsetY, cScreenHeight - offsetX, 0); |
1519 |
if WindBarWidth > 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1520 |
begin |
3405 | 1521 |
{$WARNINGS OFF} |
1522 |
r.x:= 8 - (RealTicks shr 6) mod 8; |
|
1523 |
{$WARNINGS ON} |
|
1524 |
r.y:= 0; |
|
1525 |
r.w:= WindBarWidth; |
|
1526 |
r.h:= 13; |
|
1527 |
DrawSpriteFromRect(sprWindR, r, (cScreenWidth shr 1) - offsetY + 77, cScreenHeight - offsetX + 2, 13, 0); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1528 |
end |
3405 | 1529 |
else |
1530 |
if WindBarWidth < 0 then |
|
1531 |
begin |
|
9693 | 1532 |
{$WARNINGS OFF} |
1533 |
r.x:= (Longword(WindBarWidth) + RealTicks shr 6) mod 8; |
|
1534 |
{$WARNINGS ON} |
|
1535 |
r.y:= 0; |
|
1536 |
r.w:= - WindBarWidth; |
|
1537 |
r.h:= 13; |
|
1538 |
DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0); |
|
1539 |
end |
|
1540 |
end; |
|
5 | 1541 |
|
11887
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1542 |
{$IFNDEF USE_TOUCH_INTERFACE} |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1543 |
// Indicators for global effects (extra damage, low gravity) |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1544 |
// TODO: Add support for touch interface (need to find out correct offset) |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1545 |
if UIDisplay <> uiNone then |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1546 |
begin |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1547 |
offsetX:= 45; |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1548 |
offsetY:= 51; |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1549 |
|
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1550 |
if cDamageModifier = _1_5 then |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1551 |
begin |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1552 |
DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32); |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1553 |
DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amExtraDamage) - 1, 1, 32, 32); |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1554 |
offsetX := offsetX + 33 |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1555 |
end; |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1556 |
if (cLowGravity) or ((GameFlags and gfLowGravity) <> 0) then |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1557 |
begin |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1558 |
DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32); |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1559 |
DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amLowGravity) - 1, 1, 32, 32); |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1560 |
end; |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1561 |
end; |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1562 |
{$ENDIF} |
083c12795632
Show symbols at bottom right while extra damage / low grav. are active
Wuzzy <almikes@aol.com>
parents:
11881
diff
changeset
|
1563 |
|
161 | 1564 |
// AmmoMenu |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1565 |
if bShowAmmoMenu and ((AMState = AMHidden) or (AMState = AMHiding)) then |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1566 |
begin |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1567 |
if (AMState = AMHidden) then |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1568 |
AMAnimStartTime:= RealTicks |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1569 |
else |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1570 |
AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime)); |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1571 |
AMState:= AMShowingUp; |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1572 |
end; |
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
1573 |
if (not bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1574 |
begin |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1575 |
if (AMState = AMShowing) then |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1576 |
AMAnimStartTime:= RealTicks |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1577 |
else |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1578 |
AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime)); |
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1579 |
AMState:= AMHiding; |
8330 | 1580 |
end; |
6795
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1581 |
|
e4831e13e04a
make ammomenu's speed dependent on RealTicks rather than frames
Xeli
parents:
6794
diff
changeset
|
1582 |
if bShowAmmoMenu or (AMState = AMHiding) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1583 |
ShowAmmoMenu; |
161 | 1584 |
|
2287 | 1585 |
// Cursor |
1586 |
if isCursorVisible and bShowAmmoMenu then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1587 |
DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8); |
942 | 1588 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1589 |
// Chat |
2287 | 1590 |
DrawChat; |
4 | 1591 |
|
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1592 |
|
4976 | 1593 |
// various captions |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1594 |
if fastUntilLag then |
6999 | 1595 |
DrawTextureCentered(0, (cScreenHeight shr 1), SyncTexture); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1596 |
if isPaused then |
6999 | 1597 |
DrawTextureCentered(0, (cScreenHeight shr 1), PauseTexture); |
9670
1954f692e8c6
Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents:
9666
diff
changeset
|
1598 |
if isAFK then |
1954f692e8c6
Quick and simple implementation of afk mode (toggled by /pause)
unc0rr
parents:
9666
diff
changeset
|
1599 |
DrawTextureCentered(0, (cScreenHeight shr 1), AFKTexture); |
3774 | 1600 |
if not isFirstFrame and (missionTimer <> 0) or isPaused or fastUntilLag or (GameState = gsConfirm) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1601 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1602 |
if (ReadyTimeLeft = 0) and (missionTimer > 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1603 |
dec(missionTimer, Lag); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1604 |
if missionTimer < 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1605 |
missionTimer:= 0; // avoid subtracting below 0 |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1606 |
if missionTex <> nil then |
6999 | 1607 |
DrawTextureCentered(0, Min((cScreenHeight shr 1) + 100, cScreenHeight - 48 - missionTex^.h), missionTex); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1608 |
end; |
2786 | 1609 |
|
2724 | 1610 |
// fps |
6685
ef706fccfb0a
moved other widgets under the USE_TOUCH_INTERFACE, added pause button (at least, graphically...)
koda
parents:
6683
diff
changeset
|
1611 |
{$IFDEF USE_TOUCH_INTERFACE} |
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
1612 |
offsetX:= pauseButton.frame.y + pauseButton.frame.h + 12; |
2724 | 1613 |
{$ELSE} |
3463 | 1614 |
offsetX:= 10; |
2724 | 1615 |
{$ENDIF} |
3463 | 1616 |
offsetY:= cOffsetY; |
3696 | 1617 |
if (RM = rmDefault) or (RM = rmRightEye) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1618 |
begin |
3692 | 1619 |
inc(Frames); |
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1620 |
|
3692 | 1621 |
if cShowFPS or (GameType = gmtDemo) then |
1622 |
inc(CountTicks, Lag); |
|
1623 |
if (GameType = gmtDemo) and (CountTicks >= 1000) then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1624 |
begin |
7016 | 1625 |
i:= GameTicks div 1000; |
3692 | 1626 |
t:= i mod 60; |
1627 |
s:= inttostr(t); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1628 |
if t < 10 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1629 |
s:= '0' + s; |
3692 | 1630 |
i:= i div 60; |
1631 |
t:= i mod 60; |
|
1632 |
s:= inttostr(t) + ':' + s; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1633 |
if t < 10 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1634 |
s:= '0' + s; |
3692 | 1635 |
s:= inttostr(i div 60) + ':' + s; |
8330 | 1636 |
|
1637 |
||
3692 | 1638 |
tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels); |
1639 |
tmpSurface:= doSurfaceConversion(tmpSurface); |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10628
diff
changeset
|
1640 |
FreeAndNilTexture(timeTexture); |
3692 | 1641 |
timeTexture:= Surface2Tex(tmpSurface, false); |
1642 |
SDL_FreeSurface(tmpSurface) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1643 |
end; |
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1644 |
|
3692 | 1645 |
if timeTexture <> nil then |
1646 |
DrawTexture((cScreenWidth shr 1) - 20 - timeTexture^.w - offsetY, offsetX + timeTexture^.h+5, timeTexture); |
|
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1647 |
|
3692 | 1648 |
if cShowFPS then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1649 |
begin |
3692 | 1650 |
if CountTicks >= 1000 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1651 |
begin |
3692 | 1652 |
FPS:= Frames; |
1653 |
Frames:= 0; |
|
1654 |
CountTicks:= 0; |
|
13156
26f0c3669b4e
Make a few more engine strings translatable
Wuzzy <Wuzzy2@mail.ru>
parents:
13140
diff
changeset
|
1655 |
s:= Format(trmsg[sidFPS], inttostr(FPS)); |
3692 | 1656 |
tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels); |
1657 |
tmpSurface:= doSurfaceConversion(tmpSurface); |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10628
diff
changeset
|
1658 |
FreeAndNilTexture(fpsTexture); |
3692 | 1659 |
fpsTexture:= Surface2Tex(tmpSurface, false); |
1660 |
SDL_FreeSurface(tmpSurface) |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1661 |
end; |
3692 | 1662 |
if fpsTexture <> nil then |
1663 |
DrawTexture((cScreenWidth shr 1) - 60 - offsetY, offsetX, fpsTexture); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1664 |
end; |
3692 | 1665 |
end; |
1666 |
||
756 | 1667 |
|
2724 | 1668 |
if GameState = gsConfirm then |
8675
3fb25201d303
This has bothered me for the longest time. Move texture so it doesn't overlap. I'd initially had a test for isPaused, but jumping texture bothered me.
nemo
parents:
8471
diff
changeset
|
1669 |
DrawTextureCentered(0, (cScreenHeight shr 1)-40, ConfirmTexture); |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1670 |
|
3107 | 1671 |
if ScreenFade <> sfNone then |
1672 |
begin |
|
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
1673 |
if (not isFirstFrame) then |
3107 | 1674 |
case ScreenFade of |
1675 |
sfToBlack, sfToWhite: if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then |
|
1676 |
inc(ScreenFadeValue, Lag * ScreenFadeSpeed) |
|
1677 |
else |
|
3123 | 1678 |
ScreenFadeValue:= sfMax; |
3107 | 1679 |
sfFromBlack, sfFromWhite: if ScreenFadeValue - Lag * ScreenFadeSpeed > 0 then |
1680 |
dec(ScreenFadeValue, Lag * ScreenFadeSpeed) |
|
1681 |
else |
|
3123 | 1682 |
ScreenFadeValue:= 0; |
3107 | 1683 |
end; |
1684 |
if ScreenFade <> sfNone then |
|
1685 |
begin |
|
10871 | 1686 |
r.x:= ViewLeftX; |
1687 |
r.y:= ViewTopY; |
|
1688 |
r.w:= ViewWidth; |
|
1689 |
r.h:= ViewHeight; |
|
1690 |
||
3107 | 1691 |
case ScreenFade of |
10871 | 1692 |
sfToBlack, sfFromBlack: DrawRect(r, 0, 0, 0, ScreenFadeValue * 255 div 1000, true); |
1693 |
sfToWhite, sfFromWhite: DrawRect(r, $FF, $FF, $FF, ScreenFadeValue * 255 div 1000, true); |
|
3107 | 1694 |
end; |
3697 | 1695 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1696 |
if not isFirstFrame and ((ScreenFadeValue = 0) or (ScreenFadeValue = sfMax)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1697 |
ScreenFade:= sfNone |
3107 | 1698 |
end |
1699 |
end; |
|
1700 |
||
7198
5debd5fe526e
1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents:
7194
diff
changeset
|
1701 |
{$IFDEF USE_VIDEO_RECORDING} |
5debd5fe526e
1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents:
7194
diff
changeset
|
1702 |
// during video prerecording draw red blinking circle and text 'rec' |
7180 | 1703 |
if flagPrerecording then |
1704 |
begin |
|
1705 |
if recTexture = nil then |
|
1706 |
begin |
|
1707 |
s:= 'rec'; |
|
1708 |
tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fntBig].Handle, Str2PChar(s), cWhiteColorChannels); |
|
1709 |
tmpSurface:= doSurfaceConversion(tmpSurface); |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10628
diff
changeset
|
1710 |
FreeAndNilTexture(recTexture); |
7180 | 1711 |
recTexture:= Surface2Tex(tmpSurface, false); |
1712 |
SDL_FreeSurface(tmpSurface) |
|
1713 |
end; |
|
1714 |
DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture); |
|
1715 |
||
10871 | 1716 |
//a:= Byte(Round(127*(1 + sin(RealTicks*0.007)))); |
1717 |
a:= Byte(min(255, abs(-255 + ((RealTicks div 2) and 511)))); |
|
1718 |
||
7180 | 1719 |
// draw red circle |
10871 | 1720 |
DrawCircleFilled(-(cScreenWidth shr 1) + 30, 35, 10, $FF, $00, $00, a); |
7180 | 1721 |
end; |
7198
5debd5fe526e
1. Add IFDEFs for video recording
Stepan777 <stepik-777@mail.ru>
parents:
7194
diff
changeset
|
1722 |
{$ENDIF} |
7180 | 1723 |
|
3123 | 1724 |
SetScale(zoom); |
1725 |
||
7858 | 1726 |
// Attack bar |
1727 |
if CurrentTeam <> nil then |
|
1728 |
case AttackBar of |
|
1729 |
(* 1: begin |
|
1730 |
r:= StuffPoz[sPowerBar]; |
|
1731 |
{$WARNINGS OFF} |
|
1732 |
r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor; |
|
1733 |
{$WARNINGS ON} |
|
1734 |
DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface); |
|
1735 |
end;*) |
|
1736 |
2: with CurrentHedgehog^ do |
|
1737 |
begin |
|
1738 |
tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle); |
|
1739 |
tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle); |
|
1740 |
for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do |
|
1741 |
DrawSprite(sprPower, |
|
1742 |
hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16, |
|
1743 |
hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16, |
|
1744 |
i) |
|
1745 |
end |
|
1746 |
end; |
|
1747 |
||
1748 |
||
3123 | 1749 |
// Cursor |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1750 |
if isCursorVisible and (not bShowAmmoMenu) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1751 |
begin |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1752 |
if not CurrentTeam^.ExtDriven then TargetCursorPoint:= CursorPoint; |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1753 |
with CurrentHedgehog^ do |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1754 |
if (Gear <> nil) and ((Gear^.State and gstChooseTarget) <> 0) then |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1755 |
begin |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1756 |
if (CurAmmoType = amNapalm) or (CurAmmoType = amMineStrike) or (((GameFlags and gfMoreWind) <> 0) and ((CurAmmoType = amDrillStrike) or (CurAmmoType = amAirAttack))) then |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1757 |
DrawLine(-3000, topY-300, 7000, topY-300, 3.0, (Team^.Clan^.Color shr 16), (Team^.Clan^.Color shr 8) and $FF, Team^.Clan^.Color and $FF, $FF); |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1758 |
i:= GetCurAmmoEntry(CurrentHedgehog^)^.Pos; |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1759 |
with Ammoz[CurAmmoType] do |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1760 |
if PosCount > 1 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1761 |
begin |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1762 |
if (CurAmmoType = amGirder) or (CurAmmoType = amTeleport) then |
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10160
diff
changeset
|
1763 |
begin |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1764 |
// pulsating transparency |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1765 |
if ((GameTicks div 16) mod $80) >= $40 then |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1766 |
Tint($FF, $FF, $FF, $C0 - (GameTicks div 16) mod $40) |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1767 |
else |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1768 |
Tint($FF, $FF, $FF, $80 + (GameTicks div 16) mod $40); |
10251
a3b42e81803c
collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P
sheepluva
parents:
10160
diff
changeset
|
1769 |
end; |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1770 |
DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i); |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1771 |
Untint(); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1772 |
end; |
10978
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1773 |
end; |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1774 |
//DrawSprite(sprArrow, TargetCursorPoint.X, cScreenHeight - TargetCursorPoint.Y, (RealTicks shr 6) mod 8) |
54a49174dbec
cursor x/y when targeting for mikade's visual effects. this is not synced
nemo
parents:
10939
diff
changeset
|
1775 |
DrawTextureF(SpritesData[sprArrow].Texture, cDefaultZoomLevel / cScaleFactor, TargetCursorPoint.X + round(SpritesData[sprArrow].Width / cScaleFactor), cScreenHeight + round(SpritesData[sprArrow].Height / cScaleFactor) - TargetCursorPoint.Y, (RealTicks shr 6) mod 8, 1, SpritesData[sprArrow].Width, SpritesData[sprArrow].Height); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1776 |
end; |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7946
diff
changeset
|
1777 |
|
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1778 |
// debug stuff |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1779 |
if cViewLimitsDebug then |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1780 |
begin |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1781 |
r.x:= ViewLeftX; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1782 |
r.y:= ViewTopY; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1783 |
r.w:= ViewWidth; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1784 |
r.h:= ViewHeight; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1785 |
DrawRect(r, 255, 0, 0, 128, false); |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1786 |
end; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10300
diff
changeset
|
1787 |
|
3107 | 1788 |
isFirstFrame:= false |
4 | 1789 |
end; |
1790 |
||
7343 | 1791 |
var PrevSentPointTime: LongWord = 0; |
1792 |
||
79 | 1793 |
procedure MoveCamera; |
10939 | 1794 |
var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY, dstX: LongInt; |
9755
6306b54dd8fc
don't allow autocamera to mess with targetting when e.g. spamming air-attacks in inf attack mode
sheepluva
parents:
9720
diff
changeset
|
1795 |
inbtwnTrgtAttks: Boolean; |
4 | 1796 |
begin |
5502 | 1797 |
{$IFNDEF MOBILE} |
8373
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8370
diff
changeset
|
1798 |
if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
1799 |
uCursor.updatePosition(); |
3551 | 1800 |
{$ENDIF} |
5852 | 1801 |
z:= round(200/zoom); |
10672 | 1802 |
inbtwnTrgtAttks := ((GameFlags and gfInfAttack) <> 0) and (CurrentHedgehog <> nil) and ((CurrentHedgehog^.Gear = nil) or (CurrentHedgehog^.Gear <> FollowGear)) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0); |
9954 | 1803 |
if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then |
7187
aff30d80bd7b
- Allow camera movement while current hedgehog is falling
unc0rr
parents:
7167
diff
changeset
|
1804 |
if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then |
6296 | 1805 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1806 |
FollowGear:= nil; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1807 |
prevPoint:= CursorPoint; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1808 |
exit |
6296 | 1809 |
end |
3680 | 1810 |
else |
6296 | 1811 |
begin |
10917 | 1812 |
dstX:= hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx; |
10662 | 1813 |
|
10917 | 1814 |
if (WorldEdge = weWrap) then |
1815 |
begin |
|
1816 |
if dstX - prevPoint.X < (LongInt(leftX) - rightX) div 2 then |
|
1817 |
CursorPoint.X:= (prevPoint.X * 7 + dstX - (leftX - rightX)) div 8 |
|
1818 |
else if dstX - prevPoint.X > (LongInt(rightX) - leftX) div 2 then |
|
1819 |
CursorPoint.X:= (prevPoint.X * 7 + dstX - (rightX - leftX)) div 8 |
|
1820 |
else |
|
1821 |
CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8; |
|
1822 |
end |
|
1823 |
else // usual camera movement routine |
|
1824 |
begin |
|
1825 |
CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8; |
|
1826 |
end; |
|
10160 | 1827 |
|
11156
efea685933ae
fix pas2c build, it was broken in the long long ago ( 97f9a25024e6 )
sheepluva
parents:
11151
diff
changeset
|
1828 |
if isPhone() or (cScreenHeight < 600) or (hwFloat(FollowGear^.dY * z).Round < 10) then |
6016
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
1829 |
CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8 |
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
1830 |
else |
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
1831 |
CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8; |
6296 | 1832 |
end; |
4 | 1833 |
|
10917 | 1834 |
if (WorldEdge = weWrap) then |
1835 |
begin |
|
1836 |
if -WorldDx < leftX then |
|
1837 |
WorldDx:= WorldDx - LongInt(rightX) + leftX |
|
1838 |
else if -WorldDx > rightX then |
|
1839 |
WorldDx:= WorldDx + LongInt(rightX) - leftX; |
|
1840 |
end; |
|
1841 |
||
11524 | 1842 |
wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - (cVisibleWater + trunc(CinematicBarH / (cScaleFactor / 2.0))); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1843 |
if WorldDy < wdy then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1844 |
WorldDy:= wdy; |
2375 | 1845 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1846 |
if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1847 |
exit; |
4 | 1848 |
|
6802 | 1849 |
if (AMState = AMShowingUp) or (AMState = AMShowing) then |
3680 | 1850 |
begin |
7841
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1851 |
{$IFDEF USE_LANDSCAPE_AMMOMENU} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1852 |
amNumOffsetX:= 0; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1853 |
{$IFDEF USE_AM_NUMCOLUMN} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1854 |
amNumOffsetY:= AMSlotSize; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1855 |
{$ELSE} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1856 |
amNumOffsetY:= 0; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1857 |
{$ENDIF} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1858 |
{$ELSE} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1859 |
amNumOffsetY:= 0; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1860 |
{$IFDEF USE_AM_NUMCOLUMN} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1861 |
amNumOffsetX:= AMSlotSize; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1862 |
{$ELSE} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1863 |
amNumOffsetX:= 0; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1864 |
{$ENDIF} |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1865 |
|
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1866 |
{$ENDIF} |
8330 | 1867 |
if CursorPoint.X < AmmoRect.x + amNumOffsetX + 3 then//check left |
7841
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1868 |
CursorPoint.X:= AmmoRect.x + amNumOffsetX + 3; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1869 |
if CursorPoint.X > AmmoRect.x + AmmoRect.w - 3 then//check right |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1870 |
CursorPoint.X:= AmmoRect.x + AmmoRect.w - 3; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1871 |
if CursorPoint.Y > cScreenHeight - AmmoRect.y -amNumOffsetY - 1 then//check top |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1872 |
CursorPoint.Y:= cScreenHeight - AmmoRect.y - amNumOffsetY - 1; |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1873 |
if CursorPoint.Y < cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5) then//check bottom |
43e68ac28d79
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
Xeli
parents:
7840
diff
changeset
|
1874 |
CursorPoint.Y:= cScreenHeight - (AmmoRect.y + AmmoRect.h - AMSlotSize - 5); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1875 |
prevPoint:= CursorPoint; |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
1876 |
//if cHasFocus then SDL_WarpMouse(CursorPoint.X + cScreenWidth div 2, cScreenHeight - CursorPoint.Y); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1877 |
exit |
3680 | 1878 |
end; |
162 | 1879 |
|
4 | 1880 |
if isCursorVisible then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1881 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1882 |
if (not CurrentTeam^.ExtDriven) and (GameTicks >= PrevSentPointTime + cSendCursorPosTime) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1883 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1884 |
SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1885 |
PrevSentPointTime:= GameTicks |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1886 |
end; |
3680 | 1887 |
EdgesDist:= cCursorEdgesDist |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1888 |
end |
3680 | 1889 |
else |
1890 |
EdgesDist:= cGearScrEdgesDist; |
|
1891 |
||
1892 |
// this generates the border around the screen that moves the camera when cursor is near it |
|
8373
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8370
diff
changeset
|
1893 |
if (CurrentTeam^.ExtDriven and isCursorVisible and autoCameraOn) or |
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8370
diff
changeset
|
1894 |
(not CurrentTeam^.ExtDriven and isCursorVisible) or ((FollowGear <> nil) and autoCameraOn) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1895 |
begin |
3680 | 1896 |
if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1897 |
begin |
3680 | 1898 |
WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist; |
1899 |
CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1900 |
end |
3680 | 1901 |
else |
1902 |
if CursorPoint.X > cScreenWidth div 2 - EdgesDist then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1903 |
begin |
3680 | 1904 |
WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist; |
1905 |
CursorPoint.X:= cScreenWidth div 2 - EdgesDist |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1906 |
end; |
5149
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1907 |
|
5302 | 1908 |
shs:= min(cScreenHeight div 2 - trunc(cScreenHeight / cScaleFactor) + EdgesDist, cScreenHeight - EdgesDist); |
5149
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1909 |
if CursorPoint.Y < shs then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1910 |
begin |
5149
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1911 |
WorldDy:= WorldDy + CursorPoint.Y - shs; |
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1912 |
CursorPoint.Y:= shs; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1913 |
end |
3680 | 1914 |
else |
5302 | 1915 |
if (CursorPoint.Y > cScreenHeight - EdgesDist) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1916 |
begin |
3680 | 1917 |
WorldDy:= WorldDy + CursorPoint.Y - cScreenHeight + EdgesDist; |
1918 |
CursorPoint.Y:= cScreenHeight - EdgesDist |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1919 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1920 |
end |
3680 | 1921 |
else |
1922 |
if cHasFocus then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1923 |
begin |
3680 | 1924 |
WorldDx:= WorldDx - CursorPoint.X + prevPoint.X; |
1925 |
WorldDy:= WorldDy + CursorPoint.Y - prevPoint.Y; |
|
1926 |
CursorPoint.X:= 0; |
|
1927 |
CursorPoint.Y:= cScreenHeight div 2; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1928 |
end; |
351 | 1929 |
|
3680 | 1930 |
// this moves the camera according to CursorPoint X and Y |
4 | 1931 |
prevPoint:= CursorPoint; |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
1932 |
//if cHasFocus then SDL_WarpMouse(CursorPoint.X + (cScreenWidth shr 1), cScreenHeight - CursorPoint.Y); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1933 |
if WorldDy > LAND_HEIGHT + 1024 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1934 |
WorldDy:= LAND_HEIGHT + 1024; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1935 |
if WorldDy < wdy then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1936 |
WorldDy:= wdy; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1937 |
if WorldDx < - LAND_WIDTH - 1024 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1938 |
WorldDx:= - LAND_WIDTH - 1024; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1939 |
if WorldDx > 1024 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1940 |
WorldDx:= 1024; |
4 | 1941 |
end; |
1942 |
||
2905 | 1943 |
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt); |
2786 | 1944 |
var r: TSDL_Rect; |
1945 |
begin |
|
10139 | 1946 |
if cOnlyStats then exit; |
1947 |
||
2786 | 1948 |
r.w:= 32; |
1949 |
r.h:= 32; |
|
1950 |
||
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1951 |
if time = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
1952 |
time:= 5000; |
2786 | 1953 |
missionTimer:= time; |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10628
diff
changeset
|
1954 |
FreeAndNilTexture(missionTex); |
2786 | 1955 |
|
1956 |
if icon > -1 then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1957 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1958 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1959 |
r.y:= icon * 32; |
10124
aabd1b75d5a3
Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents:
10122
diff
changeset
|
1960 |
missionTex:= RenderHelpWindow(caption, subcaption, text, ansistring(''), 0, MissionIcons, @r) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1961 |
end |
2786 | 1962 |
else |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1963 |
begin |
4626
775f43e90383
fixed showmission so it actually displays the right icons
Henek
parents:
4482
diff
changeset
|
1964 |
r.x:= ((-icon - 1) shr 4) * 32; |
775f43e90383
fixed showmission so it actually displays the right icons
Henek
parents:
4482
diff
changeset
|
1965 |
r.y:= ((-icon - 1) mod 16) * 32; |
10124
aabd1b75d5a3
Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents:
10122
diff
changeset
|
1966 |
missionTex:= RenderHelpWindow(caption, subcaption, text, ansistring(''), 0, SpritesData[sprAMAmmos].Surface, @r) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1967 |
end; |
2786 | 1968 |
end; |
1969 |
||
1970 |
procedure HideMission; |
|
1971 |
begin |
|
3045 | 1972 |
missionTimer:= 0; |
2786 | 1973 |
end; |
1974 |
||
13370
e202d58236b1
Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents:
13174
diff
changeset
|
1975 |
procedure SetAmmoTexts(ammoType: TAmmoType; name: ansistring; caption: ansistring; description: ansistring; autoLabels: boolean); |
11939
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1976 |
var |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1977 |
ammoStrId: TAmmoStrId; |
11940
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1978 |
ammoStr: ansistring; |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1979 |
tmpsurf: PSDL_Surface; |
11939
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1980 |
begin |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1981 |
ammoStrId := Ammoz[ammoType].NameId; |
11940
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1982 |
|
11939
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1983 |
trluaammo[ammoStrId] := name; |
11940
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1984 |
if length(trluaammo[ammoStrId]) > 0 then |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1985 |
ammoStr:= trluaammo[ammoStrId] |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1986 |
else |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1987 |
ammoStr:= trammo[ammoStrId]; |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1988 |
|
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1989 |
if checkFails(length(ammoStr) > 0,'No default text/translation found for ammo type #' + intToStr(ord(ammoType)) + '!',true) then exit; |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1990 |
|
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1991 |
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(ammoStr,fnt16)].Handle, PChar(ammoStr), cWhiteColorChannels); |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1992 |
if checkFails(tmpsurf <> nil,'Name-texture creation for ammo type #' + intToStr(ord(ammoType)) + ' failed!',true) then exit; |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1993 |
tmpsurf:= doSurfaceConversion(tmpsurf); |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1994 |
FreeAndNilTexture(Ammoz[ammoType].NameTex); |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1995 |
Ammoz[ammoType].NameTex:= Surface2Tex(tmpsurf, false); |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1996 |
SDL_FreeSurface(tmpsurf); |
156f1866b8bd
Make SetAmmoTexts update ammo menu weapon name, too
Wuzzy <almikes@aol.com>
parents:
11939
diff
changeset
|
1997 |
|
11939
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1998 |
trluaammoc[ammoStrId] := caption; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
1999 |
trluaammod[ammoStrId] := description; |
13370
e202d58236b1
Lua API: Add 5th parameter showExtra to SetAmmoTexts to hide extra text
Wuzzy <Wuzzy2@mail.ru>
parents:
13174
diff
changeset
|
2000 |
trluaammoe[ammoStrId] := autoLabels; |
11939
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
2001 |
end; |
c7ec309cd685
Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents:
11917
diff
changeset
|
2002 |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
2003 |
procedure ShakeCamera(amount: LongInt); |
3032 | 2004 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2005 |
if isCursorVisible then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2006 |
exit; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2007 |
amount:= Max(1, round(amount*zoom/2)); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2008 |
WorldDx:= WorldDx - amount + LongInt(random(1 + amount * 2)); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2009 |
WorldDy:= WorldDy - amount + LongInt(random(1 + amount * 2)); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2010 |
//CursorPoint.X:= CursorPoint.X - amount + LongInt(random(1 + amount * 2)); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6492
diff
changeset
|
2011 |
//CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2)) |
3032 | 2012 |
end; |
2013 |
||
5521 | 2014 |
|
2015 |
procedure onFocusStateChanged; |
|
2016 |
begin |
|
2017 |
if (not cHasFocus) and (GameState <> gsConfirm) then |
|
5523 | 2018 |
ParseCommand('quit', true); |
9688 | 2019 |
{$IFDEF MOBILE} |
7847 | 2020 |
// when created SDL receives an exposure event that calls UndampenAudio at full power, muting audio |
2021 |
exit; |
|
2022 |
{$ENDIF} |
|
6862 | 2023 |
|
7286 | 2024 |
{$IFDEF USE_VIDEO_RECORDING} |
7180 | 2025 |
// do not change volume during prerecording as it will affect sound in video file |
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
2026 |
if (not flagPrerecording) then |
7286 | 2027 |
{$ENDIF} |
7180 | 2028 |
begin |
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8026
diff
changeset
|
2029 |
if (not cHasFocus) then DampenAudio() |
7180 | 2030 |
else UndampenAudio(); |
2031 |
end; |
|
5521 | 2032 |
end; |
2033 |
||
10392 | 2034 |
procedure updateCursorVisibility; |
10510 | 2035 |
begin |
12831 | 2036 |
if isPaused or isAFK then |
2037 |
SDL_ShowCursor(1) |
|
10392 | 2038 |
else |
12831 | 2039 |
SDL_ShowCursor(ord(GameState = gsConfirm)) |
5521 | 2040 |
end; |
2041 |
||
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2042 |
procedure SetUtilityWidgetState(ammoType: TAmmoType); |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2043 |
begin |
7086 | 2044 |
{$IFDEF USE_TOUCH_INTERFACE} |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2045 |
if(ammoType = amNothing)then |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2046 |
ammoType:= CurrentHedgehog^.CurAmmoType; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2047 |
|
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2048 |
if(CurrentHedgehog <> nil)then |
11211
1fa57188a469
- Workaround for wrong sprite in utility widget when selecting DrillStrike
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
2049 |
if ((Ammoz[ammoType].Ammo.Propz and ammoprop_Timerable) <> 0) and (ammoType <> amDrillStrike) then |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2050 |
begin |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2051 |
utilityWidget.sprite:= sprTimerButton; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2052 |
animateWidget(@utilityWidget, true, true); |
8330 | 2053 |
end |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2054 |
else if (Ammoz[ammoType].Ammo.Propz and ammoprop_NeedTarget) <> 0 then |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2055 |
begin |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2056 |
utilityWidget.sprite:= sprTargetButton; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2057 |
animateWidget(@utilityWidget, true, true); |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2058 |
end |
6962 | 2059 |
else if ammoType = amSwitch then |
2060 |
begin |
|
11210
22f2e072d31e
- Target button added to mobile touch controls
antonc27 <antonc27@mail.ru>
parents:
11156
diff
changeset
|
2061 |
utilityWidget.sprite:= sprSwitchButton; |
6962 | 2062 |
animateWidget(@utilityWidget, true, true); |
2063 |
end |
|
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2064 |
else if utilityWidget.show then |
6992 | 2065 |
animateWidget(@utilityWidget, true, false); |
2066 |
{$ELSE} |
|
2067 |
ammoType:= ammoType; // avoid hint |
|
6963 | 2068 |
{$ENDIF} |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2069 |
end; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
2070 |
|
6688 | 2071 |
procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean); |
2072 |
begin |
|
2073 |
with widget^ do |
|
2074 |
begin |
|
2075 |
show:= showWidget; |
|
2076 |
if fade then fadeAnimStart:= RealTicks; |
|
8330 | 2077 |
|
6688 | 2078 |
with moveAnim do |
2079 |
begin |
|
2080 |
animate:= true; |
|
2081 |
startTime:= RealTicks; |
|
6695
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2082 |
source.x:= source.x xor target.x; //swap source <-> target |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2083 |
target.x:= source.x xor target.x; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2084 |
source.x:= source.x xor target.x; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2085 |
source.y:= source.y xor target.y; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2086 |
target.y:= source.y xor target.y; |
32de8965c62c
refactored a few types involved in the touch interface and corrected a few invisible mistakes
koda
parents:
6692
diff
changeset
|
2087 |
source.y:= source.y xor target.y; |
6688 | 2088 |
end; |
2089 |
end; |
|
2090 |
end; |
|
2091 |
||
5521 | 2092 |
|
3038 | 2093 |
procedure initModule; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
2094 |
begin |
7027 | 2095 |
fpsTexture:= nil; |
7180 | 2096 |
recTexture:= nil; |
7027 | 2097 |
FollowGear:= nil; |
2098 |
WindBarWidth:= 0; |
|
2099 |
bShowAmmoMenu:= false; |
|
2100 |
bSelected:= false; |
|
2101 |
bShowFinger:= false; |
|
2102 |
Frames:= 0; |
|
2103 |
WorldDx:= -512; |
|
2104 |
WorldDy:= -256; |
|
7343 | 2105 |
PrevSentPointTime:= 0; |
3697 | 2106 |
|
7027 | 2107 |
FPS:= 0; |
2108 |
CountTicks:= 0; |
|
2109 |
SoundTimerTicks:= 0; |
|
2110 |
prevPoint.X:= 0; |
|
2111 |
prevPoint.Y:= 0; |
|
2112 |
missionTimer:= 0; |
|
2113 |
missionTex:= nil; |
|
2114 |
cOffsetY:= 0; |
|
2115 |
AMState:= AMHidden; |
|
2116 |
isFirstFrame:= true; |
|
9557 | 2117 |
|
2118 |
FillChar(WorldFade, sizeof(WorldFade), 0); |
|
2119 |
WorldFade[0].a:= 255; |
|
2120 |
WorldFade[1].a:= 255; |
|
2121 |
FillChar(WorldEnd, sizeof(WorldEnd), 0); |
|
2122 |
WorldEnd[0].a:= 255; |
|
2123 |
WorldEnd[1].a:= 255; |
|
2124 |
WorldEnd[2].a:= 255; |
|
2125 |
WorldEnd[3].a:= 255; |
|
2126 |
||
9983 | 2127 |
AmmoMenuTex:= nil; |
2128 |
AmmoMenuInvalidated:= true |
|
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
2129 |
end; |
4 | 2130 |
|
3038 | 2131 |
procedure freeModule; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
2132 |
begin |
7850 | 2133 |
ResetWorldTex(); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
2134 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
2135 |
|
4 | 2136 |
end. |