author | unc0rr |
Thu, 17 Nov 2011 21:44:35 +0300 | |
changeset 6392 | f2ef5a8cccb4 |
parent 6380 | 1ff5ad1d771b |
child 6394 | f0a9042e7387 |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
4976 | 3 |
* Copyright (c) 2004-2011 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 |
|
4357
a1fcfc341a52
Introduce unit uTypes in order to remove some cyclic unit dependencies
unC0Rr
parents:
4248
diff
changeset
|
24 |
uses SDLh, uGears, uConsts, uFloat, uRandom, uTypes; |
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; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
30 |
procedure DrawWorld(Lag: LongInt); |
3692 | 31 |
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode); |
2905 | 32 |
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt); |
2786 | 33 |
procedure HideMission; |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
34 |
procedure ShakeCamera(amount: LongInt); |
5682
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
35 |
procedure InitCameraBorders; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3629
diff
changeset
|
36 |
procedure MoveCamera; |
5521 | 37 |
procedure onFocusStateChanged; |
4 | 38 |
|
39 |
implementation |
|
4359 | 40 |
uses |
41 |
uStore, |
|
42 |
uMisc, |
|
43 |
uIO, |
|
44 |
uLocale, |
|
45 |
uSound, |
|
46 |
uAmmos, |
|
47 |
uVisualGears, |
|
48 |
uChat, |
|
49 |
uLandTexture, |
|
50 |
GLunit, |
|
4374 | 51 |
uVariables, |
4375 | 52 |
uUtils, |
4378 | 53 |
uTextures, |
4380 | 54 |
uRender, |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
55 |
uCaptions, |
5521 | 56 |
uCursor, |
6016
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
57 |
uCommands, |
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
58 |
uMobile |
4359 | 59 |
; |
4 | 60 |
|
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
61 |
var cWaveWidth, cWaveHeight: LongInt; |
3434 | 62 |
AMSlotSize, AMxOffset, AMyOffset, AMWidth, AMxShift, SlotsNum: LongInt; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
63 |
tmpSurface: PSDL_Surface; |
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
64 |
fpsTexture: PTexture; |
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
65 |
timeTexture: PTexture; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
66 |
FPS: Longword; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
67 |
CountTicks: Longword; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
68 |
SoundTimerTicks: Longword; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
69 |
prevPoint: TPoint; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
70 |
amSel: TAmmoType = amNothing; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
71 |
missionTex: PTexture; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
72 |
missionTimer: LongInt; |
4850 | 73 |
stereoDepth: GLfloat; |
3692 | 74 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
75 |
const cStereo_Sky = 0.0500; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
76 |
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
|
77 |
cStereo_MidDistance = 0.0175; |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
78 |
cStereo_Water_distant = 0.0125; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
79 |
cStereo_Land = 0.0075; |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
80 |
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
|
81 |
cStereo_Outside = -0.0400; |
4 | 82 |
|
83 |
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
|
84 |
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
|
85 |
cp: PClan; |
2863 | 86 |
g: ansistring; |
87 |
||
2904 | 88 |
// helper functions to create the goal/game mode string |
2908 | 89 |
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring; |
2905 | 90 |
var t: ansistring; |
2904 | 91 |
begin |
92 |
if (GameFlags and gf) <> 0 then |
|
93 |
begin |
|
94 |
t:= inttostr(i); |
|
95 |
s:= s + format(trgoal[si], t) + '|' |
|
96 |
end; |
|
97 |
AddGoal:= s; |
|
98 |
end; |
|
99 |
||
2908 | 100 |
function AddGoal(s: ansistring; gf: longword; si: TGoalStrId): ansistring; |
2863 | 101 |
begin |
2904 | 102 |
if (GameFlags and gf) <> 0 then |
103 |
s:= s + trgoal[si] + '|'; |
|
2863 | 104 |
AddGoal:= s; |
105 |
end; |
|
4 | 106 |
begin |
3764 | 107 |
missionTimer:= 0; |
2786 | 108 |
|
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 |
if (GameFlags and gfRandomOrder) <> 0 then // shuffle them up a bit |
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 |
begin |
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
111 |
for i:= 0 to ClansCount * 4 do |
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
112 |
begin |
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
|
113 |
t:= GetRandom(ClansCount); |
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
|
114 |
if t <> 0 then |
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 |
begin |
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
|
116 |
cp:= ClansArray[0]; |
51cda17b7c3b
Rolling random numbers before land is generated is bad, m'kay? InitWorld probably not the best place for it.
nemo
parents:
2699
diff
changeset
|
117 |
ClansArray[0]:= ClansArray[t]; |
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
|
118 |
ClansArray[t]:= cp; |
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
|
119 |
ClansArray[t]^.ClanIndex:= t; |
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
|
120 |
ClansArray[0]^.ClanIndex:= 0; |
2856
cc70797a0b75
Adjust LocalClan when shuffling, set to -1 in case all local clans are bots.
nemo
parents:
2855
diff
changeset
|
121 |
if (LocalClan = t) then LocalClan:= 0 |
cc70797a0b75
Adjust LocalClan when shuffling, set to -1 in case all local clans are bots.
nemo
parents:
2855
diff
changeset
|
122 |
else if (LocalClan = 0) then LocalClan:= t |
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
|
123 |
end; |
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
|
124 |
end; |
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
|
125 |
CurrentTeam:= ClansArray[0]^.Teams[0]; |
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
|
126 |
end; |
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
|
127 |
|
2908 | 128 |
// if special game flags/settings are changed, add them to the game mode notice window and then show it |
2863 | 129 |
g:= ''; // no text/things to note yet |
2908 | 130 |
|
4883
7cddc9201a1d
added dummy for tardis and ugly icons for tardis and structure
Henek
parents:
4850
diff
changeset
|
131 |
// add custom goals from lua script if there are any |
7cddc9201a1d
added dummy for tardis and ugly icons for tardis and structure
Henek
parents:
4850
diff
changeset
|
132 |
if LuaGoals <> '' then g:= LuaGoals + '|'; |
7cddc9201a1d
added dummy for tardis and ugly icons for tardis and structure
Henek
parents:
4850
diff
changeset
|
133 |
|
2958 | 134 |
// check different game flags (goals/game modes first for now) |
135 |
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
|
136 |
g:= AddGoal(g, gfTagTeam, gidTagTeam); // tag team mode? |
2958 | 137 |
|
138 |
// other important flags |
|
139 |
g:= AddGoal(g, gfForts, gidForts); // forts? |
|
140 |
g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity? |
|
141 |
g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability? |
|
142 |
g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism? |
|
143 |
g:= AddGoal(g, gfKarma, gidKarma); // karma? |
|
144 |
g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement? |
|
145 |
g:= AddGoal(g, gfArtillery, gidArtillery); // artillery? |
|
146 |
g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land? |
|
147 |
g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo? |
|
4132 | 148 |
g:= AddGoal(g, gfResetHealth, gidResetHealth); |
149 |
g:= AddGoal(g, gfAISurvival, gidAISurvival); |
|
150 |
g:= AddGoal(g, gfInfAttack, gidInfAttack); |
|
151 |
g:= AddGoal(g, gfResetWeps, gidResetWeps); |
|
152 |
g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo); |
|
2958 | 153 |
|
2908 | 154 |
// modified damage modificator? |
155 |
if cDamagePercent <> 100 then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
156 |
g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent); |
2908 | 157 |
|
3107 | 158 |
// fade in |
159 |
ScreenFade:= sfFromBlack; |
|
160 |
ScreenFadeValue:= sfMax; |
|
161 |
ScreenFadeSpeed:= 1; |
|
162 |
||
2908 | 163 |
// modified mine timers? |
4482 | 164 |
if cMinesTime <> 3000 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
165 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
166 |
if cMinesTime = 0 then |
4003
ca0600ab38bf
disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents:
3976
diff
changeset
|
167 |
g:= AddGoal(g, gfAny, gidNoMineTimer) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
168 |
else if cMinesTime < 0 then |
4003
ca0600ab38bf
disable gfMines and update variable names (landadds -> minesnum, cLandAdditions -> cLandMines)
koda
parents:
3976
diff
changeset
|
169 |
g:= AddGoal(g, gfAny, gidRandomMineTimer) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
170 |
else |
4482 | 171 |
g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
172 |
end; |
2908 | 173 |
|
2863 | 174 |
// if the string has been set, show it for (default timeframe) seconds |
175 |
if g <> '' then ShowMission(trgoal[gidCaption], trgoal[gidSubCaption], g, 1, 0); |
|
176 |
||
1825 | 177 |
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
|
178 |
//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
|
179 |
cWaveHeight:= 32; |
2292
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
180 |
|
5682
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
181 |
InitCameraBorders(); |
5191
c7000a6b397b
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window
unc0rr
parents:
5149
diff
changeset
|
182 |
uCursor.init(); |
2197 | 183 |
prevPoint.X:= 0; |
74 | 184 |
prevPoint.Y:= cScreenHeight div 2; |
1760 | 185 |
WorldDx:= - (LAND_WIDTH div 2) + cScreenWidth div 2; |
2139
5a083e71a71d
Properly decrement sniper rifle if timed out. Try to get camera position straight for once.
nemo
parents:
2119
diff
changeset
|
186 |
WorldDy:= - (LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2); |
3434 | 187 |
AMSlotSize:= 33; |
188 |
{$IFDEF IPHONEOS} |
|
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
|
189 |
if isPhone() 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
|
190 |
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
|
191 |
AMxOffset:= -30 + cScreenHeight div 2; |
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
|
192 |
AMyOffset:= 10; |
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
|
193 |
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
|
194 |
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
|
195 |
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
|
196 |
AMxOffset:= AMSlotSize + cScreenHeight div 2; |
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
|
197 |
AMyOffset:= -10 + cScreenWidth div 3; |
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
|
198 |
end; |
3434 | 199 |
AMWidth:= (cMaxSlotAmmoIndex + 1) * AMSlotSize + AMxOffset; |
200 |
{$ELSE} |
|
201 |
AMxOffset:= 10; |
|
202 |
AMyOffset:= 60; |
|
203 |
AMWidth:= (cMaxSlotAmmoIndex + 2) * AMSlotSize + AMxOffset; |
|
204 |
{$ENDIF} |
|
205 |
AMxShift:= AMWidth; |
|
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
206 |
SkyOffset:= 0; |
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
207 |
HorizontOffset:= 0; |
161 | 208 |
end; |
209 |
||
5682
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
210 |
procedure InitCameraBorders; |
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
211 |
begin |
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
212 |
cGearScrEdgesDist:= min(2 * cScreenHeight div 5, 2 * cScreenWidth div 5); |
06d5f561f772
some camera adjustments (should also fix cam flickering on lowerst res)
sheepluva
parents:
5675
diff
changeset
|
213 |
end; |
3405 | 214 |
|
956 | 215 |
procedure ShowAmmoMenu; |
161 | 216 |
const MENUSPEED = 15; |
3434 | 217 |
const BORDERSIZE = 2; |
218 |
var x, y, i, t, g: LongInt; |
|
219 |
Slot, Pos, STurns: LongInt; |
|
2855
7e6adeb57427
Show the ammo menu of the last local non-bot team when not local turn. needs testing
nemo
parents:
2851
diff
changeset
|
220 |
Ammo: PHHAmmo; |
161 | 221 |
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
|
222 |
if (TurnTimeLeft = 0) or (not CurrentTeam^.ExtDriven and (((CurAmmoGear = nil) or |
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
|
223 |
((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) = 0)) and hideAmmoMenu)) 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
|
224 |
bShowAmmoMenu:= false; |
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
|
225 |
|
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
|
226 |
if bShowAmmoMenu 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
|
227 |
// show ammo menu |
3434 | 228 |
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
|
229 |
FollowGear:= nil; |
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
|
230 |
if AMxShift = AMWidth then prevPoint.X:= 0; |
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
|
231 |
if (cReducedQuality and rqSlowMenu) <> 0 then AMxShift:= 0 |
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
|
232 |
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
|
233 |
if AMxShift > MENUSPEED then dec(AMxShift, MENUSPEED) |
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
|
234 |
else AMxShift:= 0; |
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
|
235 |
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
|
236 |
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
|
237 |
// hide ammo menu |
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
|
238 |
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
|
239 |
if AMxShift = 0 then |
3434 | 240 |
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
|
241 |
CursorPoint.X:= cScreenWidth shr 1; |
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
|
242 |
CursorPoint.Y:= cScreenHeight shr 1; |
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
|
243 |
prevPoint:= CursorPoint; |
3434 | 244 |
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
|
245 |
if (cReducedQuality and rqSlowMenu) <> 0 then AMxShift:= AMWidth+2 |
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
|
246 |
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
|
247 |
if AMxShift < (AMWidth - MENUSPEED) then inc(AMxShift, MENUSPEED) |
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
|
248 |
else AMxShift:= AMWidth; |
3434 | 249 |
end; |
3697 | 250 |
|
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
|
251 |
// give the assigned ammo to hedgehog |
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
|
252 |
Ammo:= nil; |
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
|
253 |
if (CurrentTeam <> nil) and (CurrentHedgehog <> nil) and |
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
|
254 |
(not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 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
|
255 |
Ammo:= CurrentHedgehog^.Ammo |
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
|
256 |
else if (LocalAmmo <> -1) 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
|
257 |
Ammo:= GetAmmoByNum(LocalAmmo); |
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
|
258 |
Pos:= -1; |
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
|
259 |
if Ammo = 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
|
260 |
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
|
261 |
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
|
262 |
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
|
263 |
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
|
264 |
SlotsNum:= 0; |
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
|
265 |
x:= (cScreenWidth shr 1) - AMWidth + AMxShift; |
3434 | 266 |
|
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
|
267 |
{$IFDEF IPHONEOS} |
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
|
268 |
Slot:= cMaxSlotIndex; |
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
|
269 |
x:= x - cOffsetY; |
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
|
270 |
y:= AMyOffset; |
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
|
271 |
dec(y, BORDERSIZE); |
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
|
272 |
DrawSprite(sprAMCorners, x - BORDERSIZE, y, 0); |
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
|
273 |
for i:= 0 to cMaxSlotAmmoIndex 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
|
274 |
DrawSprite(sprAMBorderHorizontal, x + i * AMSlotSize, y, 0); |
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
|
275 |
DrawSprite(sprAMCorners, x + AMWidth - AMxOffset, y, 1); |
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
|
276 |
inc(y, BORDERSIZE); |
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
|
277 |
|
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
|
278 |
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
|
279 |
if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then |
3434 | 280 |
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
|
281 |
if (cScreenHeight - CursorPoint.Y >= y) and (cScreenHeight - CursorPoint.Y <= y + AMSlotSize) then Slot:= i; |
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
|
282 |
inc(SlotsNum); |
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
|
283 |
DrawSprite(sprAMBorderVertical, x - BORDERSIZE, y, 0); |
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
|
284 |
t:= 0; |
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
|
285 |
g:= 0; |
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
|
286 |
while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) do |
3434 | 287 |
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
|
288 |
DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 1); |
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
|
289 |
if (Ammo^[i, t].AmmoType <> amNothing) then |
3434 | 290 |
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
|
291 |
STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber; |
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
|
292 |
|
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
|
293 |
if STurns >= 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
|
294 |
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
|
295 |
DrawSprite(sprAMAmmosBW, x + g * AMSlotSize, y + 1, LongInt(Ammo^[i, t].AmmoType)-1); |
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
|
296 |
if STurns < 100 then DrawSprite(sprTurnsLeft, x + (g + 1) * AMSlotSize - 16, y + AMSlotSize - 16, STurns); |
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
|
297 |
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
|
298 |
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
|
299 |
DrawSprite(sprAMAmmos, x + g * AMSlotSize, y + 1, LongInt(Ammo^[i, t].AmmoType)-1); |
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
|
300 |
if (Slot = i) and (CursorPoint.X >= x + g * AMSlotSize) and |
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
|
301 |
(CursorPoint.X <= x + (g + 1) * AMSlotSize) 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
|
302 |
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
|
303 |
if (STurns < 0) then DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 0); |
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
|
304 |
Pos:= t; |
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
|
305 |
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
|
306 |
inc(g) |
3434 | 307 |
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
|
308 |
inc(t) |
3434 | 309 |
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
|
310 |
for g:= g to cMaxSlotAmmoIndex 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
|
311 |
DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 1); |
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
|
312 |
DrawSprite(sprAMBorderVertical, x + AMWidth - AMxOffset, y, 1); |
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
|
313 |
inc(y, AMSlotSize); |
3434 | 314 |
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
|
315 |
|
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
|
316 |
DrawSprite(sprAMCorners, x - BORDERSIZE, y, 2); |
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
|
317 |
for i:= 0 to cMaxSlotAmmoIndex 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
|
318 |
DrawSprite(sprAMBorderHorizontal, x + i * AMSlotSize, y, 1); |
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
|
319 |
DrawSprite(sprAMCorners, x + AMWidth - AMxOffset, y, 3); |
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
|
320 |
{$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
|
321 |
Slot:= 0; |
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
|
322 |
y:= cScreenHeight - AMyOffset; |
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
|
323 |
DrawSprite(sprAMCorners, x - BORDERSIZE, y, 2); |
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
|
324 |
for i:= 0 to cMaxSlotAmmoIndex + 1 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
|
325 |
DrawSprite(sprAMBorderHorizontal, x + i * AMSlotSize, y, 1); |
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
|
326 |
DrawSprite(sprAMCorners, x + AMWidth - AMxOffset, y, 3); |
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
|
327 |
dec(y, AMSlotSize); |
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
|
328 |
DrawSprite(sprAMBorderVertical, x - BORDERSIZE, y, 0); |
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
|
329 |
for i:= 0 to cMaxSlotAmmoIndex 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
|
330 |
DrawSprite(sprAMSlot, x + i * AMSlotSize, y, 2); |
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
|
331 |
DrawSprite(sprAMSlot, x + (cMaxSlotAmmoIndex + 1) * AMSlotSize, y, 1); |
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
|
332 |
DrawSprite(sprAMBorderVertical, x + AMWidth - AMxOffset, y, 1); |
3697 | 333 |
|
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
|
334 |
for i:= cMaxSlotIndex downto 0 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
|
335 |
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
|
336 |
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
|
337 |
if (cScreenHeight - CursorPoint.Y >= y - AMSlotSize) and (cScreenHeight - CursorPoint.Y <= y) then Slot:= i; |
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
|
338 |
dec(y, AMSlotSize); |
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
|
339 |
inc(SlotsNum); |
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
|
340 |
DrawSprite(sprAMBorderVertical, x - BORDERSIZE, y, 0); |
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
|
341 |
DrawSprite(sprAMSlot, x, y, 1); |
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
|
342 |
DrawSprite(sprAMSlotKeys, x, y + 1, i); |
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
|
343 |
t:= 0; |
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
|
344 |
g:= 1; |
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
|
345 |
while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) 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
|
346 |
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
|
347 |
DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 1); |
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
|
348 |
if (Ammo^[i, t].AmmoType <> amNothing) 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
|
349 |
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
|
350 |
STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber; |
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
|
351 |
|
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
|
352 |
if STurns >= 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
|
353 |
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
|
354 |
DrawSprite(sprAMAmmosBW, x + g * AMSlotSize, y + 1, LongInt(Ammo^[i, t].AmmoType)-1); |
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
|
355 |
if STurns < 100 then DrawSprite(sprTurnsLeft, x + (g + 1) * AMSlotSize - 16, y + AMSlotSize - 16, STurns); |
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
|
356 |
end 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
|
357 |
DrawSprite(sprAMAmmos, x + g * AMSlotSize, y + 1, LongInt(Ammo^[i, t].AmmoType)-1); |
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
|
358 |
if (Slot = i) and (CursorPoint.X >= x + g * AMSlotSize) and |
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
|
359 |
(CursorPoint.X <= x + (g + 1) * AMSlotSize) 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
|
360 |
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
|
361 |
if (STurns < 0) then DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 0); |
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
|
362 |
Pos:= t; |
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
|
363 |
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
|
364 |
inc(g) |
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
|
365 |
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
|
366 |
inc(t) |
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
|
367 |
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
|
368 |
for g:= g to cMaxSlotAmmoIndex + 1 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
|
369 |
DrawSprite(sprAMSlot, x + g * AMSlotSize, y, 1); |
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
|
370 |
DrawSprite(sprAMBorderVertical, x + AMWidth - AMxOffset, y, 1); |
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
|
371 |
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
|
372 |
|
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
|
373 |
dec(y, BORDERSIZE); |
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
|
374 |
DrawSprite(sprAMCorners, x - BORDERSIZE, y, 0); |
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
|
375 |
for i:= 0 to cMaxSlotAmmoIndex + 1 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
|
376 |
DrawSprite(sprAMBorderHorizontal, x + i * AMSlotSize, y, 0); |
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
|
377 |
DrawSprite(sprAMCorners, x + AMWidth - AMxOffset, y, 1); |
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
|
378 |
{$ENDIF} |
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
|
379 |
|
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
|
380 |
if (Pos >= 0) then |
3967 | 381 |
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
|
382 |
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
|
383 |
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
|
384 |
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
|
385 |
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
|
386 |
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
|
387 |
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
|
388 |
end; |
3697 | 389 |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3611
diff
changeset
|
390 |
{$IFDEF IPHONEOS} |
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
|
391 |
DrawTexture(cScreenWidth div 2 - (AMWidth - 10) + AMxShift, AMyOffset - 25, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex); |
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
|
392 |
if Ammo^[Slot, Pos].Count < AMMO_INFINITE 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
|
393 |
DrawTexture(cScreenWidth div 2 - (AMWidth - 10) + 163, AMyOffset - 25, CountTexz[Ammo^[Slot, Pos].Count]); |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3611
diff
changeset
|
394 |
{$ELSE} |
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
|
395 |
DrawTexture(cScreenWidth div 2 - (AMWidth - 10) + AMxShift, cScreenHeight - AMyOffset - 25, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex); |
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
|
396 |
if Ammo^[Slot, Pos].Count < AMMO_INFINITE 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
|
397 |
DrawTexture(cScreenWidth div 2 + AMxOffset - 45, cScreenHeight - AMyOffset - 25, CountTexz[Ammo^[Slot, Pos].Count]); |
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3611
diff
changeset
|
398 |
{$ENDIF} |
1529
3bc916b419cd
Don't hide ammo menu when user clicks on not yet available weapon
unc0rr
parents:
1439
diff
changeset
|
399 |
|
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
|
400 |
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
|
401 |
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
|
402 |
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
|
403 |
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
|
404 |
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
|
405 |
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
|
406 |
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
|
407 |
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
|
408 |
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
|
409 |
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
|
410 |
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
|
411 |
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
|
412 |
|
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 |
if (WeaponTooltipTex <> nil) and (AMxShift = 0) then |
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
|
414 |
{$IFDEF IPHONEOS} |
6276
1e2f8da1860a
while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents:
6250
diff
changeset
|
415 |
ShowWeaponTooltip(-WeaponTooltipTex^.w div 2, 100); |
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
|
416 |
{$ELSE} |
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
|
417 |
ShowWeaponTooltip(x - WeaponTooltipTex^.w - 3, Min(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
|
418 |
{$ENDIF} |
961
a9a349b2b3fa
Use turnsleft sprites to indicate turns left to activate ammo
unc0rr
parents:
956
diff
changeset
|
419 |
|
6276
1e2f8da1860a
while formatting the ammomenu code i found out that it's simpler to move than i thought, and fixed a small glitch when animation was disabled
koda
parents:
6250
diff
changeset
|
420 |
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
|
421 |
if AMxShift = 0 then DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8) |
4 | 422 |
end; |
423 |
||
3104 | 424 |
procedure DrawWater(Alpha: byte; OffsetY: LongInt); |
1915 | 425 |
var VertexBuffer: array [0..3] of TVertex2f; |
426 |
r: TSDL_Rect; |
|
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
427 |
lw, lh: GLfloat; |
1915 | 428 |
begin |
4748 | 429 |
if SuddenDeathDmg then |
430 |
begin |
|
431 |
SDWaterColorArray[0].a := Alpha; |
|
432 |
SDWaterColorArray[1].a := Alpha; |
|
433 |
SDWaterColorArray[2].a := Alpha; |
|
434 |
SDWaterColorArray[3].a := Alpha |
|
435 |
end |
|
436 |
else |
|
437 |
begin |
|
438 |
WaterColorArray[0].a := Alpha; |
|
439 |
WaterColorArray[1].a := Alpha; |
|
440 |
WaterColorArray[2].a := Alpha; |
|
441 |
WaterColorArray[3].a := Alpha |
|
442 |
end; |
|
2269
00f5704f5f39
add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents:
2268
diff
changeset
|
443 |
|
3463 | 444 |
lw:= cScreenWidth / cScaleFactor; |
445 |
lh:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 + 16; |
|
3697 | 446 |
|
3405 | 447 |
// Water |
448 |
r.y:= OffsetY + WorldDy + cWaterLine; |
|
3463 | 449 |
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
|
450 |
begin |
3405 | 451 |
if r.y < 0 then |
452 |
r.y:= 0; |
|
1915 | 453 |
|
3405 | 454 |
glDisable(GL_TEXTURE_2D); |
455 |
VertexBuffer[0].X:= -lw; |
|
456 |
VertexBuffer[0].Y:= r.y; |
|
457 |
VertexBuffer[1].X:= lw; |
|
458 |
VertexBuffer[1].Y:= r.y; |
|
459 |
VertexBuffer[2].X:= lw; |
|
460 |
VertexBuffer[2].Y:= lh; |
|
461 |
VertexBuffer[3].X:= -lw; |
|
462 |
VertexBuffer[3].Y:= lh; |
|
1915 | 463 |
|
3641 | 464 |
glDisableClientState(GL_TEXTURE_COORD_ARRAY); |
465 |
glEnableClientState(GL_COLOR_ARRAY); |
|
4748 | 466 |
if SuddenDeathDmg then |
467 |
glColorPointer(4, GL_UNSIGNED_BYTE, 0, @SDWaterColorArray[0]) |
|
468 |
else |
|
469 |
glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WaterColorArray[0]); |
|
1915 | 470 |
|
3405 | 471 |
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
|
472 |
|
3405 | 473 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
1915 | 474 |
|
3405 | 475 |
glDisableClientState(GL_COLOR_ARRAY); |
3641 | 476 |
glEnableClientState(GL_TEXTURE_COORD_ARRAY); |
3407 | 477 |
glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required |
3405 | 478 |
glEnable(GL_TEXTURE_2D); |
479 |
end; |
|
1915 | 480 |
end; |
481 |
||
3376 | 482 |
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
|
483 |
var VertexBuffer, TextureBuffer: array [0..3] of TVertex2f; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
484 |
lw, waves, shift: GLfloat; |
4748 | 485 |
sprite: TSprite; |
2288 | 486 |
begin |
4748 | 487 |
if SuddenDeathDmg then |
488 |
sprite:= sprSDWater |
|
489 |
else |
|
490 |
sprite:= sprWater; |
|
491 |
||
492 |
cWaveWidth:= SpritesData[sprite].Width; |
|
493 |
||
3463 | 494 |
lw:= cScreenWidth / cScaleFactor; |
2292
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
495 |
waves:= lw * 2 / cWaveWidth; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
496 |
|
4748 | 497 |
if SuddenDeathDmg then |
498 |
Tint(LongInt(tnt) * SDWaterColorArray[2].r div 255 + 255 - tnt, |
|
499 |
LongInt(tnt) * SDWaterColorArray[2].g div 255 + 255 - tnt, |
|
500 |
LongInt(tnt) * SDWaterColorArray[2].b div 255 + 255 - tnt, |
|
501 |
255 |
|
502 |
) |
|
503 |
else |
|
504 |
Tint(LongInt(tnt) * WaterColorArray[2].r div 255 + 255 - tnt, |
|
505 |
LongInt(tnt) * WaterColorArray[2].g div 255 + 255 - tnt, |
|
506 |
LongInt(tnt) * WaterColorArray[2].b div 255 + 255 - tnt, |
|
507 |
255 |
|
508 |
); |
|
3089 | 509 |
|
4748 | 510 |
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
|
511 |
|
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
512 |
VertexBuffer[0].X:= -lw; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
513 |
VertexBuffer[0].Y:= cWaterLine + WorldDy + dY; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
514 |
VertexBuffer[1].X:= lw; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
515 |
VertexBuffer[1].Y:= VertexBuffer[0].Y; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
516 |
VertexBuffer[2].X:= lw; |
4748 | 517 |
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
|
518 |
VertexBuffer[3].X:= -lw; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
519 |
VertexBuffer[3].Y:= VertexBuffer[2].Y; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
520 |
|
2374 | 521 |
shift:= - lw / cWaveWidth; |
2495 | 522 |
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
|
523 |
TextureBuffer[0].Y:= 0; |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
524 |
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
|
525 |
TextureBuffer[1].Y:= TextureBuffer[0].Y; |
08d623a494e6
Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents:
2434
diff
changeset
|
526 |
TextureBuffer[2].X:= TextureBuffer[1].X; |
4748 | 527 |
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
|
528 |
TextureBuffer[3].X:= TextureBuffer[0].X; |
2447
08d623a494e6
Smaxx's updated german translation + texture gap fixes + updated room list
koda
parents:
2434
diff
changeset
|
529 |
TextureBuffer[3].Y:= TextureBuffer[2].Y; |
2292
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
530 |
|
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
531 |
|
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
532 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
533 |
glTexCoordPointer(2, GL_FLOAT, 0, @TextureBuffer[0]); |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
534 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
535 |
|
3390 | 536 |
Tint($FF, $FF, $FF, $FF); |
2292
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
537 |
|
87af4ad0ec98
New waves rendering procedure based on using texture coodrinates > 1.0
unc0rr
parents:
2290
diff
changeset
|
538 |
{for i:= -1 to cWaterSprCount do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
539 |
DrawSprite(sprWater, |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
540 |
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
|
541 |
cWaterLine + WorldDy + dY, |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
542 |
0)} |
2288 | 543 |
end; |
544 |
||
3089 | 545 |
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
|
546 |
var i, w, h, lw, lh, rw, rh, sw: LongInt; |
2426 | 547 |
begin |
3405 | 548 |
sw:= round(cScreenWidth / cScaleFactor); |
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
|
549 |
if (SpritesData[sprL].Texture = nil) and (SpritesData[spr].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
|
550 |
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
|
551 |
w:= SpritesData[spr].Width * SpritesData[spr].Texture^.Scale; |
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
|
552 |
h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale; |
3405 | 553 |
i:= Shift mod w; |
554 |
if i > 0 then dec(i, w); |
|
555 |
dec(i, w * (sw div w + 1)); |
|
556 |
repeat |
|
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
|
557 |
DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - h, SpritesData[spr].Texture, SpritesData[spr].Texture^.Scale); |
3405 | 558 |
inc(i, w) |
559 |
until i > sw |
|
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
|
560 |
end |
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
|
561 |
else if SpritesData[spr].Texture <> nil then |
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
|
562 |
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
|
563 |
w:= SpritesData[spr].Width * SpritesData[spr].Texture^.Scale; |
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
|
564 |
h:= SpritesData[spr].Height * SpritesData[spr].Texture^.Scale; |
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
|
565 |
lw:= SpritesData[sprL].Width * SpritesData[spr].Texture^.Scale; |
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
|
566 |
lh:= SpritesData[sprL].Height * SpritesData[spr].Texture^.Scale; |
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
|
567 |
if SpritesData[sprR].Texture <> nil then |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
568 |
begin |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
569 |
rw:= SpritesData[sprR].Width * SpritesData[spr].Texture^.Scale; |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
570 |
rh:= SpritesData[sprR].Height * SpritesData[spr].Texture^.Scale |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
571 |
end; |
3405 | 572 |
dec(Shift, w div 2); |
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
|
573 |
DrawTexture(Shift, WorldDy + LAND_HEIGHT + OffsetY - h, SpritesData[spr].Texture, SpritesData[spr].Texture^.Scale); |
3697 | 574 |
|
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
|
575 |
i:= Shift - lw; |
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
|
576 |
while i >= -sw - lw 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
|
577 |
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
|
578 |
DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - lh, SpritesData[sprL].Texture, SpritesData[sprL].Texture^.Scale); |
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
|
579 |
dec(i, lw); |
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
|
580 |
end; |
3697 | 581 |
|
3405 | 582 |
i:= Shift + w; |
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
|
583 |
if SpritesData[sprR].Texture <> nil then |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
584 |
while i <= sw do |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
585 |
begin |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
586 |
DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - rh, SpritesData[sprR].Texture, SpritesData[sprR].Texture^.Scale); |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
587 |
inc(i, rw) |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
588 |
end |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
589 |
else |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
590 |
while i <= sw do |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
591 |
begin |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
592 |
DrawTexture(i, WorldDy + LAND_HEIGHT + OffsetY - lh, SpritesData[sprL].Texture, SpritesData[sprL].Texture^.Scale); |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
593 |
inc(i, lw) |
2172330ad52a
Use SkyL if SkyR is not included. Saves a bit of texture memory and removes some redundant files.
nemo
parents:
6131
diff
changeset
|
594 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
595 |
end |
2426 | 596 |
end; |
597 |
||
598 |
||
956 | 599 |
procedure DrawWorld(Lag: LongInt); |
4 | 600 |
begin |
3523 | 601 |
if not isPaused then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
602 |
begin |
3523 | 603 |
if ZoomValue < zoom then |
3444 | 604 |
begin |
3523 | 605 |
zoom:= zoom - 0.002 * Lag; |
3697 | 606 |
if ZoomValue > zoom then |
3523 | 607 |
zoom:= ZoomValue |
3697 | 608 |
end |
3774 | 609 |
else |
3523 | 610 |
if ZoomValue > zoom then |
3444 | 611 |
begin |
3523 | 612 |
zoom:= zoom + 0.002 * Lag; |
613 |
if ZoomValue < zoom then |
|
614 |
zoom:= ZoomValue |
|
3611 | 615 |
end |
3444 | 616 |
end |
3611 | 617 |
else |
618 |
ZoomValue:= zoom; |
|
2376 | 619 |
|
3611 | 620 |
// Sky |
621 |
glClear(GL_COLOR_BUFFER_BIT); |
|
622 |
//glPushMatrix; |
|
623 |
//glScalef(1.0, 1.0, 1.0); |
|
756 | 624 |
|
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
|
625 |
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
|
626 |
MoveCamera; |
162 | 627 |
|
3696 | 628 |
if cStereoMode = smNone then |
629 |
begin |
|
3692 | 630 |
glClear(GL_COLOR_BUFFER_BIT); |
631 |
DrawWorldStereo(Lag, rmDefault) |
|
3696 | 632 |
end |
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
633 |
{$IFNDEF S3D_DISABLED} |
3696 | 634 |
else if (cStereoMode = smAFR) then |
635 |
begin |
|
636 |
AFRToggle:= not AFRToggle; |
|
637 |
glClear(GL_COLOR_BUFFER_BIT); |
|
638 |
if AFRToggle then |
|
639 |
DrawWorldStereo(Lag, rmLeftEye) |
|
640 |
else |
|
641 |
DrawWorldStereo(Lag, rmRightEye) |
|
642 |
end |
|
643 |
else if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then |
|
644 |
begin |
|
3692 | 645 |
// create left fb |
646 |
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framel); |
|
647 |
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); |
|
648 |
DrawWorldStereo(Lag, rmLeftEye); |
|
649 |
||
650 |
// create right fb |
|
651 |
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framer); |
|
652 |
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); |
|
653 |
DrawWorldStereo(0, rmRightEye); |
|
654 |
||
655 |
// detatch drawing from fbs |
|
656 |
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); |
|
657 |
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); |
|
658 |
SetScale(cDefaultZoomLevel); |
|
659 |
||
660 |
// draw left frame |
|
661 |
glBindTexture(GL_TEXTURE_2D, texl); |
|
662 |
glBegin(GL_QUADS); |
|
3696 | 663 |
if cStereoMode = smHorizontal then |
664 |
begin |
|
665 |
glTexCoord2f(0.0, 0.0); |
|
666 |
glVertex2d(cScreenWidth / -2, cScreenHeight); |
|
667 |
glTexCoord2f(1.0, 0.0); |
|
668 |
glVertex2d(0, cScreenHeight); |
|
669 |
glTexCoord2f(1.0, 1.0); |
|
670 |
glVertex2d(0, 0); |
|
671 |
glTexCoord2f(0.0, 1.0); |
|
672 |
glVertex2d(cScreenWidth / -2, 0); |
|
673 |
end |
|
674 |
else |
|
675 |
begin |
|
676 |
glTexCoord2f(0.0, 0.0); |
|
677 |
glVertex2d(cScreenWidth / -2, cScreenHeight / 2); |
|
678 |
glTexCoord2f(1.0, 0.0); |
|
679 |
glVertex2d(cScreenWidth / 2, cScreenHeight / 2); |
|
680 |
glTexCoord2f(1.0, 1.0); |
|
681 |
glVertex2d(cScreenWidth / 2, 0); |
|
682 |
glTexCoord2f(0.0, 1.0); |
|
683 |
glVertex2d(cScreenWidth / -2, 0); |
|
684 |
end; |
|
3692 | 685 |
glEnd(); |
686 |
||
687 |
// draw right frame |
|
688 |
glBindTexture(GL_TEXTURE_2D, texr); |
|
689 |
glBegin(GL_QUADS); |
|
3696 | 690 |
if cStereoMode = smHorizontal then |
691 |
begin |
|
692 |
glTexCoord2f(0.0, 0.0); |
|
693 |
glVertex2d(0, cScreenHeight); |
|
694 |
glTexCoord2f(1.0, 0.0); |
|
695 |
glVertex2d(cScreenWidth / 2, cScreenHeight); |
|
696 |
glTexCoord2f(1.0, 1.0); |
|
697 |
glVertex2d(cScreenWidth / 2, 0); |
|
698 |
glTexCoord2f(0.0, 1.0); |
|
699 |
glVertex2d(0, 0); |
|
700 |
end |
|
701 |
else |
|
702 |
begin |
|
703 |
glTexCoord2f(0.0, 0.0); |
|
704 |
glVertex2d(cScreenWidth / -2, cScreenHeight); |
|
705 |
glTexCoord2f(1.0, 0.0); |
|
706 |
glVertex2d(cScreenWidth / 2, cScreenHeight); |
|
707 |
glTexCoord2f(1.0, 1.0); |
|
708 |
glVertex2d(cScreenWidth / 2, cScreenHeight / 2); |
|
709 |
glTexCoord2f(0.0, 1.0); |
|
710 |
glVertex2d(cScreenWidth / -2, cScreenHeight / 2); |
|
711 |
end; |
|
3692 | 712 |
glEnd(); |
713 |
SetScale(zoom); |
|
3696 | 714 |
end |
715 |
else |
|
716 |
begin |
|
717 |
// clear scene |
|
718 |
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); |
|
719 |
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); |
|
720 |
// draw left eye in red channel only |
|
721 |
if cStereoMode = smGreenRed then |
|
722 |
glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE) |
|
723 |
else if cStereoMode = smBlueRed then |
|
724 |
glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE) |
|
725 |
else if cStereoMode = smCyanRed then |
|
726 |
glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE) |
|
727 |
else |
|
728 |
glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE); |
|
729 |
DrawWorldStereo(Lag, rmLeftEye); |
|
730 |
// draw right eye in selected channel(s) only |
|
731 |
if cStereoMode = smRedGreen then |
|
732 |
glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_TRUE) |
|
733 |
else if cStereoMode = smRedBlue then |
|
734 |
glColorMask(GL_FALSE, GL_FALSE, GL_TRUE, GL_TRUE) |
|
735 |
else if cStereoMode = smRedCyan then |
|
736 |
glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE) |
|
737 |
else |
|
738 |
glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_TRUE); |
|
739 |
DrawWorldStereo(Lag, rmRightEye); |
|
740 |
end |
|
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
741 |
{$ENDIF} |
3692 | 742 |
end; |
743 |
||
744 |
procedure ChangeDepth(rm: TRenderMode; d: GLfloat); |
|
745 |
begin |
|
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
746 |
{$IFDEF S3D_DISABLED} |
4850 | 747 |
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
|
748 |
exit; |
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
749 |
{$ELSE} |
3696 | 750 |
d:= d / 5; |
3692 | 751 |
if rm = rmDefault then exit |
3696 | 752 |
else if rm = rmLeftEye then d:= -d; |
3692 | 753 |
stereoDepth:= stereoDepth + d; |
754 |
glMatrixMode(GL_PROJECTION); |
|
755 |
glTranslatef(d, 0, 0); |
|
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
756 |
glMatrixMode(GL_MODELVIEW); |
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
757 |
{$ENDIF} |
3692 | 758 |
end; |
759 |
||
760 |
procedure ResetDepth(rm: TRenderMode); |
|
761 |
begin |
|
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
762 |
{$IFDEF S3D_DISABLED} |
4850 | 763 |
rm:= rm; // avoid hint |
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
764 |
exit; |
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
765 |
{$ELSE} |
3692 | 766 |
if rm = rmDefault then exit; |
767 |
glMatrixMode(GL_PROJECTION); |
|
768 |
glTranslatef(-stereoDepth, 0, 0); |
|
769 |
glMatrixMode(GL_MODELVIEW); |
|
770 |
stereoDepth:= 0; |
|
4347
0ddb100fea61
add a S3D_DISABLED symbol to disable/enable stereo rendering at compilation time
koda
parents:
4345
diff
changeset
|
771 |
{$ENDIF} |
3692 | 772 |
end; |
773 |
||
774 |
procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode); |
|
775 |
var i, t: LongInt; |
|
776 |
r: TSDL_Rect; |
|
777 |
tdx, tdy: Double; |
|
778 |
s: string[15]; |
|
779 |
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
|
780 |
smallScreenOffset, offsetX, offsetY, screenBottom: LongInt; |
3692 | 781 |
VertexBuffer: array [0..3] of TVertex2f; |
782 |
begin |
|
3611 | 783 |
if (cReducedQuality and rqNoBackground) = 0 then |
1812 | 784 |
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
|
785 |
// 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
|
786 |
ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine); |
4374 | 787 |
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
|
788 |
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
|
789 |
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
|
790 |
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
|
791 |
HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20); |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
792 |
|
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
|
793 |
// background |
3688 | 794 |
ChangeDepth(RM, cStereo_Sky); |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4810
diff
changeset
|
795 |
if SuddenDeathDmg then 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
|
796 |
DrawRepeated(sprSky, sprSkyL, sprSkyR, (WorldDx + LAND_WIDTH div 2) * 3 div 8, SkyOffset); |
3688 | 797 |
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
|
798 |
DrawRepeated(sprHorizont, sprHorizontL, sprHorizontR, (WorldDx + LAND_WIDTH div 2) * 3 div 5, HorizontOffset); |
4835
a6924450e694
added rq-sky to themes so it can set sky color for low quality. also added tint of sky on sudden death. underwater theme is an example of this
Henek
parents:
4810
diff
changeset
|
799 |
if SuddenDeathDmg then Tint($FF, $FF, $FF, $FF); |
3611 | 800 |
end; |
4 | 801 |
|
3611 | 802 |
DrawVisualGears(0); |
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
|
803 |
ChangeDepth(RM, -cStereo_MidDistance); |
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
|
804 |
DrawVisualGears(4); |
3697 | 805 |
|
3611 | 806 |
if (cReducedQuality and rq2DWater) = 0 then |
807 |
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
|
808 |
// 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
|
809 |
DrawWater(255, SkyOffset); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
810 |
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
|
811 |
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
|
812 |
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
|
813 |
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
|
814 |
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
|
815 |
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
|
816 |
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
|
817 |
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
|
818 |
end |
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
|
819 |
else |
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
|
820 |
DrawWaves(-1, 100, - (cWaveHeight + (cWaveHeight shr 1)), 0); |
4 | 821 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
822 |
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
|
823 |
DrawVisualGears(5); |
3611 | 824 |
DrawLand(WorldDx, WorldDy); |
1911 | 825 |
|
3611 | 826 |
DrawWater(255, 0); |
4 | 827 |
|
1660 | 828 |
// Attack bar |
5862 | 829 |
if CurrentTeam <> nil then |
3611 | 830 |
case AttackBar of |
1660 | 831 |
(* 1: begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
832 |
r:= StuffPoz[sPowerBar]; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
833 |
{$WARNINGS OFF} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
834 |
r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
835 |
{$WARNINGS ON} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
836 |
DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
837 |
end;*) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
838 |
2: with CurrentHedgehog^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
839 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
840 |
tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
841 |
tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
842 |
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
|
843 |
DrawSprite(sprPower, |
4159
64e677349124
REmove stupid int64 conversions, provide real fixes to compiler hints
unc0rr
parents:
4132
diff
changeset
|
844 |
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
|
845 |
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
|
846 |
i) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
847 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
848 |
end; |
1660 | 849 |
|
3611 | 850 |
DrawVisualGears(1); |
851 |
DrawGears; |
|
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
|
852 |
DrawVisualGears(6); |
4 | 853 |
|
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
|
854 |
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
|
855 |
DrawWater(cSDWaterOpacity, 0) |
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
|
856 |
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
|
857 |
DrawWater(cWaterOpacity, 0); |
2269
00f5704f5f39
add extra semi-opaque layer of water to discolour objects in the water.
nemo
parents:
2268
diff
changeset
|
858 |
|
3611 | 859 |
// Waves |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
860 |
ChangeDepth(RM, cStereo_Water_near); |
3611 | 861 |
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
|
862 |
|
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
|
863 |
if (cReducedQuality and rq2DWater) = 0 then |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
864 |
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
|
865 |
//DrawWater(cWaterOpacity, - offsetY div 40); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
866 |
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
|
867 |
DrawWaves(-1, 50 + WorldDx div 6, - cWaveHeight - offsetY div 40, 8); |
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
|
868 |
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
|
869 |
DrawWater(cSDWaterOpacity, - offsetY div 20) |
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
|
870 |
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
|
871 |
DrawWater(cWaterOpacity, - offsetY div 20); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
872 |
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
|
873 |
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
|
874 |
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
|
875 |
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
|
876 |
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
|
877 |
DrawWater(cWaterOpacity, - offsetY div 10); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
878 |
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
|
879 |
DrawWaves( -1, 25 + WorldDx div 3, - cWaveHeight - offsetY div 10, 0); |
3265
5fe62296fdea
- Parallax effect for horizont when water is out of sight
palewolf
parents:
3249
diff
changeset
|
880 |
end |
3611 | 881 |
else |
882 |
DrawWaves(-1, 50, - (cWaveHeight shr 1), 0); |
|
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
883 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
884 |
// 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
|
885 |
// 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
|
886 |
ChangeDepth(RM, cStereo_Outside); |
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
887 |
DrawVisualGears(2); |
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
888 |
|
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
889 |
// 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
|
890 |
// 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
|
891 |
ResetDepth(RM); |
4818
202eef454354
rename "frame alternate" to "wiggle" as it's more appropriate
koda
parents:
4816
diff
changeset
|
892 |
DrawVisualGears(3); |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
893 |
|
2288 | 894 |
{$WARNINGS OFF} |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
895 |
// Target |
3104 | 896 |
if (TargetPoint.X <> NoPointX) and (CurrentTeam <> nil) and (CurrentHedgehog <> nil) then |
897 |
begin |
|
898 |
with PHedgehog(CurrentHedgehog)^ do |
|
899 |
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
|
900 |
if CurAmmoType = amBee then |
3110 | 901 |
DrawRotatedF(sprTargetBee, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360) |
902 |
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
|
903 |
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
|
904 |
end |
3104 | 905 |
end; |
4 | 906 |
{$WARNINGS ON} |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
907 |
|
3523 | 908 |
// this scale is used to keep the various widgets at the same dimension at all zoom levels |
909 |
SetScale(cDefaultZoomLevel); |
|
2724 | 910 |
|
911 |
// Turn time |
|
2803
1f446fc5c8ec
allow to compile engine as library with HWLIBRARY symbol
koda
parents:
2786
diff
changeset
|
912 |
{$IFDEF IPHONEOS} |
3025 | 913 |
offsetX:= cScreenHeight - 13; |
2803
1f446fc5c8ec
allow to compile engine as library with HWLIBRARY symbol
koda
parents:
2786
diff
changeset
|
914 |
{$ELSE} |
3025 | 915 |
offsetX:= 48; |
2803
1f446fc5c8ec
allow to compile engine as library with HWLIBRARY symbol
koda
parents:
2786
diff
changeset
|
916 |
{$ENDIF} |
3463 | 917 |
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
|
918 |
if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 1000000)) or (ReadyTimeLeft <> 0) then |
3774 | 919 |
begin |
920 |
if ReadyTimeLeft <> 0 then |
|
921 |
i:= Succ(Pred(ReadyTimeLeft) div 1000) |
|
922 |
else |
|
923 |
i:= Succ(Pred(TurnTimeLeft) div 1000); |
|
924 |
||
4 | 925 |
if i>99 then t:= 112 |
926 |
else if i>9 then t:= 96 |
|
927 |
else t:= 80; |
|
3463 | 928 |
DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1); |
4 | 929 |
while i > 0 do |
930 |
begin |
|
931 |
dec(t, 32); |
|
3463 | 932 |
DrawSprite(sprBigDigit, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10); |
4 | 933 |
i:= i div 10 |
934 |
end; |
|
3463 | 935 |
DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0); |
4 | 936 |
end; |
79 | 937 |
|
4 | 938 |
// Captions |
4393 | 939 |
DrawCaptions; |
4 | 940 |
|
47 | 941 |
// Teams Healths |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
942 |
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
|
943 |
begin |
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
944 |
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
|
945 |
smallScreenOffset:= cScreenHeight div 6; |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
946 |
if TeamsCount * 20 > Longword(cScreenHeight) div 5 then 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
|
947 |
end |
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
948 |
else smallScreenOffset:= 0; |
547 | 949 |
for t:= 0 to Pred(TeamsCount) do |
950 |
with TeamsArray[t]^ do |
|
47 | 951 |
begin |
2839 | 952 |
highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500); |
3697 | 953 |
|
2747 | 954 |
if highlight then |
4810 | 955 |
Tint(Clan^.Color shl 8 or $FF); |
2839 | 956 |
|
957 |
// draw name |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
958 |
DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY + smallScreenOffset, NameTagTex); |
3697 | 959 |
|
2839 | 960 |
// draw flag |
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
961 |
DrawTexture(-14, cScreenHeight + DrawHealthY + smallScreenOffset, FlagTex); |
3697 | 962 |
|
2839 | 963 |
// draw health bar |
690 | 964 |
r.x:= 0; |
965 |
r.y:= 0; |
|
547 | 966 |
r.w:= 2 + TeamHealthBarWidth; |
764
7513452b1d51
Now game looks almost like it did before switching to OpenGL
unc0rr
parents:
762
diff
changeset
|
967 |
r.h:= HealthTex^.h; |
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
968 |
DrawFromRect(14, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex); |
690 | 969 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
970 |
// draw health bars right border |
83 | 971 |
inc(r.x, cTeamHealthWidth + 2); |
972 |
r.w:= 3; |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
973 |
DrawFromRect(TeamHealthBarWidth + 16, cScreenHeight + DrawHealthY + smallScreenOffset, @r, HealthTex); |
3770 | 974 |
|
975 |
// draw ai kill counter for gfAISurvival |
|
976 |
if (GameFlags and gfAISurvival) <> 0 then begin |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
977 |
DrawTexture(TeamHealthBarWidth + 22, cScreenHeight + DrawHealthY + smallScreenOffset, |
3773 | 978 |
AIKillsTex); |
3770 | 979 |
end; |
980 |
||
2839 | 981 |
// if highlighted, draw flag and other contents again to keep their colors |
982 |
// this approach should be faster than drawing all borders one by one tinted or not |
|
983 |
if highlight then |
|
984 |
begin |
|
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
985 |
if TeamsCount * 20 > Longword(cScreenHeight) div 5 then 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
|
986 |
else Tint($FF, $FF, $FF, $FF); |
690 | 987 |
|
2839 | 988 |
// draw name |
2747 | 989 |
r.x:= 2; |
990 |
r.y:= 2; |
|
2839 | 991 |
r.w:= NameTagTex^.w - 4; |
992 |
r.h:= NameTagTex^.h - 4; |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
993 |
DrawFromRect(-NameTagTex^.w - 14, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, NameTagTex); |
2839 | 994 |
// draw flag |
2747 | 995 |
r.w:= 22; |
996 |
r.h:= 15; |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
997 |
DrawFromRect(-12, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, FlagTex); |
2839 | 998 |
// draw health bar |
999 |
r.w:= TeamHealthBarWidth + 1; |
|
1000 |
r.h:= HealthTex^.h - 4; |
|
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
1001 |
DrawFromRect(16, cScreenHeight + DrawHealthY + smallScreenOffset + 2, @r, HealthTex); |
2747 | 1002 |
end; |
47 | 1003 |
end; |
5380
6ba1e40a360c
Based on some user complaints on forum, try to reduce impact of teams on small displays.
nemo
parents:
5372
diff
changeset
|
1004 |
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
|
1005 |
begin |
5485 | 1006 |
SetScale(cDefaultZoomLevel); |
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
1007 |
if TeamsCount * 20 > Longword(cScreenHeight) div 5 then 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
|
1008 |
end; |
47 | 1009 |
|
5 | 1010 |
// Lag alert |
2567 | 1011 |
if isInLag then DrawSprite(sprLag, 32 - (cScreenWidth shr 1), 32, (RealTicks shr 7) mod 12); |
4 | 1012 |
|
5 | 1013 |
// Wind bar |
2567 | 1014 |
{$IFDEF IPHONEOS} |
3405 | 1015 |
offsetX:= cScreenHeight - 13; |
1016 |
offsetY:= (cScreenWidth shr 1) + 74; |
|
2567 | 1017 |
{$ELSE} |
3405 | 1018 |
offsetX:= 30; |
1019 |
offsetY:= 180; |
|
2567 | 1020 |
{$ENDIF} |
3405 | 1021 |
DrawSprite(sprWindBar, (cScreenWidth shr 1) - offsetY, cScreenHeight - offsetX, 0); |
1022 |
if WindBarWidth > 0 then |
|
1023 |
begin |
|
1024 |
{$WARNINGS OFF} |
|
1025 |
r.x:= 8 - (RealTicks shr 6) mod 8; |
|
1026 |
{$WARNINGS ON} |
|
1027 |
r.y:= 0; |
|
1028 |
r.w:= WindBarWidth; |
|
1029 |
r.h:= 13; |
|
1030 |
DrawSpriteFromRect(sprWindR, r, (cScreenWidth shr 1) - offsetY + 77, cScreenHeight - offsetX + 2, 13, 0); |
|
1031 |
end |
|
1032 |
else |
|
1033 |
if WindBarWidth < 0 then |
|
1034 |
begin |
|
1035 |
{$WARNINGS OFF} |
|
3407 | 1036 |
r.x:= (Longword(WindBarWidth) + RealTicks shr 6) mod 8; |
3405 | 1037 |
{$WARNINGS ON} |
1038 |
r.y:= 0; |
|
1039 |
r.w:= - WindBarWidth; |
|
1040 |
r.h:= 13; |
|
1041 |
DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0); |
|
1042 |
end; |
|
5 | 1043 |
|
161 | 1044 |
// AmmoMenu |
3434 | 1045 |
if (AMxShift < AMWidth) or bShowAmmoMenu then ShowAmmoMenu; |
161 | 1046 |
|
2287 | 1047 |
// Cursor |
1048 |
if isCursorVisible and bShowAmmoMenu then |
|
1049 |
DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8); |
|
942 | 1050 |
|
4816
c2575faeac3d
use a different depth for different layers (land, water, explosions)
koda
parents:
4812
diff
changeset
|
1051 |
// Chat |
2287 | 1052 |
DrawChat; |
4 | 1053 |
|
4976 | 1054 |
// various captions |
2567 | 1055 |
if fastUntilLag then DrawCentered(0, (cScreenHeight shr 1), SyncTexture); |
1056 |
if isPaused then DrawCentered(0, (cScreenHeight shr 1), PauseTexture); |
|
3774 | 1057 |
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
|
1058 |
begin |
3774 | 1059 |
if (ReadyTimeLeft = 0) and (missionTimer > 0) then dec(missionTimer, Lag); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1060 |
if missionTimer < 0 then missionTimer:= 0; // avoid subtracting below 0 |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1061 |
if missionTex <> nil then |
4374 | 1062 |
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
|
1063 |
end; |
2786 | 1064 |
|
2724 | 1065 |
// fps |
1066 |
{$IFDEF IPHONEOS} |
|
3463 | 1067 |
offsetX:= 8; |
2724 | 1068 |
{$ELSE} |
3463 | 1069 |
offsetX:= 10; |
2724 | 1070 |
{$ENDIF} |
3463 | 1071 |
offsetY:= cOffsetY; |
3696 | 1072 |
if (RM = rmDefault) or (RM = rmRightEye) then |
3692 | 1073 |
begin |
1074 |
inc(Frames); |
|
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1075 |
|
3692 | 1076 |
if cShowFPS or (GameType = gmtDemo) then |
1077 |
inc(CountTicks, Lag); |
|
1078 |
if (GameType = gmtDemo) and (CountTicks >= 1000) then |
|
1079 |
begin |
|
1080 |
i:=GameTicks div 1000; |
|
1081 |
t:= i mod 60; |
|
1082 |
s:= inttostr(t); |
|
1083 |
if t < 10 then s:= '0' + s; |
|
1084 |
i:= i div 60; |
|
1085 |
t:= i mod 60; |
|
1086 |
s:= inttostr(t) + ':' + s; |
|
1087 |
if t < 10 then s:= '0' + s; |
|
1088 |
s:= inttostr(i div 60) + ':' + s; |
|
3407 | 1089 |
|
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
|
1090 |
|
3692 | 1091 |
tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels); |
1092 |
tmpSurface:= doSurfaceConversion(tmpSurface); |
|
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1093 |
FreeTexture(timeTexture); |
3692 | 1094 |
timeTexture:= Surface2Tex(tmpSurface, false); |
1095 |
SDL_FreeSurface(tmpSurface) |
|
1096 |
end; |
|
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1097 |
|
3692 | 1098 |
if timeTexture <> nil then |
1099 |
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
|
1100 |
|
3692 | 1101 |
if cShowFPS then |
1102 |
begin |
|
1103 |
if CountTicks >= 1000 then |
|
1104 |
begin |
|
1105 |
FPS:= Frames; |
|
1106 |
Frames:= 0; |
|
1107 |
CountTicks:= 0; |
|
1108 |
s:= inttostr(FPS) + ' fps'; |
|
1109 |
tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels); |
|
1110 |
tmpSurface:= doSurfaceConversion(tmpSurface); |
|
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1111 |
FreeTexture(fpsTexture); |
3692 | 1112 |
fpsTexture:= Surface2Tex(tmpSurface, false); |
1113 |
SDL_FreeSurface(tmpSurface) |
|
1114 |
end; |
|
1115 |
if fpsTexture <> nil then |
|
1116 |
DrawTexture((cScreenWidth shr 1) - 60 - offsetY, offsetX, fpsTexture); |
|
1117 |
end; |
|
174 | 1118 |
|
3692 | 1119 |
if CountTicks >= 1000 then CountTicks:= 0; |
2850
f6f8db825ce7
A little clock for convenience in finding things in demos
nemo
parents:
2839
diff
changeset
|
1120 |
|
3692 | 1121 |
// lag warning (?) |
1122 |
inc(SoundTimerTicks, Lag); |
|
1123 |
end; |
|
1124 |
||
174 | 1125 |
if SoundTimerTicks >= 50 then |
1126 |
begin |
|
1127 |
SoundTimerTicks:= 0; |
|
1128 |
if cVolumeDelta <> 0 then |
|
1129 |
begin |
|
1130 |
str(ChangeVolume(cVolumeDelta), s); |
|
2619 | 1131 |
AddCaption(Format(trmsg[sidVolume], s), cWhiteColor, capgrpVolume) |
174 | 1132 |
end |
756 | 1133 |
end; |
1134 |
||
2724 | 1135 |
if GameState = gsConfirm then |
3025 | 1136 |
DrawCentered(0, (cScreenHeight shr 1), ConfirmTexture); |
2161
0c8634241fa4
Some work on zooming. Hedgewars are now unplayable.
unc0rr
parents:
2152
diff
changeset
|
1137 |
|
3107 | 1138 |
if ScreenFade <> sfNone then |
1139 |
begin |
|
1140 |
if not isFirstFrame then |
|
1141 |
case ScreenFade of |
|
1142 |
sfToBlack, sfToWhite: if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then |
|
1143 |
inc(ScreenFadeValue, Lag * ScreenFadeSpeed) |
|
1144 |
else |
|
3123 | 1145 |
ScreenFadeValue:= sfMax; |
3107 | 1146 |
sfFromBlack, sfFromWhite: if ScreenFadeValue - Lag * ScreenFadeSpeed > 0 then |
1147 |
dec(ScreenFadeValue, Lag * ScreenFadeSpeed) |
|
1148 |
else |
|
3123 | 1149 |
ScreenFadeValue:= 0; |
3107 | 1150 |
end; |
1151 |
if ScreenFade <> sfNone then |
|
1152 |
begin |
|
1153 |
case ScreenFade of |
|
3376 | 1154 |
sfToBlack, sfFromBlack: Tint(0, 0, 0, ScreenFadeValue * 255 div 1000); |
1155 |
sfToWhite, sfFromWhite: Tint($FF, $FF, $FF, ScreenFadeValue * 255 div 1000); |
|
3107 | 1156 |
end; |
3697 | 1157 |
|
3113 | 1158 |
VertexBuffer[0].X:= -cScreenWidth; |
1159 |
VertexBuffer[0].Y:= cScreenHeight; |
|
1160 |
VertexBuffer[1].X:= -cScreenWidth; |
|
1161 |
VertexBuffer[1].Y:= 0; |
|
1162 |
VertexBuffer[2].X:= cScreenWidth; |
|
1163 |
VertexBuffer[2].Y:= 0; |
|
1164 |
VertexBuffer[3].X:= cScreenWidth; |
|
1165 |
VertexBuffer[3].Y:= cScreenHeight; |
|
3697 | 1166 |
|
3376 | 1167 |
glDisable(GL_TEXTURE_2D); |
3641 | 1168 |
|
3113 | 1169 |
glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]); |
1170 |
glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer)); |
|
3641 | 1171 |
|
3376 | 1172 |
glEnable(GL_TEXTURE_2D); |
3390 | 1173 |
Tint($FF, $FF, $FF, $FF); |
3123 | 1174 |
if not isFirstFrame and ((ScreenFadeValue = 0) or (ScreenFadeValue = sfMax)) then ScreenFade:= sfNone |
3107 | 1175 |
end |
1176 |
end; |
|
1177 |
||
3123 | 1178 |
SetScale(zoom); |
1179 |
||
1180 |
// Cursor |
|
1181 |
if isCursorVisible then |
|
1182 |
begin |
|
1183 |
if not bShowAmmoMenu then |
|
3204 | 1184 |
begin |
3123 | 1185 |
with CurrentHedgehog^ do |
3582
4debed8656d7
fix segfault on HH-gear being 0 (e.g. after drowning) in cursor/target selection mode, thanks "ivze" for the heads-up!
sheepluva
parents:
3580
diff
changeset
|
1186 |
if (Gear <> nil) and ((Gear^.State and gstHHChooseTarget) <> 0) then |
3123 | 1187 |
begin |
5675
cd10d6cba644
add for mine strike too. as cheezemonkey points out, mine bounce is height dependent.
nemo
parents:
5523
diff
changeset
|
1188 |
if (CurAmmoType = amNapalm) or (CurAmmoType = amMineStrike) then |
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
|
1189 |
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); |
3836
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3811
diff
changeset
|
1190 |
i:= GetAmmoEntry(CurrentHedgehog^)^.Pos; |
833c0f32e326
Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents:
3811
diff
changeset
|
1191 |
with Ammoz[CurAmmoType] do |
3123 | 1192 |
if PosCount > 1 then |
3204 | 1193 |
DrawSprite(PosSprite, CursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - CursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i); |
3123 | 1194 |
end; |
3204 | 1195 |
DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8) |
1196 |
end |
|
3123 | 1197 |
end; |
3107 | 1198 |
isFirstFrame:= false |
4 | 1199 |
end; |
1200 |
||
79 | 1201 |
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
|
1202 |
var EdgesDist, wdy, shs,z: LongInt; |
3638
33ee433749ba
touch overlay reworked, improvements to zoom and confirmation
koda
parents:
3629
diff
changeset
|
1203 |
PrevSentPointTime: LongWord = 0; |
4 | 1204 |
begin |
3551 | 1205 |
{$IFNDEF IPHONEOS} |
5522 | 1206 |
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
|
1207 |
uCursor.updatePosition(); |
3551 | 1208 |
{$ENDIF} |
5852 | 1209 |
z:= round(200/zoom); |
6296 | 1210 |
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
|
1211 |
if (not autoCameraOn) or ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then |
6296 | 1212 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1213 |
FollowGear:= nil; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1214 |
prevPoint:= CursorPoint; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1215 |
exit |
6296 | 1216 |
end |
3680 | 1217 |
else |
6296 | 1218 |
begin |
5852 | 1219 |
CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8; |
6098 | 1220 |
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
|
1221 |
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
|
1222 |
else |
85410eef7ba4
disable the followgear vertical offset for small screen devices
koda
parents:
6011
diff
changeset
|
1223 |
CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8; |
6296 | 1224 |
end; |
4 | 1225 |
|
2375 | 1226 |
wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater; |
1227 |
if WorldDy < wdy then WorldDy:= wdy; |
|
1228 |
||
2197 | 1229 |
if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then exit; |
4 | 1230 |
|
3434 | 1231 |
if AMxShift < AMWidth then |
3680 | 1232 |
begin |
3463 | 1233 |
{$IFDEF IPHONEOS} |
3434 | 1234 |
if CursorPoint.X < cScreenWidth div 2 + AMxShift - AMWidth then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMWidth; |
1235 |
if CursorPoint.X > cScreenWidth div 2 + AMxShift - AMxOffset then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMxOffset; |
|
1236 |
if CursorPoint.Y < cScreenHeight - AMyOffset - SlotsNum * AMSlotSize then CursorPoint.Y:= cScreenHeight - AMyOffset - SlotsNum * AMSlotSize; |
|
1237 |
if CursorPoint.Y > cScreenHeight - AMyOffset then CursorPoint.Y:= cScreenHeight - AMyOffset; |
|
3463 | 1238 |
{$ELSE} |
3434 | 1239 |
if CursorPoint.X < cScreenWidth div 2 + AMxShift - AMWidth + AMSlotSize then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMWidth + AMSlotSize; |
1240 |
if CursorPoint.X > cScreenWidth div 2 + AMxShift - AMxOffset then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMxOffset; |
|
1241 |
if CursorPoint.Y > AMyOffset + (SlotsNum + 1) * AMSlotSize then CursorPoint.Y:= AMyOffset + (SlotsNum + 1) * AMSlotSize; |
|
1242 |
if CursorPoint.Y < AMyOffset + AMSlotSize then CursorPoint.Y:= AMyOffset + AMSlotSize; |
|
3463 | 1243 |
{$ENDIF} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1244 |
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
|
1245 |
//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
|
1246 |
exit |
3680 | 1247 |
end; |
162 | 1248 |
|
4 | 1249 |
if isCursorVisible then |
3680 | 1250 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1251 |
if (not CurrentTeam^.ExtDriven) and (GameTicks >= PrevSentPointTime + cSendCursorPosTime) then |
3680 | 1252 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1253 |
SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1254 |
PrevSentPointTime:= GameTicks |
3680 | 1255 |
end; |
1256 |
EdgesDist:= cCursorEdgesDist |
|
1257 |
end |
|
1258 |
else |
|
1259 |
EdgesDist:= cGearScrEdgesDist; |
|
1260 |
||
1261 |
// this generates the border around the screen that moves the camera when cursor is near it |
|
1262 |
if isCursorVisible or (FollowGear <> nil) then |
|
1263 |
begin |
|
1264 |
if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then |
|
1265 |
begin |
|
1266 |
WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist; |
|
1267 |
CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |
|
1268 |
end |
|
1269 |
else |
|
1270 |
if CursorPoint.X > cScreenWidth div 2 - EdgesDist then |
|
1271 |
begin |
|
1272 |
WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist; |
|
1273 |
CursorPoint.X:= cScreenWidth div 2 - EdgesDist |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1274 |
end; |
5149
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1275 |
|
5302 | 1276 |
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
|
1277 |
if CursorPoint.Y < shs then |
3680 | 1278 |
begin |
5149
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1279 |
WorldDy:= WorldDy + CursorPoint.Y - shs; |
9aa840fdf922
Try to allow cursor to reach water when zooming out
unc0rr
parents:
5022
diff
changeset
|
1280 |
CursorPoint.Y:= shs; |
3680 | 1281 |
end |
1282 |
else |
|
5302 | 1283 |
if (CursorPoint.Y > cScreenHeight - EdgesDist) then |
3680 | 1284 |
begin |
1285 |
WorldDy:= WorldDy + CursorPoint.Y - cScreenHeight + EdgesDist; |
|
1286 |
CursorPoint.Y:= cScreenHeight - EdgesDist |
|
1287 |
end; |
|
1288 |
end |
|
1289 |
else |
|
1290 |
if cHasFocus then |
|
1291 |
begin |
|
1292 |
WorldDx:= WorldDx - CursorPoint.X + prevPoint.X; |
|
1293 |
WorldDy:= WorldDy + CursorPoint.Y - prevPoint.Y; |
|
1294 |
CursorPoint.X:= 0; |
|
1295 |
CursorPoint.Y:= cScreenHeight div 2; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1296 |
end; |
351 | 1297 |
|
3680 | 1298 |
// this moves the camera according to CursorPoint X and Y |
4 | 1299 |
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
|
1300 |
//if cHasFocus then SDL_WarpMouse(CursorPoint.X + (cScreenWidth shr 1), cScreenHeight - CursorPoint.Y); |
1760 | 1301 |
if WorldDy > LAND_HEIGHT + 1024 then WorldDy:= LAND_HEIGHT + 1024; |
2375 | 1302 |
if WorldDy < wdy then WorldDy:= wdy; |
2426 | 1303 |
if WorldDx < - LAND_WIDTH - 1024 then WorldDx:= - LAND_WIDTH - 1024; |
1304 |
if WorldDx > 1024 then WorldDx:= 1024; |
|
4 | 1305 |
end; |
1306 |
||
2905 | 1307 |
procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt); |
2786 | 1308 |
var r: TSDL_Rect; |
1309 |
begin |
|
1310 |
r.w:= 32; |
|
1311 |
r.h:= 32; |
|
1312 |
||
1313 |
if time = 0 then time:= 5000; |
|
1314 |
missionTimer:= time; |
|
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1315 |
FreeTexture(missionTex); |
2786 | 1316 |
|
1317 |
if icon > -1 then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1318 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1319 |
r.x:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1320 |
r.y:= icon * 32; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1321 |
missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, MissionIcons, @r) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1322 |
end |
2786 | 1323 |
else |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1324 |
begin |
4626
775f43e90383
fixed showmission so it actually displays the right icons
Henek
parents:
4482
diff
changeset
|
1325 |
r.x:= ((-icon - 1) shr 4) * 32; |
775f43e90383
fixed showmission so it actually displays the right icons
Henek
parents:
4482
diff
changeset
|
1326 |
r.y:= ((-icon - 1) mod 16) * 32; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1327 |
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
|
1328 |
end; |
2786 | 1329 |
end; |
1330 |
||
1331 |
procedure HideMission; |
|
1332 |
begin |
|
3045 | 1333 |
missionTimer:= 0; |
2786 | 1334 |
end; |
1335 |
||
6011
519f8a58c021
Fix a bunch of warnings (also improves speed a bit in 32 bit code)
unC0Rr
parents:
5862
diff
changeset
|
1336 |
procedure ShakeCamera(amount: LongInt); |
3032 | 1337 |
begin |
5800
3a04c30e5ac7
NEEDS TESTING. Try reenabling camera shake based on unc0rr's comment.
nemo
parents:
5684
diff
changeset
|
1338 |
if isCursorVisible then exit; |
5855
74c621e12baa
I do believe the only thing that was *ever* wrong with camera shake was someone decided to use getRandom on something that had always been a visual effect anyway. Pretty sure WorldDx is in fact safe to modify.
nemo
parents:
5852
diff
changeset
|
1339 |
amount:= Max(1, round(amount*zoom/2)); |
74c621e12baa
I do believe the only thing that was *ever* wrong with camera shake was someone decided to use getRandom on something that had always been a visual effect anyway. Pretty sure WorldDx is in fact safe to modify.
nemo
parents:
5852
diff
changeset
|
1340 |
WorldDx:= WorldDx - amount + LongInt(random(1 + amount * 2)); |
74c621e12baa
I do believe the only thing that was *ever* wrong with camera shake was someone decided to use getRandom on something that had always been a visual effect anyway. Pretty sure WorldDx is in fact safe to modify.
nemo
parents:
5852
diff
changeset
|
1341 |
WorldDy:= WorldDy - amount + LongInt(random(1 + amount * 2)); |
74c621e12baa
I do believe the only thing that was *ever* wrong with camera shake was someone decided to use getRandom on something that had always been a visual effect anyway. Pretty sure WorldDx is in fact safe to modify.
nemo
parents:
5852
diff
changeset
|
1342 |
//CursorPoint.X:= CursorPoint.X - amount + LongInt(random(1 + amount * 2)); |
74c621e12baa
I do believe the only thing that was *ever* wrong with camera shake was someone decided to use getRandom on something that had always been a visual effect anyway. Pretty sure WorldDx is in fact safe to modify.
nemo
parents:
5852
diff
changeset
|
1343 |
//CursorPoint.Y:= CursorPoint.Y - amount + LongInt(random(1 + amount * 2)) |
3032 | 1344 |
end; |
1345 |
||
5521 | 1346 |
|
1347 |
procedure onFocusStateChanged; |
|
1348 |
begin |
|
1349 |
if (not cHasFocus) and (GameState <> gsConfirm) then |
|
5523 | 1350 |
ParseCommand('quit', true); |
5521 | 1351 |
end; |
1352 |
||
1353 |
||
3038 | 1354 |
procedure initModule; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
1355 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1356 |
fpsTexture:= nil; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1357 |
FollowGear:= nil; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1358 |
WindBarWidth:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1359 |
bShowAmmoMenu:= false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1360 |
bSelected:= false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1361 |
bShowFinger:= false; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1362 |
Frames:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1363 |
WorldDx:= -512; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1364 |
WorldDy:= -256; |
3697 | 1365 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1366 |
FPS:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1367 |
CountTicks:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1368 |
SoundTimerTicks:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1369 |
prevPoint.X:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1370 |
prevPoint.Y:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2931
diff
changeset
|
1371 |
missionTimer:= 0; |
3240 | 1372 |
missionTex:= nil; |
3463 | 1373 |
cOffsetY:= 0; |
4850 | 1374 |
stereoDepth:= 0; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2682
diff
changeset
|
1375 |
end; |
4 | 1376 |
|
3038 | 1377 |
procedure freeModule; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
1378 |
begin |
4850 | 1379 |
stereoDepth:= stereoDepth; // avoid hint |
4901 | 1380 |
FreeTexture(fpsTexture); |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1381 |
fpsTexture:= nil; |
4901 | 1382 |
FreeTexture(timeTexture); |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1383 |
timeTexture:= nil; |
4901 | 1384 |
FreeTexture(missionTex); |
6380
1ff5ad1d771b
Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check.
nemo
parents:
6302
diff
changeset
|
1385 |
missionTex:= nil |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
1386 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2713
diff
changeset
|
1387 |
|
4 | 1388 |
end. |