author | mikade <redgrinner@gmail.com> |
Thu, 11 Dec 2014 20:38:03 +0900 | |
changeset 10655 | 1c85a442bd56 |
parent 10562 | 3388822b3914 |
child 10682 | 1be106f8095a |
permissions | -rw-r--r-- |
4976 | 1 |
(* |
2 |
* Hedgewars, a free turn based strategy game |
|
9998 | 3 |
* Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com> |
4976 | 4 |
* |
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 |
|
8 |
* |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
4976 | 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. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10082
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
4976 | 17 |
*) |
18 |
||
4388 | 19 |
{$INCLUDE "options.inc"} |
4976 | 20 |
|
4388 | 21 |
unit uGearsRender; |
22 |
||
23 |
interface |
|
7671 | 24 |
uses uTypes, uConsts, GLunit, uFloat, SDLh; |
4388 | 25 |
|
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7978
diff
changeset
|
26 |
type |
10015 | 27 |
Tar = record |
8330 | 28 |
X, Y: hwFloat; |
29 |
dLen: hwFloat; |
|
30 |
b : boolean; |
|
31 |
end; |
|
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7978
diff
changeset
|
32 |
TRopePoints = record |
8330 | 33 |
Count : Longword; |
34 |
HookAngle : GLfloat; |
|
35 |
ar : array[0..MAXROPEPOINTS] of Tar; |
|
36 |
rounded : array[0..MAXROPEPOINTS + 2] of TVertex2f; |
|
37 |
end; |
|
4388 | 38 |
procedure RenderGear(Gear: PGear; x, y: LongInt); |
39 |
||
40 |
var RopePoints: record |
|
41 |
Count: Longword; |
|
42 |
HookAngle: GLfloat; |
|
43 |
ar: array[0..MAXROPEPOINTS] of record |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
44 |
X, Y: hwFloat; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
45 |
dLen: hwFloat; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
46 |
b: boolean; |
8733
b6002f1956d5
Hard math to fix issue 571. Well, not really hard math,
unc0rr
parents:
8689
diff
changeset
|
47 |
sx, sy, sb: boolean; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
48 |
end; |
4388 | 49 |
rounded: array[0..MAXROPEPOINTS + 2] of TVertex2f; |
50 |
end; |
|
51 |
||
52 |
implementation |
|
9285 | 53 |
uses uRender, uUtils, uVariables, uAmmos, Math, uVisualGearsList; |
4388 | 54 |
|
55 |
procedure DrawRopeLinesRQ(Gear: PGear); |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
56 |
var n: LongInt; |
4388 | 57 |
begin |
58 |
with RopePoints do |
|
59 |
begin |
|
60 |
rounded[Count].X:= hwRound(Gear^.X); |
|
61 |
rounded[Count].Y:= hwRound(Gear^.Y); |
|
62 |
rounded[Count + 1].X:= hwRound(Gear^.Hedgehog^.Gear^.X); |
|
63 |
rounded[Count + 1].Y:= hwRound(Gear^.Hedgehog^.Gear^.Y); |
|
64 |
end; |
|
65 |
||
66 |
if (RopePoints.Count > 0) or (Gear^.Elasticity.QWordValue > 0) then |
|
67 |
begin |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
68 |
EnableTexture(false); |
4388 | 69 |
//glEnable(GL_LINE_SMOOTH); |
70 |
||
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
71 |
Tint($70, $70, $70, $FF); |
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
72 |
|
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
73 |
n:= RopePoints.Count + 2; |
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
74 |
|
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
75 |
SetVertexPointer(@RopePoints.rounded[0], n); |
4388 | 76 |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
77 |
openglPushMatrix(); |
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
78 |
openglTranslatef(WorldDx, WorldDy, 0); |
4388 | 79 |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
80 |
glLineWidth(3.0 * cScaleFactor); |
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
81 |
glDrawArrays(GL_LINE_STRIP, 0, n); |
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
82 |
Tint($D8, $D8, $D8, $FF); |
10264
cb4331b032f4
use cScaleFactor where I incorrectly used the variable zoom in the past. i was young and needed the money
sheepluva
parents:
10142
diff
changeset
|
83 |
glLineWidth(2.0 * cScaleFactor); |
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
84 |
glDrawArrays(GL_LINE_STRIP, 0, n); |
4388 | 85 |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
86 |
untint; |
4388 | 87 |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
88 |
openglPopMatrix(); |
4388 | 89 |
|
10523
00ac079fa51f
fix some nasty rendering issues reported by Nexia - thanks a lot!
sheepluva
parents:
10443
diff
changeset
|
90 |
EnableTexture(true); |
4388 | 91 |
//glDisable(GL_LINE_SMOOTH) |
92 |
end |
|
93 |
end; |
|
94 |
||
95 |
||
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
96 |
function DrawRopeLine(X1, Y1, X2, Y2, roplen: LongInt): LongInt; |
6490 | 97 |
var eX, eY, dX, dY: LongInt; |
98 |
i, sX, sY, x, y, d: LongInt; |
|
99 |
b: boolean; |
|
100 |
begin |
|
4388 | 101 |
if (X1 = X2) and (Y1 = Y2) then |
6490 | 102 |
begin |
103 |
//OutError('WARNING: zero length rope line!', false); |
|
10015 | 104 |
DrawRopeLine:= 0; |
6490 | 105 |
exit |
106 |
end; |
|
4388 | 107 |
eX:= 0; |
108 |
eY:= 0; |
|
109 |
dX:= X2 - X1; |
|
110 |
dY:= Y2 - Y1; |
|
111 |
||
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
112 |
if (dX > 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
113 |
sX:= 1 |
4388 | 114 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
115 |
if (dX < 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
116 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
117 |
sX:= -1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
118 |
dX:= -dX |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
119 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
120 |
else sX:= dX; |
4388 | 121 |
|
8689 | 122 |
if (dY > 0) then |
6490 | 123 |
sY:= 1 |
4388 | 124 |
else |
6490 | 125 |
if (dY < 0) then |
4388 | 126 |
begin |
6490 | 127 |
sY:= -1; |
128 |
dY:= -dY |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
129 |
end |
8689 | 130 |
else |
6490 | 131 |
sY:= dY; |
132 |
||
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
133 |
if (dX > dY) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
134 |
d:= dX |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
135 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
136 |
d:= dY; |
6490 | 137 |
|
138 |
x:= X1; |
|
139 |
y:= Y1; |
|
140 |
||
141 |
for i:= 0 to d do |
|
142 |
begin |
|
143 |
inc(eX, dX); |
|
144 |
inc(eY, dY); |
|
145 |
b:= false; |
|
146 |
if (eX > d) then |
|
147 |
begin |
|
148 |
dec(eX, d); |
|
149 |
inc(x, sX); |
|
150 |
b:= true |
|
151 |
end; |
|
152 |
if (eY > d) then |
|
153 |
begin |
|
154 |
dec(eY, d); |
|
155 |
inc(y, sY); |
|
156 |
b:= true |
|
157 |
end; |
|
158 |
if b then |
|
159 |
begin |
|
160 |
inc(roplen); |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
161 |
if (roplen mod 4) = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
162 |
DrawSprite(sprRopeNode, x - 2, y - 2, 0) |
6490 | 163 |
end |
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
164 |
end; |
10015 | 165 |
DrawRopeLine:= roplen; |
6490 | 166 |
end; |
167 |
||
168 |
procedure DrawRope(Gear: PGear); |
|
10562 | 169 |
var roplen, i: LongInt; |
4388 | 170 |
begin |
171 |
if (cReducedQuality and rqSimpleRope) <> 0 then |
|
172 |
DrawRopeLinesRQ(Gear) |
|
173 |
else |
|
174 |
begin |
|
175 |
roplen:= 0; |
|
176 |
if RopePoints.Count > 0 then |
|
177 |
begin |
|
178 |
i:= 0; |
|
179 |
while i < Pred(RopePoints.Count) do |
|
180 |
begin |
|
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
181 |
roplen:= DrawRopeLine(hwRound(RopePoints.ar[i].X) + WorldDx, hwRound(RopePoints.ar[i].Y) + WorldDy, |
6490 | 182 |
hwRound(RopePoints.ar[Succ(i)].X) + WorldDx, hwRound(RopePoints.ar[Succ(i)].Y) + WorldDy, roplen); |
4388 | 183 |
inc(i) |
184 |
end; |
|
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
185 |
roplen:= DrawRopeLine(hwRound(RopePoints.ar[i].X) + WorldDx, hwRound(RopePoints.ar[i].Y) + WorldDy, |
6490 | 186 |
hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, roplen); |
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
187 |
roplen:= DrawRopeLine(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, |
6490 | 188 |
hwRound(Gear^.Hedgehog^.Gear^.X) + WorldDx, hwRound(Gear^.Hedgehog^.Gear^.Y) + WorldDy, roplen); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
189 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
190 |
else |
4388 | 191 |
if Gear^.Elasticity.QWordValue > 0 then |
6508
bf5db4517148
Fix regression from 6480 too. Extra assignments might make this slightly less efficient.
nemo
parents:
6490
diff
changeset
|
192 |
roplen:= DrawRopeLine(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, |
6490 | 193 |
hwRound(Gear^.Hedgehog^.Gear^.X) + WorldDx, hwRound(Gear^.Hedgehog^.Gear^.Y) + WorldDy, roplen); |
4388 | 194 |
end; |
195 |
||
196 |
||
197 |
if RopePoints.Count > 0 then |
|
6999 | 198 |
DrawSpriteRotated(sprRopeHook, hwRound(RopePoints.ar[0].X) + WorldDx, hwRound(RopePoints.ar[0].Y) + WorldDy, 1, RopePoints.HookAngle) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
199 |
else |
4388 | 200 |
if Gear^.Elasticity.QWordValue > 0 then |
6999 | 201 |
DrawSpriteRotated(sprRopeHook, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 202 |
end; |
203 |
||
204 |
||
205 |
procedure DrawAltWeapon(Gear: PGear; sx, sy: LongInt); |
|
206 |
begin |
|
207 |
with Gear^.Hedgehog^ do |
|
208 |
begin |
|
209 |
if not (((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and ((Gear^.State and gstAttacked) = 0)) then |
|
210 |
exit; |
|
211 |
DrawTexture(sx + 16, sy + 16, ropeIconTex); |
|
212 |
DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.75, sx + 30, sy + 30, ord(CurAmmoType) - 1, 1, 32, 32); |
|
213 |
end; |
|
214 |
end; |
|
215 |
||
216 |
||
217 |
procedure DrawHH(Gear: PGear; ox, oy: LongInt); |
|
218 |
var i, t: LongInt; |
|
219 |
amt: TAmmoType; |
|
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5561
diff
changeset
|
220 |
sign, hx, hy, tx, ty, sx, sy, m: LongInt; // hedgehog, crosshair, temp, sprite, direction |
4388 | 221 |
dx, dy, ax, ay, aAngle, dAngle, hAngle, lx, ly: real; // laser, change |
222 |
defaultPos, HatVisible: boolean; |
|
223 |
HH: PHedgehog; |
|
224 |
CurWeapon: PAmmo; |
|
8557 | 225 |
iceOffset:Longint; |
226 |
r:TSDL_Rect; |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
227 |
curhat: PTexture; |
4388 | 228 |
begin |
229 |
HH:= Gear^.Hedgehog; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
230 |
if HH^.Unplaced then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
231 |
exit; |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
232 |
if (HH^.CurAmmoType = amKnife) and (HH = CurrentHedgehog) then |
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
233 |
curhat:= ChefHatTexture |
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
234 |
else curhat:= HH^.HatTex; |
4388 | 235 |
m:= 1; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
236 |
if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
237 |
m:= -1; |
4388 | 238 |
sx:= ox + 1; // this offset is very common |
239 |
sy:= oy - 3; |
|
240 |
sign:= hwSign(Gear^.dX); |
|
241 |
||
242 |
if (Gear^.State and gstHHDeath) <> 0 then |
|
243 |
begin |
|
244 |
DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos); |
|
4810 | 245 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
4388 | 246 |
DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos + 8); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
247 |
untint; |
4388 | 248 |
exit |
249 |
end |
|
250 |
else if (Gear^.State and gstHHGone) <> 0 then |
|
251 |
begin |
|
6999 | 252 |
DrawSpriteRotatedF(sprTeleport, sx, sy, Gear^.Pos, sign, 0); |
4388 | 253 |
exit |
254 |
end; |
|
255 |
||
256 |
defaultPos:= true; |
|
257 |
HatVisible:= false; |
|
258 |
||
8560 | 259 |
if HH^.Effects[heFrozen] > 0 then |
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
260 |
if HH^.Effects[heFrozen] < 150000 then |
8560 | 261 |
begin |
262 |
DrawHedgehog(sx, sy, |
|
263 |
sign, |
|
264 |
0, |
|
265 |
0, |
|
266 |
0); |
|
267 |
defaultPos:= false; |
|
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
268 |
if HH^.Effects[heFrozen] < 256 then |
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
269 |
HatVisible:= true |
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
270 |
else HatVisible:= false |
8560 | 271 |
end |
8689 | 272 |
else |
8560 | 273 |
begin |
274 |
DrawHedgehog(sx, sy, |
|
275 |
sign, |
|
276 |
2, |
|
277 |
4, |
|
278 |
0); |
|
279 |
defaultPos:= false; |
|
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
280 |
HatVisible:= false |
8560 | 281 |
end; |
282 |
||
4388 | 283 |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
6999
diff
changeset
|
284 |
if HH^.Effects[hePoisoned] <> 0 then |
4388 | 285 |
begin |
286 |
Tint($00, $FF, $40, $40); |
|
10142 | 287 |
DrawTextureRotatedF(SpritesData[sprSmokeWhite].texture, 2, 0, 0, sx, sy, 0, 1, 22, 22, (RealTicks shr 4) mod 360); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
288 |
untint |
4388 | 289 |
end; |
290 |
||
8557 | 291 |
|
4388 | 292 |
if ((Gear^.State and gstWinner) <> 0) and |
293 |
((CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtPickHammer)) then |
|
294 |
begin |
|
295 |
DrawHedgehog(sx, sy, |
|
296 |
sign, |
|
297 |
2, |
|
298 |
0, |
|
299 |
0); |
|
300 |
defaultPos:= false |
|
301 |
end; |
|
302 |
if (Gear^.State and gstDrowning) <> 0 then |
|
303 |
begin |
|
304 |
DrawHedgehog(sx, sy, |
|
305 |
sign, |
|
306 |
1, |
|
307 |
7, |
|
308 |
0); |
|
309 |
defaultPos:= false |
|
310 |
end else |
|
311 |
if (Gear^.State and gstLoser) <> 0 then |
|
312 |
begin |
|
313 |
DrawHedgehog(sx, sy, |
|
314 |
sign, |
|
315 |
2, |
|
316 |
3, |
|
317 |
0); |
|
318 |
defaultPos:= false |
|
319 |
end else |
|
320 |
||
321 |
if (Gear^.State and gstHHDriven) <> 0 then |
|
322 |
begin |
|
5145
120f4271f197
adjust crosshair criteria again. this should take care of sniper rifle and crosshair after attacking
nemo
parents:
5137
diff
changeset
|
323 |
if ((Gear^.State and (gstHHThinking or gstAnimation)) = 0) and |
5136
948da1e50205
Fix a few crosshair bugs. Disable ShowCrosshair and just decide when drawing.
nemo
parents:
5041
diff
changeset
|
324 |
/// If current ammo is active, and current ammo has alt attack and uses a crosshair (rope, basically, right now, with no crosshair for parachute/saucer |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
325 |
(((CurAmmoGear <> nil) and //((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) and |
10390 | 326 |
// don't render crosshair/laser during kamikaze |
327 |
((CurAmmoGear^.AmmoType <> amKamikaze) or ((Gear^.State and gstAttacking) = 0)) and |
|
5136
948da1e50205
Fix a few crosshair bugs. Disable ShowCrosshair and just decide when drawing.
nemo
parents:
5041
diff
changeset
|
328 |
((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0)) or |
948da1e50205
Fix a few crosshair bugs. Disable ShowCrosshair and just decide when drawing.
nemo
parents:
5041
diff
changeset
|
329 |
/// If no current ammo is active, and the selected ammo uses a crosshair |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
330 |
((CurAmmoGear = nil) and ((Ammoz[HH^.CurAmmoType].Ammo.Propz and ammoprop_NoCrosshair) = 0) and ((Gear^.State and gstAttacked) = 0))) then |
4388 | 331 |
begin |
332 |
(* These calculations are a little complex for a few reasons: |
|
333 |
1: I need to draw the laser from weapon origin to nearest land |
|
334 |
2: I need to start the beam outside the hedgie for attractiveness. |
|
335 |
3: I need to extend the beam beyond land. |
|
336 |
This routine perhaps should be pushed into uStore or somesuch instead of continuuing the increase in size of this function. |
|
337 |
*) |
|
338 |
dx:= sign * m * Sin(Gear^.Angle * pi / cMaxAngle); |
|
339 |
dy:= -Cos(Gear^.Angle * pi / cMaxAngle); |
|
340 |
if cLaserSighting then |
|
341 |
begin |
|
342 |
lx:= GetLaunchX(HH^.CurAmmoType, sign * m, Gear^.Angle); |
|
343 |
ly:= GetLaunchY(HH^.CurAmmoType, Gear^.Angle); |
|
344 |
||
345 |
// ensure we start outside the hedgehog (he's solid after all) |
|
346 |
while abs(lx * lx + ly * ly) < (Gear^.radius * Gear^.radius) do |
|
347 |
begin |
|
348 |
lx:= lx + dx; |
|
349 |
ly:= ly + dy |
|
350 |
end; |
|
351 |
||
352 |
// add hog's position |
|
353 |
lx:= lx + ox - WorldDx; |
|
354 |
ly:= ly + oy - WorldDy; |
|
355 |
||
356 |
// decrease number of iterations required |
|
357 |
ax:= dx * 4; |
|
358 |
ay:= dy * 4; |
|
359 |
||
360 |
tx:= round(lx); |
|
361 |
ty:= round(ly); |
|
362 |
hx:= tx; |
|
363 |
hy:= ty; |
|
364 |
while ((ty and LAND_HEIGHT_MASK) = 0) and |
|
365 |
((tx and LAND_WIDTH_MASK) = 0) and |
|
366 |
(Land[ty, tx] = 0) do // TODO: check for constant variable instead |
|
367 |
begin |
|
368 |
lx:= lx + ax; |
|
369 |
ly:= ly + ay; |
|
370 |
tx:= round(lx); |
|
8854
31133afaa025
remove 70c086d9b03f - I suspect the issue was actually part of more general prob probably fixed in cfc44db21d72 by jaree
nemo
parents:
8733
diff
changeset
|
371 |
ty:= round(ly) |
4388 | 372 |
end; |
373 |
// reached edge of land. assume infinite beam. Extend it way out past camera |
|
374 |
if ((ty and LAND_HEIGHT_MASK) <> 0) or ((tx and LAND_WIDTH_MASK) <> 0) then |
|
375 |
begin |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
376 |
tx:= round(lx + ax * (max(LAND_WIDTH,4096) div 2)); |
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
377 |
ty:= round(ly + ay * (max(LAND_WIDTH,4096) div 2)); |
4388 | 378 |
end; |
379 |
||
380 |
//if (abs(lx-tx)>8) or (abs(ly-ty)>8) then |
|
381 |
begin |
|
382 |
DrawLine(hx, hy, tx, ty, 1.0, $FF, $00, $00, $C0); |
|
383 |
end; |
|
384 |
end; |
|
385 |
// draw crosshair |
|
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5561
diff
changeset
|
386 |
CrosshairX := Round(hwRound(Gear^.X) + dx * 80 + GetLaunchX(HH^.CurAmmoType, sign * m, Gear^.Angle)); |
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5561
diff
changeset
|
387 |
CrosshairY := Round(hwRound(Gear^.Y) + dy * 80 + GetLaunchY(HH^.CurAmmoType, Gear^.Angle)); |
8689 | 388 |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
389 |
setTintAdd(true); |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9505
diff
changeset
|
390 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9505
diff
changeset
|
391 |
DrawTextureRotated(CrosshairTexture, |
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5561
diff
changeset
|
392 |
12, 12, CrosshairX + WorldDx, CrosshairY + WorldDy, 0, |
9667
0b27737fc28f
Don't change crosshair look when hedgehog does high jump
unc0rr
parents:
9666
diff
changeset
|
393 |
sign * m * (Gear^.Angle * 180.0) / cMaxAngle); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
394 |
untint; |
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
395 |
setTintAdd(false); |
4388 | 396 |
end; |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
397 |
|
4388 | 398 |
hx:= ox + 8 * sign; |
399 |
hy:= oy - 2; |
|
400 |
aangle:= Gear^.Angle * 180 / cMaxAngle - 90; |
|
5935 | 401 |
if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind <> gtTardis) then |
4388 | 402 |
begin |
403 |
case CurAmmoGear^.Kind of |
|
404 |
gtShotgunShot: begin |
|
405 |
if (CurAmmoGear^.State and gstAnimation <> 0) then |
|
6999 | 406 |
DrawSpriteRotated(sprShotgun, hx, hy, sign, aangle) |
4388 | 407 |
else |
6999 | 408 |
DrawSpriteRotated(sprHandShotgun, hx, hy, sign, aangle); |
4388 | 409 |
end; |
6999 | 410 |
gtDEagleShot: DrawSpriteRotated(sprDEagle, hx, hy, sign, aangle); |
4388 | 411 |
gtSniperRifleShot: begin |
412 |
if (CurAmmoGear^.State and gstAnimation <> 0) then |
|
6999 | 413 |
DrawSpriteRotatedF(sprSniperRifle, hx, hy, 1, sign, aangle) |
4388 | 414 |
else |
6999 | 415 |
DrawSpriteRotatedF(sprSniperRifle, hx, hy, 0, sign, aangle) |
4388 | 416 |
end; |
6999 | 417 |
gtBallgun: DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); |
4388 | 418 |
gtRCPlane: begin |
6999 | 419 |
DrawSpriteRotated(sprHandPlane, hx, hy, sign, 0); |
4388 | 420 |
defaultPos:= false |
421 |
end; |
|
422 |
gtRope: begin |
|
423 |
if Gear^.X < CurAmmoGear^.X then |
|
424 |
begin |
|
425 |
dAngle:= 0; |
|
426 |
hAngle:= 180; |
|
427 |
i:= 1 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
428 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
429 |
else |
4388 | 430 |
begin |
431 |
dAngle:= 180; |
|
432 |
hAngle:= 0; |
|
433 |
i:= -1 |
|
434 |
end; |
|
7547 | 435 |
if ((Gear^.State and gstWinner) = 0) then |
436 |
begin |
|
437 |
DrawHedgehog(ox, oy, |
|
438 |
i, |
|
439 |
1, |
|
440 |
0, |
|
441 |
DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + dAngle); |
|
442 |
with HH^ do |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
443 |
if (curhat <> nil) then |
4388 | 444 |
begin |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
445 |
DrawTextureRotatedF(curhat, 1.0, -1.0, -6.0, ox, oy, 0, i, 32, 32, |
4388 | 446 |
i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle); |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
447 |
if curhat^.w > 64 then |
7547 | 448 |
begin |
449 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
450 |
DrawTextureRotatedF(curhat, 1.0, -1.0, -6.0, ox, oy, 32, i, 32, 32, |
7547 | 451 |
i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
452 |
untint |
7547 | 453 |
end |
4388 | 454 |
end |
455 |
end; |
|
456 |
DrawAltWeapon(Gear, ox, oy); |
|
457 |
defaultPos:= false |
|
458 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
459 |
gtBlowTorch: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
460 |
begin |
6999 | 461 |
DrawSpriteRotated(sprBlowTorch, hx, hy, sign, aangle); |
4388 | 462 |
DrawHedgehog(sx, sy, |
463 |
sign, |
|
464 |
3, |
|
465 |
HH^.visStepPos div 2, |
|
466 |
0); |
|
467 |
with HH^ do |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
468 |
if (curhat <> nil) then |
4388 | 469 |
begin |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
470 |
DrawTextureF(curhat, |
4388 | 471 |
1, |
472 |
sx, |
|
473 |
sy - 5, |
|
474 |
0, |
|
475 |
sign, |
|
476 |
32, |
|
477 |
32); |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
478 |
if curhat^.w > 64 then |
4388 | 479 |
begin |
4810 | 480 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
481 |
DrawTextureF(curhat, |
4388 | 482 |
1, |
483 |
sx, |
|
484 |
sy - 5, |
|
485 |
32, |
|
486 |
sign, |
|
487 |
32, |
|
488 |
32); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
489 |
untint |
4388 | 490 |
end |
491 |
end; |
|
492 |
defaultPos:= false |
|
493 |
end; |
|
6999 | 494 |
gtShover: DrawSpriteRotated(sprHandBaseball, hx, hy, sign, aangle + 180); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
495 |
gtFirePunch: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
496 |
begin |
4388 | 497 |
DrawHedgehog(sx, sy, |
498 |
sign, |
|
499 |
1, |
|
500 |
4, |
|
501 |
0); |
|
502 |
defaultPos:= false |
|
503 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
504 |
gtPickHammer: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
505 |
begin |
4388 | 506 |
defaultPos:= false; |
507 |
dec(sy,20); |
|
508 |
end; |
|
509 |
gtTeleport: defaultPos:= false; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
510 |
gtWhip: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
511 |
begin |
6999 | 512 |
DrawSpriteRotatedF(sprWhip, |
4388 | 513 |
sx, |
514 |
sy, |
|
515 |
1, |
|
516 |
sign, |
|
517 |
0); |
|
518 |
defaultPos:= false |
|
519 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
520 |
gtHammer: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
521 |
begin |
6999 | 522 |
DrawSpriteRotatedF(sprHammer, |
4388 | 523 |
sx, |
524 |
sy, |
|
525 |
1, |
|
526 |
sign, |
|
527 |
0); |
|
528 |
defaultPos:= false |
|
529 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
530 |
gtResurrector: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
531 |
begin |
6999 | 532 |
DrawSpriteRotated(sprHandResurrector, sx, sy, 0, 0); |
4388 | 533 |
defaultPos:= false |
534 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
535 |
gtKamikaze: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
536 |
begin |
4388 | 537 |
if CurAmmoGear^.Pos = 0 then |
538 |
DrawHedgehog(sx, sy, |
|
539 |
sign, |
|
540 |
1, |
|
541 |
6, |
|
542 |
0) |
|
543 |
else |
|
6999 | 544 |
DrawSpriteRotatedF(sprKamikaze, |
4388 | 545 |
ox, oy, |
546 |
CurAmmoGear^.Pos - 1, |
|
547 |
sign, |
|
548 |
aangle); |
|
549 |
defaultPos:= false |
|
550 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
551 |
gtSeduction: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
552 |
begin |
4388 | 553 |
if CurAmmoGear^.Pos >= 6 then |
554 |
DrawHedgehog(sx, sy, |
|
555 |
sign, |
|
556 |
2, |
|
557 |
2, |
|
558 |
0) |
|
559 |
else |
|
560 |
begin |
|
6999 | 561 |
DrawSpriteRotatedF(sprDress, |
4388 | 562 |
ox, oy, |
563 |
CurAmmoGear^.Pos, |
|
564 |
sign, |
|
565 |
0); |
|
566 |
DrawSprite(sprCensored, ox - 32, oy - 20, 0) |
|
567 |
end; |
|
568 |
defaultPos:= false |
|
569 |
end; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
570 |
gtFlamethrower: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
571 |
begin |
6999 | 572 |
DrawSpriteRotatedF(sprHandFlamethrower, hx, hy, (RealTicks div 125) mod 4, sign, aangle); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
573 |
if CurAmmoGear^.Tex <> nil then |
6999 | 574 |
DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex) |
4388 | 575 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
576 |
gtLandGun: |
6999 | 577 |
begin DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
578 |
if CurAmmoGear^.Tex <> nil then |
6999 | 579 |
DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex) |
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
580 |
end; |
7093 | 581 |
gtIceGun: |
8554 | 582 |
begin DrawSpriteRotated(sprIceGun, hx, hy, sign, aangle); |
7093 | 583 |
if CurAmmoGear^.Tex <> nil then |
584 |
DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex) |
|
585 |
end; |
|
4388 | 586 |
end; |
587 |
||
588 |
case CurAmmoGear^.Kind of |
|
589 |
gtShotgunShot, |
|
590 |
gtDEagleShot, |
|
591 |
gtSniperRifleShot, |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
592 |
gtShover: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
593 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
594 |
DrawHedgehog(sx, sy, sign, 0, 4, 0); |
4388 | 595 |
defaultPos:= false; |
596 |
HatVisible:= true |
|
597 |
end |
|
598 |
end |
|
599 |
end else |
|
600 |
||
601 |
if ((Gear^.State and gstHHJumping) <> 0) then |
|
602 |
begin |
|
603 |
DrawHedgehog(sx, sy, |
|
604 |
sign*m, |
|
605 |
1, |
|
606 |
1, |
|
607 |
0); |
|
608 |
HatVisible:= true; |
|
609 |
defaultPos:= false |
|
610 |
end else |
|
611 |
||
612 |
if (Gear^.Message and (gmLeft or gmRight) <> 0) and (not isCursorVisible) then |
|
613 |
begin |
|
614 |
DrawHedgehog(sx, sy, |
|
615 |
sign, |
|
616 |
0, |
|
617 |
HH^.visStepPos div 2, |
|
618 |
0); |
|
619 |
defaultPos:= false; |
|
620 |
HatVisible:= true |
|
621 |
end |
|
622 |
else |
|
623 |
||
624 |
if ((Gear^.State and gstAnimation) <> 0) then |
|
625 |
begin |
|
10560 | 626 |
if (Gear^.Tag < LongInt(ord(Low(TWave)))) or (Gear^.Tag > LongInt(ord(High(TWave)))) then |
4388 | 627 |
begin |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6328
diff
changeset
|
628 |
Gear^.State:= Gear^.State and (not gstAnimation); |
4388 | 629 |
end |
630 |
else |
|
631 |
begin |
|
6999 | 632 |
DrawSpriteRotatedF(Wavez[TWave(Gear^.Tag)].Sprite, |
4388 | 633 |
sx, |
634 |
sy, |
|
635 |
Gear^.Pos, |
|
636 |
sign, |
|
637 |
0.0); |
|
638 |
defaultPos:= false |
|
639 |
end |
|
640 |
end |
|
641 |
else |
|
642 |
if ((Gear^.State and gstAttacked) = 0) then |
|
643 |
begin |
|
644 |
if HH^.Timer > 0 then |
|
645 |
begin |
|
646 |
// There must be a tidier way to do this. Anyone? |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
647 |
if aangle <= 90 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
648 |
aangle:= aangle+360; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
649 |
if Gear^.dX > _0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
650 |
aangle:= aangle-((aangle-240)*HH^.Timer/10) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
651 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
652 |
aangle:= aangle+((240-aangle)*HH^.Timer/10); |
4388 | 653 |
dec(HH^.Timer) |
654 |
end; |
|
655 |
amt:= CurrentHedgehog^.CurAmmoType; |
|
6924 | 656 |
CurWeapon:= GetCurAmmoEntry(HH^); |
4388 | 657 |
case amt of |
6999 | 658 |
amBazooka: DrawSpriteRotated(sprHandBazooka, hx, hy, sign, aangle); |
659 |
amSnowball: DrawSpriteRotated(sprHandSnowball, hx, hy, sign, aangle); |
|
660 |
amMortar: DrawSpriteRotated(sprHandMortar, hx, hy, sign, aangle); |
|
661 |
amMolotov: DrawSpriteRotated(sprHandMolotov, hx, hy, sign, aangle); |
|
662 |
amBallgun: DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); |
|
663 |
amDrill: DrawSpriteRotated(sprHandDrill, hx, hy, sign, aangle); |
|
664 |
amRope: DrawSpriteRotated(sprHandRope, hx, hy, sign, aangle); |
|
665 |
amShotgun: DrawSpriteRotated(sprHandShotgun, hx, hy, sign, aangle); |
|
666 |
amDEagle: DrawSpriteRotated(sprHandDEagle, hx, hy, sign, aangle); |
|
667 |
amSineGun: DrawSpriteRotatedF(sprHandSinegun, hx, hy, 73 + (sign * LongInt(RealTicks div 73)) mod 8, sign, aangle); |
|
8689 | 668 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
669 |
amPortalGun: |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
670 |
if (CurWeapon^.Timer and 2) <> 0 then // Add a new Hedgehog value instead of abusing timer? |
6999 | 671 |
DrawSpriteRotatedF(sprPortalGun, hx, hy, 0, sign, aangle) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
672 |
else |
6999 | 673 |
DrawSpriteRotatedF(sprPortalGun, hx, hy, 1+CurWeapon^.Pos, sign, aangle); |
8689 | 674 |
|
6999 | 675 |
amSniperRifle: DrawSpriteRotatedF(sprSniperRifle, hx, hy, 0, sign, aangle); |
676 |
amBlowTorch: DrawSpriteRotated(sprHandBlowTorch, hx, hy, sign, aangle); |
|
677 |
amCake: DrawSpriteRotated(sprHandCake, hx, hy, sign, aangle); |
|
678 |
amGrenade: DrawSpriteRotated(sprHandGrenade, hx, hy, sign, aangle); |
|
679 |
amWatermelon: DrawSpriteRotated(sprHandMelon, hx, hy, sign, aangle); |
|
680 |
amSkip: DrawSpriteRotated(sprHandSkip, hx, hy, sign, aangle); |
|
681 |
amClusterBomb: DrawSpriteRotated(sprHandCluster, hx, hy, sign, aangle); |
|
682 |
amDynamite: DrawSpriteRotated(sprHandDynamite, hx, hy, sign, aangle); |
|
683 |
amHellishBomb: DrawSpriteRotated(sprHandHellish, hx, hy, sign, aangle); |
|
684 |
amGasBomb: DrawSpriteRotated(sprHandCheese, hx, hy, sign, aangle); |
|
685 |
amMine: DrawSpriteRotated(sprHandMine, hx, hy, sign, aangle); |
|
686 |
amSMine: DrawSpriteRotated(sprHandSMine, hx, hy, sign, aangle); |
|
7730
2013733f9ca9
A bit more on the knife. Also add missing files to CMakeLists
nemo
parents:
7721
diff
changeset
|
687 |
amKnife: DrawSpriteRotatedF(sprHandKnife, hx, hy, 0, sign, aangle); |
5525 | 688 |
amSeduction: begin |
6999 | 689 |
DrawSpriteRotated(sprHandSeduction, hx, hy, sign, aangle); |
8689 | 690 |
DrawCircle(ox, oy, 248, 4, $FF, $00, $00, $AA); |
5561
dfbe55237c64
Shrink number of circle points to 60, reenable seduction circle (no longer crashes)
nemo
parents:
5560
diff
changeset
|
691 |
//Tint($FF, $0, $0, $AA); |
dfbe55237c64
Shrink number of circle points to 60, reenable seduction circle (no longer crashes)
nemo
parents:
5560
diff
changeset
|
692 |
//DrawTexture(ox - 240, oy - 240, SpritesData[sprVampiric].Texture, 10); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
693 |
//untint; |
5525 | 694 |
end; |
6999 | 695 |
amVampiric: DrawSpriteRotatedF(sprHandVamp, hx, hy, (RealTicks div 125) mod 4, sign, aangle); |
4388 | 696 |
amRCPlane: begin |
6999 | 697 |
DrawSpriteRotated(sprHandPlane, hx, hy, sign, 0); |
4388 | 698 |
defaultPos:= false |
699 |
end; |
|
9768
08799c901a42
Add rubber utility. Graphics are still incomplete. Also flag snow/ice in theme config.
nemo
parents:
9685
diff
changeset
|
700 |
amRubber, |
4388 | 701 |
amGirder: begin |
6999 | 702 |
DrawSpriteRotated(sprHandConstruction, hx, hy, sign, aangle); |
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
703 |
if WorldEdge = weWrap then |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
704 |
begin |
9809 | 705 |
if hwRound(Gear^.X) < LongInt(leftX) + 256 then |
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
706 |
DrawSpriteClipped(sprGirder, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
707 |
rightX+(ox-leftX)-256, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
708 |
oy-256, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
709 |
LongInt(topY)+WorldDy, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
710 |
LongInt(rightX)+WorldDx, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
711 |
cWaterLine+WorldDy, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
712 |
LongInt(leftX)+WorldDx); |
10562 | 713 |
if hwRound(Gear^.X) > LongInt(rightX) - 256 then |
9505
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
714 |
DrawSpriteClipped(sprGirder, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
715 |
leftX-(rightX-ox)-256, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
716 |
oy-256, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
717 |
LongInt(topY)+WorldDy, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
718 |
LongInt(rightX)+WorldDx, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
719 |
cWaterLine+WorldDy, |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
720 |
LongInt(leftX)+WorldDx) |
56e0cca99e20
Allow girder construction to wrap. Makes wrapping w/ large bodies of water a bit more interesting.
nemo
parents:
9285
diff
changeset
|
721 |
end; |
4388 | 722 |
DrawSpriteClipped(sprGirder, |
723 |
ox-256, |
|
724 |
oy-256, |
|
725 |
LongInt(topY)+WorldDy, |
|
726 |
LongInt(rightX)+WorldDx, |
|
727 |
cWaterLine+WorldDy, |
|
728 |
LongInt(leftX)+WorldDx) |
|
729 |
end; |
|
6999 | 730 |
amBee: DrawSpriteRotatedF(sprHandBee, hx, hy, (RealTicks div 125) mod 4, sign, aangle); |
731 |
amFlamethrower: DrawSpriteRotatedF(sprHandFlamethrower, hx, hy, (RealTicks div 125) mod 4, sign, aangle); |
|
732 |
amLandGun: DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); |
|
8554 | 733 |
amIceGun: DrawSpriteRotated(sprIceGun, hx, hy, sign, aangle); |
4388 | 734 |
amResurrector: DrawCircle(ox, oy, 98, 4, $F5, $DB, $35, $AA); // I'd rather not like to hardcode 100 here |
735 |
end; |
|
736 |
||
737 |
case amt of |
|
738 |
amAirAttack, |
|
739 |
amMineStrike, |
|
6999 | 740 |
amDrillStrike: DrawSpriteRotated(sprHandAirAttack, sx, oy, sign, 0); |
4388 | 741 |
amPickHammer: DrawHedgehog(sx, sy, |
742 |
sign, |
|
743 |
1, |
|
744 |
2, |
|
745 |
0); |
|
6999 | 746 |
amTeleport: DrawSpriteRotatedF(sprTeleport, sx, sy, 0, sign, 0); |
4388 | 747 |
amKamikaze: DrawHedgehog(sx, sy, |
748 |
sign, |
|
749 |
1, |
|
750 |
5, |
|
751 |
0); |
|
6999 | 752 |
amWhip: DrawSpriteRotatedF(sprWhip, |
4388 | 753 |
sx, |
754 |
sy, |
|
755 |
0, |
|
756 |
sign, |
|
757 |
0); |
|
6999 | 758 |
amHammer: DrawSpriteRotatedF(sprHammer, |
4388 | 759 |
sx, |
760 |
sy, |
|
761 |
0, |
|
762 |
sign, |
|
763 |
0); |
|
764 |
else |
|
765 |
DrawHedgehog(sx, sy, |
|
766 |
sign, |
|
767 |
0, |
|
768 |
4, |
|
769 |
0); |
|
770 |
||
771 |
HatVisible:= true; |
|
772 |
(* with HH^ do |
|
773 |
if (HatTex <> nil) |
|
774 |
and (HatVisibility > 0) then |
|
775 |
DrawTextureF(HatTex, |
|
776 |
HatVisibility, |
|
777 |
sx, |
|
778 |
sy - 5, |
|
779 |
0, |
|
780 |
sign, |
|
781 |
32, |
|
782 |
32); *) |
|
783 |
end; |
|
784 |
||
785 |
case amt of |
|
6999 | 786 |
amBaseballBat: DrawSpriteRotated(sprHandBaseball, |
4388 | 787 |
sx - 4 * sign, |
788 |
sy + 9, sign, aangle); |
|
789 |
end; |
|
790 |
||
791 |
defaultPos:= false |
|
792 |
end; |
|
793 |
||
794 |
end else // not gstHHDriven |
|
795 |
begin |
|
8681
d0fc1dca739c
yeah. this was a bad idea. the minor difference in thaw speed vs last hog of team never unthawing.
nemo
parents:
8656
diff
changeset
|
796 |
if (Gear^.Damage > 0) and (HH^.Effects[heFrozen] = 0) |
4388 | 797 |
and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003) then |
798 |
begin |
|
10526
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
799 |
defaultPos:= false; |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
800 |
DrawHedgehog(sx, sy, |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
801 |
sign, |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
802 |
2, |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
803 |
1, |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
804 |
Gear^.DirAngle); |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
805 |
if AprilOne and (curhat <> nil) then |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
806 |
DrawTextureRotatedF(curhat, 1.0, -1.0, 0, sx, sy, 18, sign, 32, 32, |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
807 |
sign*Gear^.DirAngle) |
b43d175d1577
Avoid promoting violence to hedgehogs. At least once a year.
nemo
parents:
10523
diff
changeset
|
808 |
end; |
10528 | 809 |
|
4388 | 810 |
|
811 |
if ((Gear^.State and gstHHJumping) <> 0) then |
|
812 |
begin |
|
813 |
DrawHedgehog(sx, sy, |
|
814 |
sign*m, |
|
815 |
1, |
|
816 |
1, |
|
817 |
0); |
|
818 |
defaultPos:= false |
|
819 |
end; |
|
820 |
end; |
|
821 |
||
822 |
with HH^ do |
|
823 |
begin |
|
824 |
if defaultPos then |
|
825 |
begin |
|
10441
d2f599997b54
Revert hog tinting from rdb65298717da since it wasn't sufficiently complete for a release. More sprites need converting, and there's a slight bug in hog tinting, for away hogs with hats I believe.
nemo
parents:
10390
diff
changeset
|
826 |
if HH^.Team^.hasGone then Tint($FFFFFF80); |
6999 | 827 |
DrawSpriteRotatedF(sprHHIdle, |
4388 | 828 |
sx, |
829 |
sy, |
|
830 |
(RealTicks div 128 + Gear^.Pos) mod 19, |
|
831 |
sign, |
|
832 |
0); |
|
833 |
HatVisible:= true; |
|
834 |
end; |
|
835 |
||
836 |
if HatVisible then |
|
837 |
if HatVisibility < 1.0 then |
|
838 |
HatVisibility:= HatVisibility + 0.2 |
|
839 |
else |
|
840 |
else |
|
841 |
if HatVisibility > 0.0 then |
|
842 |
HatVisibility:= HatVisibility - 0.2; |
|
843 |
||
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
844 |
if (curhat <> nil) |
4388 | 845 |
and (HatVisibility > 0) then |
846 |
if DefaultPos then |
|
847 |
begin |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
848 |
DrawTextureF(curhat, |
4388 | 849 |
HatVisibility, |
850 |
sx, |
|
851 |
sy - 5, |
|
852 |
(RealTicks div 128 + Gear^.Pos) mod 19, |
|
853 |
sign, |
|
854 |
32, |
|
855 |
32); |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
856 |
if curhat^.w > 64 then |
4388 | 857 |
begin |
4810 | 858 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
859 |
DrawTextureF(curhat, |
4388 | 860 |
HatVisibility, |
861 |
sx, |
|
862 |
sy - 5, |
|
863 |
(RealTicks div 128 + Gear^.Pos) mod 19 + 32, |
|
864 |
sign, |
|
865 |
32, |
|
866 |
32); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
867 |
untint |
7978 | 868 |
end; |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
869 |
if HH^.Team^.hasGone then untint |
4388 | 870 |
end |
871 |
else |
|
872 |
begin |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
873 |
DrawTextureF(curhat, |
4388 | 874 |
HatVisibility, |
875 |
sx, |
|
876 |
sy - 5, |
|
877 |
0, |
|
878 |
sign*m, |
|
879 |
32, |
|
880 |
32); |
|
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
881 |
if curhat^.w > 64 then |
4388 | 882 |
begin |
4810 | 883 |
Tint(HH^.Team^.Clan^.Color shl 8 or $FF); |
10443
42dadeb6e8ae
Remove switching of hog's hat to chef. do it in draw instead.
nemo
parents:
10441
diff
changeset
|
884 |
DrawTextureF(curhat, |
4388 | 885 |
HatVisibility, |
886 |
sx, |
|
887 |
sy - 5, |
|
888 |
32, |
|
889 |
sign*m, |
|
890 |
32, |
|
891 |
32); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
892 |
untint |
4388 | 893 |
end |
894 |
end |
|
895 |
end; |
|
896 |
if (Gear^.State and gstHHDriven) <> 0 then |
|
897 |
begin |
|
898 |
(* if (CurAmmoGear = nil) then |
|
899 |
begin |
|
900 |
amt:= CurrentHedgehog^.CurAmmoType; |
|
901 |
case amt of |
|
902 |
amJetpack: DrawSprite(sprJetpack, sx-32, sy-32, 0); |
|
903 |
end |
|
904 |
end; *) |
|
905 |
if CurAmmoGear <> nil then |
|
906 |
begin |
|
907 |
case CurAmmoGear^.Kind of |
|
908 |
gtJetpack: begin |
|
909 |
DrawSprite(sprJetpack, sx-32, sy-32, 0); |
|
910 |
if cWaterLine > hwRound(Gear^.Y) + Gear^.Radius then |
|
911 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
912 |
if (CurAmmoGear^.MsgParam and gmUp) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
913 |
DrawSprite(sprJetpack, sx-32, sy-28, 1); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
914 |
if (CurAmmoGear^.MsgParam and gmLeft) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
915 |
DrawSprite(sprJetpack, sx-28, sy-28, 2); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
916 |
if (CurAmmoGear^.MsgParam and gmRight) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
917 |
DrawSprite(sprJetpack, sx-36, sy-28, 3) |
4388 | 918 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
919 |
if CurAmmoGear^.Tex <> nil then |
6999 | 920 |
DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex); |
4388 | 921 |
DrawAltWeapon(Gear, sx, sy) |
922 |
end; |
|
923 |
end; |
|
924 |
end |
|
925 |
end; |
|
926 |
||
927 |
with HH^ do |
|
928 |
begin |
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6328
diff
changeset
|
929 |
if ((Gear^.State and (not gstWinner)) = 0) |
4388 | 930 |
or ((Gear^.State = gstWait) and (Gear^.dY.QWordValue = 0)) |
931 |
or (bShowFinger and ((Gear^.State and gstHHDriven) <> 0)) then |
|
932 |
begin |
|
933 |
t:= sy - cHHRadius - 9; |
|
934 |
if (cTagsMask and htTransparent) <> 0 then |
|
935 |
Tint($FF, $FF, $FF, $80); |
|
936 |
if ((cTagsMask and htHealth) <> 0) then |
|
937 |
begin |
|
938 |
dec(t, HealthTagTex^.h + 2); |
|
6999 | 939 |
DrawTextureCentered(ox, t, HealthTagTex) |
4388 | 940 |
end; |
941 |
if (cTagsMask and htName) <> 0 then |
|
942 |
begin |
|
943 |
dec(t, NameTagTex^.h + 2); |
|
6999 | 944 |
DrawTextureCentered(ox, t, NameTagTex) |
4388 | 945 |
end; |
946 |
if (cTagsMask and htTeamName) <> 0 then |
|
947 |
begin |
|
948 |
dec(t, Team^.NameTagTex^.h + 2); |
|
6999 | 949 |
DrawTextureCentered(ox, t, Team^.NameTagTex) |
4388 | 950 |
end; |
951 |
if (cTagsMask and htTransparent) <> 0 then |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
952 |
untint |
4388 | 953 |
end; |
954 |
if (Gear^.State and gstHHDriven) <> 0 then // Current hedgehog |
|
955 |
begin |
|
4394 | 956 |
if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtResurrector) then |
6999 | 957 |
DrawTextureCentered(ox, sy - cHHRadius - 7 - HealthTagTex^.h, HealthTagTex); |
4394 | 958 |
|
4388 | 959 |
if bShowFinger and ((Gear^.State and gstHHDriven) <> 0) then |
10000
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
960 |
begin |
10001
ec523563826e
disallow currenthh arrow to go offscreen, always point in direction of the hog - this should make the life of new players easier
sheepluva
parents:
10000
diff
changeset
|
961 |
ty := oy - 32; |
10000
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
962 |
// move finger higher up if tags are above hog |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
963 |
if (cTagsMask and htTeamName) <> 0 then |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
964 |
ty := ty - Team^.NameTagTex^.h - 2; |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
965 |
if (cTagsMask and htName) <> 0 then |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
966 |
ty := ty - NameTagTex^.h - 2; |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
967 |
if (cTagsMask and htHealth) <> 0 then |
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
968 |
ty := ty - HealthTagTex^.h - 2; |
10001
ec523563826e
disallow currenthh arrow to go offscreen, always point in direction of the hog - this should make the life of new players easier
sheepluva
parents:
10000
diff
changeset
|
969 |
tx := ox; |
10312 | 970 |
|
971 |
// don't go offscreen |
|
972 |
//tx := round(max(((-cScreenWidth + 16) / cScaleFactor) + SpritesData[sprFinger].Width div 2, min(((cScreenWidth - 16) / cScaleFactor) - SpritesData[sprFinger].Width div 2, tx))); |
|
973 |
//ty := round(max(cScreenHeight div 2 - ((cScreenHeight - 16) / cScaleFactor) + SpritesData[sprFinger].Height div 2, min(cScreenHeight div 2 - ((-cScreenHeight + SpritesData[sprFinger].Height) / (cScaleFactor)) - SpritesData[sprFinger].Width div 2 - 96, ty))); |
|
974 |
t:= 32;//trunc((SpritesData[sprFinger].Width + t) / cScaleFactor); |
|
975 |
tx := min(max(tx, ViewLeftX + t), ViewRightX - t); |
|
976 |
t:= 32;//trunc((SpritesData[sprFinger].Height + t) / cScaleFactor); |
|
977 |
ty := min(ty, ViewBottomY - 96); |
|
978 |
// don't overlap with HH or HH tags |
|
10313 | 979 |
if ty < ViewTopY + t then |
980 |
begin |
|
981 |
if abs(tx - ox) < abs(ty - oy) then |
|
982 |
ty:= max(ViewTopY + t, oy + t) |
|
983 |
else |
|
984 |
ty:= max(ViewTopY + t, ty); |
|
985 |
end; |
|
10080 | 986 |
|
10082 | 987 |
dAngle := DxDy2Angle(int2hwfloat(ty - oy), int2hwfloat(tx - ox)) + 90; |
10080 | 988 |
|
10312 | 989 |
DrawSpriteRotatedF(sprFinger, tx, ty, RealTicks div 32 mod 16, 1, dAngle); |
10000
d657b6656c19
position "finger"/pointer over current hog above tags
sheepluva
parents:
9998
diff
changeset
|
990 |
end; |
4388 | 991 |
|
10001
ec523563826e
disallow currenthh arrow to go offscreen, always point in direction of the hog - this should make the life of new players easier
sheepluva
parents:
10000
diff
changeset
|
992 |
|
4388 | 993 |
if (Gear^.State and gstDrowning) = 0 then |
994 |
if (Gear^.State and gstHHThinking) <> 0 then |
|
995 |
DrawSprite(sprQuestion, ox - 10, oy - cHHRadius - 34, (RealTicks shr 9) mod 8) |
|
996 |
end |
|
997 |
end; |
|
998 |
||
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
6999
diff
changeset
|
999 |
if HH^.Effects[hePoisoned] <> 0 then |
4388 | 1000 |
begin |
1001 |
Tint($00, $FF, $40, $80); |
|
10142 | 1002 |
DrawTextureRotatedF(SpritesData[sprSmokeWhite].texture, 1.5, 0, 0, sx, sy, 0, 1, 22, 22, 360 - (RealTicks shr 5) mod 360); |
4388 | 1003 |
end; |
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
6999
diff
changeset
|
1004 |
if HH^.Effects[heResurrected] <> 0 then |
4388 | 1005 |
begin |
1006 |
Tint($f5, $db, $35, $20); |
|
1007 |
DrawSprite(sprVampiric, sx - 24, sy - 24, 0); |
|
1008 |
end; |
|
1009 |
||
9685
7d925e82e572
Tweak trophyrace to work better w/ skip (probably, needs testing), drop Invulnerable in favour of effects - heInvulnerable is already in effects,
nemo
parents:
9667
diff
changeset
|
1010 |
if (Gear^.Hedgehog^.Effects[heInvulnerable] <> 0) then |
4388 | 1011 |
begin |
1012 |
Tint($FF, $FF, $FF, max($40, round($FF * abs(1 - ((RealTicks div 2 + Gear^.uid * 491) mod 1500) / 750)))); |
|
1013 |
DrawSprite(sprInvulnerable, sx - 24, sy - 24, 0); |
|
1014 |
end; |
|
8557 | 1015 |
|
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
1016 |
if HH^.Effects[heFrozen] < 150000 then |
8557 | 1017 |
begin |
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
1018 |
if HH^.Effects[heFrozen] < 150000 then |
8681
d0fc1dca739c
yeah. this was a bad idea. the minor difference in thaw speed vs last hog of team never unthawing.
nemo
parents:
8656
diff
changeset
|
1019 |
Tint($FF, $FF, $FF, min(255,127+HH^.Effects[heFrozen] div 800)); |
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
1020 |
|
8684 | 1021 |
iceOffset:= min(32, HH^.Effects[heFrozen] div 8); |
8560 | 1022 |
r.x := 128; |
8684 | 1023 |
r.y := 96 - iceOffset; |
1024 |
r.w := 32; |
|
8689 | 1025 |
r.h := iceOffset; |
10324
5d90d8ca9657
tweak code of DrawTextureFromRectDir a bit, removing issue with different x offset depending on dir. also removing the workaround wrt that issue in the frozen hog code
sheepluva
parents:
10313
diff
changeset
|
1026 |
DrawTextureFromRectDir(sx - 16 + sign*2, sy + 16 - iceoffset, r.w, r.h, @r, HHTexture, sign); |
8684 | 1027 |
|
8557 | 1028 |
|
8656
a8282143a8df
use opacity to indicate thawing. not totally happy w/ effect, but argument was made to indicate some progress towards thaw. drop "exit" since it really wasn't helpful, and not rendering tags, was more annoying than fun.
nemo
parents:
8628
diff
changeset
|
1029 |
if HH^.Effects[heFrozen] < 150000 then |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1030 |
untint; |
8557 | 1031 |
end; |
1032 |
||
1033 |
||
4388 | 1034 |
if cVampiric and |
1035 |
(CurrentHedgehog^.Gear <> nil) and |
|
1036 |
(CurrentHedgehog^.Gear = Gear) then |
|
1037 |
begin |
|
1038 |
Tint($FF, 0, 0, max($40, round($FF * abs(1 - (RealTicks mod 1500) / 750)))); |
|
1039 |
DrawSprite(sprVampiric, sx - 24, sy - 24, 0); |
|
1040 |
end; |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1041 |
untint |
4388 | 1042 |
end; |
1043 |
||
1044 |
||
1045 |
procedure RenderGear(Gear: PGear; x, y: LongInt); |
|
1046 |
var |
|
1047 |
HHGear: PGear; |
|
7093 | 1048 |
vg: PVisualGear; |
4388 | 1049 |
i: Longword; |
6788
88036f0e0a92
I think this is a little more efficient than dxdy, and easier to read. We call DxDy2 a lot, can any of those use Angle/DirAngle?
nemo
parents:
6700
diff
changeset
|
1050 |
aAngle: real; |
4388 | 1051 |
startX, endX, startY, endY: LongInt; |
1052 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1053 |
if Gear^.State and gstFrozen <> 0 then Tint($A0, $A0, $FF, $FF); |
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1054 |
//if Gear^.State and gstFrozen <> 0 then Tint(IceColor or $FF); |
5612
2638dec1b323
This really should have been a TPoint for consistency
nemo
parents:
5561
diff
changeset
|
1055 |
if Gear^.Target.X <> NoPointX then |
5507
1040c0946ef8
This should make bee/airstrikes play nicer with infinite attack mode
nemo
parents:
5472
diff
changeset
|
1056 |
if Gear^.AmmoType = amBee then |
6999 | 1057 |
DrawSpriteRotatedF(sprTargetBee, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360) |
8689 | 1058 |
else if Gear^.AmmoType = amIceGun then |
1059 |
//DrawSprite(sprSnowDust, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, (RealTicks shr 2) mod 8) |
|
7093 | 1060 |
//DrawTextureRotatedF(SpritesData[sprSnowDust].Texture, 1, 0, 0, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, (RealTicks shr 2) mod 8, 1, 22, 22, (RealTicks shr 3) mod 360) |
1061 |
DrawTextureRotatedF(SpritesData[sprSnowDust].Texture, 1/(1+(RealTicks shr 8) mod 5), 0, 0, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, (RealTicks shr 2) mod 8, 1, 22, 22, (RealTicks shr 3) mod 360) |
|
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
6999
diff
changeset
|
1062 |
else |
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
6999
diff
changeset
|
1063 |
DrawSpriteRotatedF(sprTargetP, Gear^.Target.X + WorldDx, Gear^.Target.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360); |
5507
1040c0946ef8
This should make bee/airstrikes play nicer with infinite attack mode
nemo
parents:
5472
diff
changeset
|
1064 |
|
4388 | 1065 |
case Gear^.Kind of |
6999 | 1066 |
gtGrenade: DrawSpriteRotated(sprBomb, x, y, 0, Gear^.DirAngle); |
1067 |
gtSnowball: DrawSpriteRotated(sprSnowball, x, y, 0, Gear^.DirAngle); |
|
1068 |
gtGasBomb: DrawSpriteRotated(sprCheese, x, y, 0, Gear^.DirAngle); |
|
8689 | 1069 |
|
5871
09daa06191d7
Since we are tweaking molotov. make the flame flickery and add a drowning frame
nemo
parents:
5787
diff
changeset
|
1070 |
gtMolotov: if (Gear^.State and gstDrowning) = 0 then |
6999 | 1071 |
DrawSpriteRotatedF(sprMolotov, x, y, (RealTicks div 125) mod 8, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX)) |
5871
09daa06191d7
Since we are tweaking molotov. make the flame flickery and add a drowning frame
nemo
parents:
5787
diff
changeset
|
1072 |
else DrawSprite(sprMolotov, x, y, 8); |
4388 | 1073 |
|
1074 |
gtRCPlane: begin |
|
6788
88036f0e0a92
I think this is a little more efficient than dxdy, and easier to read. We call DxDy2 a lot, can any of those use Angle/DirAngle?
nemo
parents:
6700
diff
changeset
|
1075 |
aangle:= Gear^.Angle * 360 / 4096; |
88036f0e0a92
I think this is a little more efficient than dxdy, and easier to read. We call DxDy2 a lot, can any of those use Angle/DirAngle?
nemo
parents:
6700
diff
changeset
|
1076 |
if Gear^.Tag < 0 then aangle:= 360-aangle; |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1077 |
Tint(Gear^.Tint); |
6999 | 1078 |
DrawSpriteRotatedF(sprPlane, x, y, 0, Gear^.Tag, aangle - 90); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1079 |
untint; |
6999 | 1080 |
DrawSpriteRotatedF(sprPlane, x, y, 1, Gear^.Tag, aangle - 90) |
4388 | 1081 |
end; |
6999 | 1082 |
gtBall: DrawSpriteRotatedF(sprBalls, x, y, Gear^.Tag,0, Gear^.DirAngle); |
4388 | 1083 |
|
1084 |
gtPortal: if ((Gear^.Tag and 1) = 0) // still moving? |
|
7272
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7168
diff
changeset
|
1085 |
or (Gear^.LinkedGear = nil) or (Gear^.LinkedGear^.LinkedGear <> Gear) // not linked&backlinked? |
71df899c4163
Second part of the change. Make collision check use the new mask bit.
nemo
parents:
7168
diff
changeset
|
1086 |
or ((Gear^.LinkedGear^.Tag and 1) = 0) then // linked portal still moving? |
6999 | 1087 |
DrawSpriteRotatedF(sprPortal, x, y, Gear^.Tag, hwSign(Gear^.dX), Gear^.DirAngle) |
1088 |
else DrawSpriteRotatedF(sprPortal, x, y, 4 + Gear^.Tag div 2, hwSign(Gear^.dX), Gear^.DirAngle); |
|
4388 | 1089 |
|
1090 |
gtDrill: if (Gear^.State and gsttmpFlag) <> 0 then |
|
6999 | 1091 |
DrawSpriteRotated(sprAirDrill, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)) |
4388 | 1092 |
else |
6999 | 1093 |
DrawSpriteRotated(sprDrill, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 1094 |
|
1095 |
gtHedgehog: DrawHH(Gear, x, y); |
|
1096 |
||
6999 | 1097 |
gtShell: DrawSpriteRotated(sprBazookaShell, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 1098 |
|
1099 |
gtGrave: begin |
|
1100 |
DrawTextureF(Gear^.Hedgehog^.Team^.GraveTex, 1, x, y, (GameTicks shr 7+Gear^.uid) and 7, 1, 32, 32); |
|
1101 |
if Gear^.Health > 0 then |
|
1102 |
begin |
|
1103 |
//Tint($33, $33, $FF, max($40, round($FF * abs(1 - (GameTicks mod (6000 div Gear^.Health)) / 750)))); |
|
1104 |
Tint($f5, $db, $35, max($40, round($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health))))); |
|
1105 |
//Tint($FF, $FF, $FF, max($40, round($FF * abs(1 - (RealTicks mod 1500) / 750)))); |
|
1106 |
DrawSprite(sprVampiric, x - 24, y - 24, 0); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1107 |
untint |
4388 | 1108 |
end |
1109 |
end; |
|
6999 | 1110 |
gtBee: DrawSpriteRotatedF(sprBee, x, y, (GameTicks shr 5) mod 2, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 1111 |
gtPickHammer: DrawSprite(sprPHammer, x - 16, y - 50 + LongInt(((GameTicks shr 5) and 1) * 2), 0); |
1112 |
gtRope: DrawRope(Gear); |
|
8689 | 1113 |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1114 |
gtMine: begin |
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1115 |
if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then |
6999 | 1116 |
DrawSpriteRotated(sprMineOff, x, y, 0, Gear^.DirAngle) |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1117 |
else if Gear^.Health <> 0 then |
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1118 |
DrawSpriteRotated(sprMineOn, x, y, 0, Gear^.DirAngle) |
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1119 |
else DrawSpriteRotated(sprMineDead, x, y, 0, Gear^.DirAngle); |
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1120 |
end; |
8689 | 1121 |
|
4388 | 1122 |
gtSMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then |
6999 | 1123 |
DrawSpriteRotated(sprSMineOff, x, y, 0, Gear^.DirAngle) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1124 |
else if Gear^.Health <> 0 then |
6999 | 1125 |
DrawSpriteRotated(sprSMineOn, x, y, 0, Gear^.DirAngle) |
1126 |
else DrawSpriteRotated(sprMineDead, x, y, 0, Gear^.DirAngle); |
|
7730
2013733f9ca9
A bit more on the knife. Also add missing files to CMakeLists
nemo
parents:
7721
diff
changeset
|
1127 |
gtKnife: DrawSpriteRotatedF(sprKnife, x, y, 0, hwSign(Gear^.dX), Gear^.DirAngle); |
8689 | 1128 |
|
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7165
diff
changeset
|
1129 |
gtCase: begin |
7276 | 1130 |
if Gear^.Timer > 1000 then |
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5197
diff
changeset
|
1131 |
begin |
7276 | 1132 |
if ((Gear^.Pos and posCaseAmmo) <> 0) then |
1133 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1134 |
if Gear^.State and gstFrozen <> 0 then |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1135 |
DrawSprite(sprCase, x - 24, y - 28, 0) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1136 |
else |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1137 |
begin |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1138 |
i:= (GameTicks shr 6) mod 64; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1139 |
if i > 18 then i:= 0; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1140 |
DrawSprite(sprCase, x - 24, y - 24, i) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1141 |
end |
7276 | 1142 |
end |
1143 |
else if ((Gear^.Pos and posCaseHealth) <> 0) then |
|
1144 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1145 |
if Gear^.State and gstFrozen <> 0 then |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1146 |
DrawSprite(sprFAid, x - 24, y - 28, 0) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1147 |
else |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1148 |
begin |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1149 |
i:= ((GameTicks shr 6) + 38) mod 64; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1150 |
if i > 13 then i:= 0; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1151 |
DrawSprite(sprFAid, x - 24, y - 24, i) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1152 |
end |
7276 | 1153 |
end |
1154 |
else if ((Gear^.Pos and posCaseUtility) <> 0) then |
|
1155 |
begin |
|
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1156 |
if Gear^.State and gstFrozen <> 0 then |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1157 |
DrawSprite(sprUtility, x - 24, y - 28, 0) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1158 |
else |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1159 |
begin |
9044
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1160 |
i:= (GameTicks shr 6) mod 70; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1161 |
if i > 23 then i:= 0; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1162 |
i:= i mod 12; |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1163 |
DrawSprite(sprUtility, x - 24, y - 24, i) |
8a829987d514
as long as a generic placeholder tint is in place. can't just exit
nemo
parents:
9041
diff
changeset
|
1164 |
end |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1165 |
end |
7276 | 1166 |
end; |
7337
c224cd2d32f3
Allow script to set number of ammo in a crate. untested.
nemo
parents:
7276
diff
changeset
|
1167 |
if Gear^.Timer < 1833 then |
5313
5e18eaef65d0
now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values
Henek
parents:
5197
diff
changeset
|
1168 |
begin |
10562 | 1169 |
DrawTextureRotatedF(SpritesData[sprPortal].texture, MinD(abs(1.25 - (Gear^.Timer mod 1333) / 400), 1.25), 0, 0, |
7721 | 1170 |
x, LongInt(Gear^.Angle) + WorldDy - 16, 4 + Gear^.Tag, 1, 32, 32, 270); |
7276 | 1171 |
end |
7168
8defaabce92e
warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein)
nemo
parents:
7165
diff
changeset
|
1172 |
end; |
4388 | 1173 |
gtExplosives: begin |
1174 |
if ((Gear^.State and gstDrowning) <> 0) then |
|
1175 |
DrawSprite(sprExplosivesRoll, x - 24, y - 24, 0) |
|
1176 |
else if Gear^.State and gstAnimation = 0 then |
|
1177 |
begin |
|
1178 |
i:= (GameTicks shr 6 + Gear^.uid*3) mod 64; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1179 |
if i > 18 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1180 |
i:= 0; |
4388 | 1181 |
DrawSprite(sprExplosives, x - 24, y - 24, i) |
1182 |
end |
|
1183 |
else if Gear^.State and gsttmpFlag = 0 then |
|
6999 | 1184 |
DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 0, 0, Gear^.DirAngle) |
4388 | 1185 |
else |
9041
aefe46d64dd9
Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives
nemo
parents:
8854
diff
changeset
|
1186 |
DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 1, 0, Gear^.DirAngle) |
4388 | 1187 |
end; |
6986
409dd3851309
add support for default pascal mode by removing default arguments value (maybe this also helps the parser)
koda
parents:
6982
diff
changeset
|
1188 |
gtDynamite: DrawSprite(sprDynamite, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1); |
6999 | 1189 |
gtClusterBomb: DrawSpriteRotated(sprClusterBomb, x, y, 0, Gear^.DirAngle); |
4388 | 1190 |
gtCluster: DrawSprite(sprClusterParticle, x - 8, y - 8, 0); |
6324 | 1191 |
gtFlame: if Gear^.Tag and 1 = 0 then |
1192 |
DrawTextureF(SpritesData[sprFlame].Texture, 2 / (Gear^.Tag mod 3 + 2), x, y, (GameTicks shr 7 + LongWord(Gear^.Tag)) mod 8, 1, 16, 16) |
|
1193 |
else DrawTextureF(SpritesData[sprFlame].Texture, 2 / (Gear^.Tag mod 3 + 2), x, y, (GameTicks shr 7 + LongWord(Gear^.Tag)) mod 8, -1, 16, 16); |
|
4388 | 1194 |
gtParachute: begin |
1195 |
DrawSprite(sprParachute, x - 24, y - 48, 0); |
|
1196 |
DrawAltWeapon(Gear, x + 1, y - 3) |
|
1197 |
end; |
|
6308 | 1198 |
gtAirAttack: begin |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1199 |
Tint(Gear^.Tint); |
6999 | 1200 |
DrawSpriteRotatedF(sprAirplane, x, y, 0, Gear^.Tag, 0); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1201 |
untint; |
6999 | 1202 |
DrawSpriteRotatedF(sprAirplane, x, y, 1, Gear^.Tag, 0); |
6308 | 1203 |
end; |
6999 | 1204 |
gtAirBomb: DrawSpriteRotated(sprAirBomb, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 1205 |
gtTeleport: begin |
1206 |
HHGear:= Gear^.Hedgehog^.Gear; |
|
10547
cc439790ebae
fix for Issue 828: Manual placement animation is drawn twice
sheepluva
parents:
10528
diff
changeset
|
1207 |
if ((Gear^.State and gstAnimation) <> 0) then |
6999 | 1208 |
DrawSpriteRotatedF(sprTeleport, x + 1, y - 3, Gear^.Pos, hwSign(Gear^.dX), 0); |
1209 |
DrawSpriteRotatedF(sprTeleport, hwRound(HHGear^.X) + 1 + WorldDx, hwRound(HHGear^.Y) - 3 + WorldDy, 11 - Gear^.Pos, hwSign(HHGear^.dX), 0); |
|
4388 | 1210 |
end; |
1211 |
gtSwitcher: DrawSprite(sprSwitch, x - 16, y - 56, (GameTicks shr 6) mod 12); |
|
1212 |
gtTarget: begin |
|
1213 |
Tint($FF, $FF, $FF, round($FF * Gear^.Timer / 1000)); |
|
1214 |
DrawSprite(sprTarget, x - 16, y - 16, 0); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1215 |
untint; |
4388 | 1216 |
end; |
6999 | 1217 |
gtMortar: DrawSpriteRotated(sprMortar, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
4388 | 1218 |
gtCake: if Gear^.Pos = 6 then |
6999 | 1219 |
DrawSpriteRotatedF(sprCakeWalk, x, y, (GameTicks div 40) mod 6, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90) |
4388 | 1220 |
else |
6999 | 1221 |
DrawSpriteRotatedF(sprCakeDown, x, y, 5 - Gear^.Pos, hwSign(Gear^.dX), Gear^.DirAngle * hwSign(Gear^.dX) + 90); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1222 |
gtSeduction: if Gear^.Pos >= 14 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1223 |
DrawSprite(sprSeduction, x - 16, y - 16, 0); |
8689 | 1224 |
|
6999 | 1225 |
gtWatermelon: DrawSpriteRotatedF(sprWatermelon, x, y, 0, 0, Gear^.DirAngle); |
1226 |
gtMelonPiece: DrawSpriteRotatedF(sprWatermelon, x, y, 1, 0, Gear^.DirAngle); |
|
1227 |
gtHellishBomb: DrawSpriteRotated(sprHellishBomb, x, y, 0, Gear^.DirAngle); |
|
4388 | 1228 |
gtBirdy: begin |
1229 |
if Gear^.State and gstAnimation = gstAnimation then |
|
1230 |
begin |
|
1231 |
if Gear^.State and gstTmpFlag = 0 then // Appearing |
|
1232 |
begin |
|
1233 |
endX:= x - WorldDx; |
|
1234 |
endY:= y - WorldDy; |
|
1235 |
if Gear^.Tag < 0 then |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
1236 |
startX:= max(max(LAND_WIDTH,4096) + 1024, endX + 2048) |
4388 | 1237 |
else |
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
1238 |
startX:= max(-max(LAND_WIDTH,4096) - 1024, endX - 2048); |
8414
c1ac0b64315e
Start piano higher (piano on maps that matched land_height was really weird before). Experiment w/ trying to make birdy shrink into distance to avoid odd birdy vanishes if tracking it.
nemo
parents:
8370
diff
changeset
|
1239 |
startY:= endY - 1024; |
c1ac0b64315e
Start piano higher (piano on maps that matched land_height was really weird before). Experiment w/ trying to make birdy shrink into distance to avoid odd birdy vanishes if tracking it.
nemo
parents:
8370
diff
changeset
|
1240 |
DrawTextureF(SpritesData[sprBirdy].Texture, min(Gear^.Timer/750,1), startX + WorldDx + LongInt(round((endX - startX) * (-power(2, -10 * LongInt(Gear^.Timer)/2000) + 1))), startY + WorldDy + LongInt(round((endY - startY) * sqrt(1 - power((LongInt(Gear^.Timer)/2000)-1, 2)))), ((Gear^.Pos shr 6) or (RealTicks shr 8)) mod 2, Gear^.Tag, 75, 75); |
4388 | 1241 |
end |
1242 |
else // Disappearing |
|
1243 |
begin |
|
1244 |
startX:= x - WorldDx; |
|
1245 |
startY:= y - WorldDy; |
|
1246 |
if Gear^.Tag > 0 then |
|
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
1247 |
endX:= max(max(LAND_WIDTH,4096) + 1024, startX + 2048) |
4388 | 1248 |
else |
7829
c1dc7839d7b9
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
nemo
parents:
7730
diff
changeset
|
1249 |
endX:= max(-max(LAND_WIDTH,4096) - 1024, startX - 2048); |
8414
c1ac0b64315e
Start piano higher (piano on maps that matched land_height was really weird before). Experiment w/ trying to make birdy shrink into distance to avoid odd birdy vanishes if tracking it.
nemo
parents:
8370
diff
changeset
|
1250 |
endY:= startY + 1024; |
c1ac0b64315e
Start piano higher (piano on maps that matched land_height was really weird before). Experiment w/ trying to make birdy shrink into distance to avoid odd birdy vanishes if tracking it.
nemo
parents:
8370
diff
changeset
|
1251 |
DrawTextureF(SpritesData[sprBirdy].Texture, min((2000-Gear^.Timer)/750,1), startX + WorldDx + LongInt(round((endX - startX) * power(2, 10 * (LongInt(Gear^.Timer)/2000 - 1)))) + hwRound(Gear^.dX * Gear^.Timer), startY + WorldDy + LongInt(round((endY - startY) * cos(LongInt(Gear^.Timer)/2000 * (Pi/2)) - (endY - startY))) + hwRound(Gear^.dY * Gear^.Timer), ((Gear^.Pos shr 6) or (RealTicks shr 8)) mod 2, Gear^.Tag, 75, 75); |
4388 | 1252 |
end; |
1253 |
end |
|
1254 |
else |
|
5528
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1255 |
begin |
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1256 |
if Gear^.Health < 250 then |
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1257 |
DrawTextureF(SpritesData[sprBirdy].Texture, 1, x, y, ((Gear^.Pos shr 6) or (RealTicks shr 7)) mod 2, Gear^.Tag, 75, 75) |
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1258 |
else |
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1259 |
DrawTextureF(SpritesData[sprBirdy].Texture, 1, x, y, ((Gear^.Pos shr 6) or (RealTicks shr 8)) mod 2, Gear^.Tag, 75, 75); |
c539e5c81870
slight visual tweak. birdy's wings beat faster if he's just about tired out
nemo
parents:
5526
diff
changeset
|
1260 |
end; |
4388 | 1261 |
end; |
6999 | 1262 |
gtEgg: DrawTextureRotatedF(SpritesData[sprEgg].Texture, 1, 0, 0, x, y, 0, 1, 16, 16, Gear^.DirAngle); |
4388 | 1263 |
gtPiano: begin |
1264 |
if (Gear^.State and gstDrowning) = 0 then |
|
1265 |
begin |
|
1266 |
Tint($FF, $FF, $FF, $10); |
|
1267 |
for i:= 8 downto 1 do |
|
6322
b310f0bc8dde
If I'm going to be arbitrary about it, might as well go for the more minimal arbitrariness
nemo
parents:
6318
diff
changeset
|
1268 |
DrawTextureF(SpritesData[sprPiano].Texture, 1, x, y - hwRound(Gear^.dY * 4 * i), 0, 1, 128, 128); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1269 |
untint |
4388 | 1270 |
end; |
6322
b310f0bc8dde
If I'm going to be arbitrary about it, might as well go for the more minimal arbitrariness
nemo
parents:
6318
diff
changeset
|
1271 |
DrawTextureF(SpritesData[sprPiano].Texture, 1, x, y, 0, 1, 128, 128); |
4388 | 1272 |
end; |
1273 |
gtPoisonCloud: begin |
|
1274 |
if Gear^.Timer < 1020 then |
|
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1275 |
Tint(Gear^.Tint and $FFFFFF00 or Gear^.Timer div 8) |
4388 | 1276 |
else if Gear^.Timer > 3980 then |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1277 |
Tint(Gear^.Tint and $FFFFFF00 or (5000 - Gear^.Timer) div 8) |
4388 | 1278 |
else |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1279 |
Tint(Gear^.Tint); |
10142 | 1280 |
DrawTextureRotatedF(SpritesData[sprSmokeWhite].texture, 3, 0, 0, x, y, 0, 1, 22, 22, (RealTicks shr 4 + Gear^.UID * 100) mod 360); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1281 |
untint |
4388 | 1282 |
end; |
1283 |
gtResurrector: begin |
|
6999 | 1284 |
DrawSpriteRotated(sprCross, x, y, 0, 0); |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1285 |
Tint(Gear^.Tint and $FFFFFF00 or max($00, round($C0 * abs(1 - (GameTicks mod 6000) / 3000)))); |
4388 | 1286 |
DrawTexture(x - 108, y - 108, SpritesData[sprVampiric].Texture, 4.5); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1287 |
untint; |
4388 | 1288 |
end; |
6999 | 1289 |
gtNapalmBomb: DrawSpriteRotated(sprNapalmBomb, x, y, 0, DxDy2Angle(Gear^.dY, Gear^.dX)); |
5519 | 1290 |
gtFlake: if Gear^.State and (gstDrowning or gstTmpFlag) <> 0 then |
5024 | 1291 |
begin |
10032
db65298717da
This adds idle hog tinting. Active hog tinting still needed.
nemo
parents:
10001
diff
changeset
|
1292 |
Tint(Gear^.Tint); |
5025
ac1691d35cf2
Land sprayer tweaks, make land spray and mudball not end turn
nemo
parents:
5024
diff
changeset
|
1293 |
// Needs a nicer white texture to tint |
6999 | 1294 |
DrawTextureRotatedF(SpritesData[sprSnowDust].Texture, 1, 0, 0, x, y, 0, 1, 8, 8, Gear^.DirAngle); |
1295 |
//DrawSpriteRotated(sprSnowDust, x, y, 0, Gear^.DirAngle); |
|
5472 | 1296 |
//DrawTexture(x, y, SpritesData[sprVampiric].Texture, 0.1); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1297 |
untint; |
5024 | 1298 |
end |
5787 | 1299 |
else //if not isInLag then |
5024 | 1300 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1301 |
if isInLag and (Gear^.FlightTime < 256) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1302 |
inc(Gear^.FlightTime, 8) |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7978
diff
changeset
|
1303 |
else if (not isInLag) and (Gear^.FlightTime > 0) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1304 |
dec(Gear^.FlightTime, 8); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1305 |
if Gear^.FlightTime > 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1306 |
Tint($FF, $FF, $FF, $FF-min(255,Gear^.FlightTime)); |
4617 | 1307 |
if vobVelocity = 0 then |
5024 | 1308 |
DrawSprite(sprFlake, x, y, Gear^.Timer) |
1309 |
else |
|
6999 | 1310 |
DrawSpriteRotatedF(sprFlake, x, y, Gear^.Timer, 1, Gear^.DirAngle); |
5024 | 1311 |
//DrawSprite(sprFlake, x-SpritesData[sprFlake].Width div 2, y-SpritesData[sprFlake].Height div 2, Gear^.Timer) |
6999 | 1312 |
//DrawSpriteRotatedF(sprFlake, x-SpritesData[sprFlake].Width div 2, y-SpritesData[sprFlake].Height div 2, Gear^.Timer, 1, Gear^.DirAngle); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1313 |
if Gear^.FlightTime > 0 then |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1314 |
untint; |
5024 | 1315 |
end; |
8161 | 1316 |
//gtStructure: DrawSprite(sprTarget, x - 16, y - 16, 0); |
5706 | 1317 |
gtTardis: if Gear^.Pos <> 4 then |
1318 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1319 |
if Gear^.Pos = 2 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1320 |
Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or $FF) |
8689 | 1321 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1322 |
Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000))))); |
5706 | 1323 |
DrawSprite(sprTardis, x-24, y-63,0); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1324 |
if Gear^.Pos = 2 then |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1325 |
untint |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1326 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1327 |
Tint($FF,$FF,$FF,max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000))))); |
5740 | 1328 |
DrawSprite(sprTardis, x-24, y-63,1); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1329 |
if Gear^.Pos <> 2 then |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1330 |
untint |
5740 | 1331 |
(* |
5728 | 1332 |
Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * abs(1 - (RealTicks mod 500) / 250)))); |
1333 |
DrawTexture(x-6, y-70, SpritesData[sprVampiric].Texture, 0.25); |
|
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1334 |
untint |
5740 | 1335 |
*) |
5706 | 1336 |
end; |
7093 | 1337 |
gtIceGun: begin |
1338 |
HHGear := Gear^.Hedgehog^.Gear; |
|
1339 |
if HHGear <> nil then |
|
1340 |
begin |
|
7721 | 1341 |
i:= hwRound(hwSqr(Gear^.X - HHGear^.X) + hwSqr(Gear^.Y - HHGear^.Y)); |
1342 |
if RealTicks mod max(1,50 - (round(sqrt(i)) div 4)) = 0 then // experiment in "intensifying" might not get used |
|
7093 | 1343 |
begin |
1344 |
vg:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1); |
|
1345 |
if vg <> nil then |
|
1346 |
begin |
|
7721 | 1347 |
i:= random(100) + 155; |
1348 |
vg^.Tint:= i shl 24 or i shl 16 or $FF shl 8 or Longword(random(200) + 55); |
|
7093 | 1349 |
vg^.Angle:= random(360); |
7721 | 1350 |
vg^.dx:= 0.001 * random(80); |
1351 |
vg^.dy:= 0.001 * random(80) |
|
7093 | 1352 |
end |
1353 |
end; |
|
1354 |
if RealTicks mod 2 = 0 then |
|
1355 |
begin |
|
1356 |
i:= random(100)+100; |
|
1357 |
if Gear^.Target.X <> NoPointX then |
|
8628 | 1358 |
begin |
1359 |
DrawLine(Gear^.Target.X, Gear^.Target.Y, hwRound(HHGear^.X), hwRound(HHGear^.Y), 4.0, i, i, $FF, $40); |
|
1360 |
end |
|
1361 |
else |
|
1362 |
begin |
|
8689 | 1363 |
DrawLine(hwRound(HHGear^.X), hwRound(HHGear^.Y), hwRound(Gear^.X), hwRound(Gear^.Y), 4.0, i, i, $FF, $40); |
8628 | 1364 |
end; |
7093 | 1365 |
end |
1366 |
end |
|
7389
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7339
diff
changeset
|
1367 |
end; |
15c3fb4882df
Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder.
nemo
parents:
7339
diff
changeset
|
1368 |
gtGenericFaller: DrawCircle(x, y, 3, 3, $FF, $00, $00, $FF); // debug |
4388 | 1369 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6508
diff
changeset
|
1370 |
if Gear^.RenderTimer and (Gear^.Tex <> nil) then |
6999 | 1371 |
DrawTextureCentered(x + 8, y + 8, Gear^.Tex); |
9666
8dcb25112d96
- Bring back white dot in the center of crosshair. Crosshair is blurred now!
unc0rr
parents:
9655
diff
changeset
|
1372 |
if Gear^.State and gstFrozen <> 0 then untint |
4388 | 1373 |
end; |
1374 |
||
1375 |
end. |