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