author | unc0rr |
Fri, 16 Jan 2009 15:36:16 +0000 | |
changeset 1682 | f8c4af3a2b54 |
parent 1669 | b709e061577e |
child 1689 | 3d0eee01f734 |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
883 | 3 |
* Copyright (c) 2004-2008 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 5 |
* This program is free software; you can redistribute it and/or modify |
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
4 | 8 |
* |
183 | 9 |
* This program is distributed in the hope that it will be useful, |
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
4 | 13 |
* |
183 | 14 |
* You should have received a copy of the GNU General Public License |
15 |
* along with this program; if not, write to the Free Software |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
4 | 17 |
*) |
18 |
||
37 | 19 |
//////////////////////////////////////////////////////////////////////////////// |
783 | 20 |
procedure ChangeAmmo(Gear: PGear); |
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
21 |
var slot, i: Longword; |
783 | 22 |
begin |
23 |
slot:= Gear^.MsgParam; |
|
24 |
||
25 |
with PHedgehog(Gear^.Hedgehog)^ do |
|
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
26 |
begin |
928
b9064b48b001
Some preparation work for attacking from rope, parachute and etc.
unc0rr
parents:
927
diff
changeset
|
27 |
if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) |
b9064b48b001
Some preparation work for attacking from rope, parachute and etc.
unc0rr
parents:
927
diff
changeset
|
28 |
or (AttacksNum > 0) |
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
29 |
or ((Gear^.State and gstHHDriven) = 0) then exit; |
783 | 30 |
|
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
31 |
Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump or gm_Slot); |
783 | 32 |
|
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
33 |
if CurSlot = slot then |
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
34 |
begin |
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
35 |
i:= 0; |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
36 |
repeat |
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
37 |
inc(CurAmmo); |
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
38 |
if (CurAmmo > cMaxSlotAmmoIndex) then |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
39 |
begin |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
40 |
CurAmmo:= 0; |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
41 |
inc(i); |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
42 |
TryDo(i < 2, 'Engine bug: no ammo in current slot', true) |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
43 |
end; |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
44 |
until (Ammo^[slot, CurAmmo].Count > 0) and (Team^.Clan^.TurnNumber > Ammoz[Ammo^[slot, CurAmmo].AmmoType].SkipTurns) |
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
45 |
end else |
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
46 |
begin |
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
47 |
i:= 0; |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
48 |
// check whether there's ammo in slot |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
49 |
while (i <= cMaxSlotAmmoIndex) |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
50 |
and ((Ammo^[slot, i].Count = 0) |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
51 |
or (Team^.Clan^.TurnNumber <= Ammoz[Ammo^[slot, i].AmmoType].SkipTurns)) do inc(i); |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
52 |
|
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
53 |
if i <= cMaxSlotAmmoIndex then |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
54 |
begin |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
55 |
CurSlot:= slot; |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
56 |
CurAmmo:= i |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
57 |
end |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
58 |
end |
927
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
59 |
end; |
2c1675344a6f
Remove AltSlot and AltAmmo fields of Hedgehog record, as they are not actually needed
unc0rr
parents:
926
diff
changeset
|
60 |
|
783 | 61 |
ApplyAmmoChanges(PHedgehog(Gear^.Hedgehog)^) |
62 |
end; |
|
63 |
||
64 |
procedure HHSetWeapon(Gear: PGear); |
|
65 |
var t: LongInt; |
|
66 |
weap: TAmmoType; |
|
67 |
begin |
|
68 |
weap:= TAmmoType(Gear^.MsgParam); |
|
941
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
69 |
|
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
70 |
if PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then exit; // weapon isn't activated yet |
b5222ddafe1f
- Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents:
931
diff
changeset
|
71 |
|
783 | 72 |
Gear^.MsgParam:= Ammoz[weap].Slot; |
73 |
||
74 |
t:= cMaxSlotAmmoIndex; |
|
75 |
||
76 |
Gear^.Message:= Gear^.Message and not gm_Weapon; |
|
77 |
||
78 |
with PHedgehog(Gear^.Hedgehog)^ do |
|
926
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
79 |
while (Ammo^[CurSlot, CurAmmo].AmmoType <> weap) and (t >= 0) do |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
80 |
begin |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
81 |
ChangeAmmo(Gear); |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
82 |
dec(t) |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
83 |
end |
783 | 84 |
end; |
85 |
||
926
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
86 |
procedure HHSetTimer(Gear: PGear); |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
87 |
begin |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
88 |
Gear^.Message:= Gear^.Message and not gm_Timer; |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
89 |
with PHedgehog(Gear^.Hedgehog)^ do |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
90 |
if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Timerable) <> 0 then |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
91 |
begin |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
92 |
Ammo^[CurSlot, CurAmmo].Timer:= 1000 * Gear^.MsgParam; |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
93 |
with CurrentTeam^ do |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
94 |
ApplyAmmoChanges(Hedgehogs[CurrHedgehog]); |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
95 |
end; |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
96 |
end; |
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
97 |
|
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
98 |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
99 |
procedure Attack(Gear: PGear); |
351 | 100 |
var xx, yy: hwFloat; |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
101 |
begin |
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
102 |
with Gear^, |
351 | 103 |
PHedgehog(Gear^.Hedgehog)^ do |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
104 |
begin |
95 | 105 |
if ((State and gstHHDriven) <> 0)and |
542 | 106 |
((State and (gstAttacked or gstHHChooseTarget)) = 0)and |
836 | 107 |
(((State and gstMoving) = 0) or ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_AttackInMove) <> 0))and |
108 |
((TargetPoint.X <> NoPointX) or ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NeedTarget) = 0)) then |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
109 |
begin |
95 | 110 |
State:= State or gstAttacking; |
111 |
if Power = cMaxPower then Message:= Message and not gm_Attack |
|
351 | 112 |
else if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Power) = 0 then Message:= Message and not gm_Attack |
95 | 113 |
else begin |
114 |
if Power = 0 then |
|
115 |
begin |
|
351 | 116 |
AttackBar:= CurrentTeam^.AttackBar; |
1669 | 117 |
PlaySound(sndThrowPowerUp, false, nil) |
95 | 118 |
end; |
119 |
inc(Power) |
|
120 |
end; |
|
121 |
if ((Message and gm_Attack) <> 0) then exit; |
|
351 | 122 |
|
123 |
if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Power) <> 0 then |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
124 |
begin |
282 | 125 |
StopSound(sndThrowPowerUp); |
1669 | 126 |
PlaySound(sndThrowRelease, false, nil); |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
127 |
end; |
519 | 128 |
xx:= SignAs(AngleSin(Angle), dX); |
900 | 129 |
yy:= -AngleCos(Angle); |
130 |
||
131 |
if ((Gear^.State and gstHHHJump) <> 0) then xx:= - xx; |
|
351 | 132 |
case Ammo^[CurSlot, CurAmmo].AmmoType of |
133 |
amGrenade: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtAmmo_Bomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer); |
|
134 |
amClusterBomb: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtClusterBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer); |
|
135 |
amBazooka: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtAmmo_Grenade, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); |
|
136 |
amUFO: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtUFO, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
137 |
amShotgun: begin |
1669 | 138 |
PlaySound(sndShotgunReload, false, nil); |
351 | 139 |
CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtShotgunShot, 0, xx * _0_5, yy * _0_5, 0); |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
140 |
end; |
498 | 141 |
amPickHammer: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + cHHRadius, gtPickHammer, 0, _0, _0, 0); |
866 | 142 |
amSkip: ParseCommand('/skip', true); |
351 | 143 |
amRope: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtRope, 0, xx, yy, 0); |
800 | 144 |
amMine: begin |
145 |
AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtMine, 0, SignAs(_0_02, dX), _0, 3000); |
|
1682 | 146 |
PlaySound(sndLaugh, false, CurrentTeam^.voicepack) |
800 | 147 |
end; |
876 | 148 |
amDEagle: CurAmmoGear:= AddGear(hwRound(X + xx * cHHRadius), hwRound(Y + yy * cHHRadius), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0); |
1112 | 149 |
amDynamite: begin |
150 |
AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtDynamite, 0, SignAs(_0_03, dX), _0, 5000); |
|
1682 | 151 |
PlaySound(sndLaugh, false, CurrentTeam^.voicepack) |
1112 | 152 |
end; |
979
edb8f208c1d9
Fix firepunch direction when attacking from high jump
unc0rr
parents:
958
diff
changeset
|
153 |
amFirePunch: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtFirePunch, 0, xx, _0, 0); |
925 | 154 |
amWhip: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtWhip, 0, SignAs(_1, dX), - _0_8, 0); |
854 | 155 |
amBaseballBat: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtShover, 0, xx * _0_5, yy * _0_5, 0); |
498 | 156 |
amParachute: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtParachute, 0, _0, _0, 0); |
157 |
amAirAttack: AddGear(Ammo^[CurSlot, CurAmmo].Pos, 0, gtAirAttack, 0, _0, _0, 0); |
|
158 |
amMineStrike: AddGear(Ammo^[CurSlot, CurAmmo].Pos, 0, gtAirAttack, 1, _0, _0, 0); |
|
159 |
amBlowTorch: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtBlowTorch, 0, SignAs(_0_5, dX), _0, 0); |
|
160 |
amGirder: CurAmmoGear:= AddGear(0, 0, gtGirder, Ammo^[CurSlot, CurAmmo].Pos, _0, _0, 0); |
|
520 | 161 |
amTeleport: CurAmmoGear:= AddGear(0, 0, gtTeleport, 0, _0, _0, 0); |
534 | 162 |
amSwitch: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtSwitcher, 0, _0, _0, 0); |
924 | 163 |
amMortar: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtMortar, 0, xx*cMaxPower/cPowerDivisor, yy*cMaxPower/cPowerDivisor, 0); |
984 | 164 |
amKamikaze: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtKamikaze, 0, xx * _0_5, yy * _0_5, 0); |
1112 | 165 |
amCake: begin |
166 |
CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 3, hwRound(Y), gtCake, 0, xx, _0, 0); |
|
1682 | 167 |
PlaySound(sndLaugh, false, CurrentTeam^.voicepack) |
1112 | 168 |
end; |
1286 | 169 |
amSeduction: CurAmmoGear:= AddGear(hwRound(X + xx * cHHRadius * 2), hwRound(Y + yy * cHHRadius * 2), gtSeduction, 0, xx * _0_4, yy * _0_4, 0); |
1261 | 170 |
amWatermelon: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtWatermelon, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, Ammo^[CurSlot, CurAmmo].Timer); |
1263 | 171 |
amHellishBomb: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtHellishBomb, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 5000); |
1507 | 172 |
amNapalm: AddGear(Ammo^[CurSlot, CurAmmo].Pos, 0, gtAirAttack, 2, _0, _0, 0); |
1573 | 173 |
amDrill: FollowGear:= AddGear(hwRound(X), hwRound(Y), gtDrill, 0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0); |
1601 | 174 |
amBallgun: CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtBallgun, 0, xx * _0_5, yy * _0_5, 0); |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
175 |
end; |
829 | 176 |
|
177 |
uStats.AmmoUsed(Ammo^[CurSlot, CurAmmo].AmmoType); |
|
178 |
||
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
179 |
Power:= 0; |
930 | 180 |
if (CurAmmoGear <> nil) |
181 |
and (((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_AltUse) = 0){check for dropping ammo from rope} then |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
182 |
begin |
930 | 183 |
CurAmmoGear^.Ammo:= @(Ammo^[CurSlot, CurAmmo]); |
82 | 184 |
Message:= Message or gm_Attack; |
351 | 185 |
CurAmmoGear^.Message:= Message |
82 | 186 |
end else begin |
351 | 187 |
if not CurrentTeam^.ExtDriven and |
188 |
((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Power) <> 0) then SendIPC('a'); |
|
82 | 189 |
AfterAttack |
190 |
end |
|
95 | 191 |
end else Message:= Message and not gm_Attack |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
192 |
end |
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
193 |
end; |
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
194 |
|
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
195 |
procedure AfterAttack; |
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
196 |
begin |
602 | 197 |
with CurrentHedgehog^.Gear^, |
1286 | 198 |
CurrentHedgehog^ do |
199 |
begin |
|
200 |
Inc(AttacksNum); |
|
201 |
State:= State and not gstAttacking; |
|
202 |
if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or |
|
203 |
((GameFlags and gfMultiWeapon) <> 0) then isInMultiShoot:= true |
|
204 |
else begin |
|
205 |
TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn; |
|
206 |
State:= State or gstAttacked; |
|
207 |
OnUsedAmmo(CurrentHedgehog^) |
|
208 |
end; |
|
209 |
AttackBar:= 0; |
|
210 |
end |
|
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
211 |
end; |
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
212 |
|
42 | 213 |
//////////////////////////////////////////////////////////////////////////////// |
863 | 214 |
procedure doStepHedgehogDead(Gear: PGear); |
868 | 215 |
const frametime = 200; |
216 |
timertime = frametime * 6; |
|
863 | 217 |
begin |
218 |
if Gear^.Timer > 1 then |
|
219 |
begin |
|
220 |
AllInactive:= false; |
|
868 | 221 |
dec(Gear^.Timer); |
222 |
if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos) |
|
863 | 223 |
end else |
224 |
if Gear^.Timer = 1 then |
|
225 |
begin |
|
226 |
Gear^.State:= Gear^.State or gstNoDamage; |
|
227 |
doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, EXPLAutoSound); |
|
228 |
AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtGrave, 0, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog; |
|
229 |
DeleteGear(Gear); |
|
230 |
SetAllToActive |
|
231 |
end else // Gear^.Timer = 0 |
|
232 |
begin |
|
233 |
AllInactive:= false; |
|
868 | 234 |
Gear^.Z:= cCurrHHZ; |
235 |
RemoveGearFromList(Gear); |
|
236 |
InsertGearToList(Gear); |
|
1669 | 237 |
PlaySound(sndByeBye, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack); |
868 | 238 |
Gear^.Pos:= 0; |
239 |
Gear^.Timer:= timertime |
|
863 | 240 |
end |
241 |
end; |
|
242 |
||
243 |
//////////////////////////////////////////////////////////////////////////////// |
|
42 | 244 |
procedure PickUp(HH, Gear: PGear); |
295 | 245 |
var s: shortstring; |
246 |
a: TAmmoType; |
|
42 | 247 |
begin |
351 | 248 |
Gear^.Message:= gm_Destroy; |
249 |
case Gear^.Pos of |
|
295 | 250 |
posCaseAmmo: begin |
351 | 251 |
a:= TAmmoType(Gear^.State); |
553
5478386d935f
- Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents:
549
diff
changeset
|
252 |
AddAmmo(PHedgehog(HH^.Hedgehog)^, a); |
1072 | 253 |
if (not (PHedgehog(HH^.Hedgehog)^.Team^.ExtDriven |
254 |
or (PHedgehog(HH^.Hedgehog)^.BotLevel > 0))) |
|
255 |
or (GameType = gmtDemo) then |
|
836 | 256 |
begin |
257 |
s:= trammo[Ammoz[a].NameId] + '(+' + IntToStr(Ammoz[a].NumberInCase) + ')'; |
|
258 |
AddCaption(s, PHedgehog(HH^.Hedgehog)^.Team^.Clan^.Color, capgrpAmmoinfo); |
|
259 |
end |
|
295 | 260 |
end; |
42 | 261 |
posCaseHealth: begin |
351 | 262 |
inc(HH^.Health, Gear^.Health); |
263 |
str(Gear^.Health, s); |
|
295 | 264 |
s:= '+' + s; |
549 | 265 |
AddCaption(s, PHedgehog(HH^.Hedgehog)^.Team^.Clan^.Color, capgrpAmmoinfo); |
351 | 266 |
RenderHealth(PHedgehog(HH^.Hedgehog)^); |
267 |
RecountTeamHealth(PHedgehog(HH^.Hedgehog)^.Team) |
|
42 | 268 |
end; |
435 | 269 |
end |
42 | 270 |
end; |
32
78bff13b11c0
With this patch the game doesn't crash when gaming by net
unc0rr
parents:
16
diff
changeset
|
271 |
|
4 | 272 |
const StepTicks: LongWord = 0; |
273 |
||
302 | 274 |
procedure HedgehogStep(Gear: PGear); |
371 | 275 |
var PrevdX: LongInt; |
302 | 276 |
begin |
542 | 277 |
if ((Gear^.State and (gstAttacking or gstMoving)) = 0) then |
4 | 278 |
begin |
408 | 279 |
if isCursorVisible then |
280 |
with PHedgehog(Gear^.Hedgehog)^ do |
|
281 |
with Ammo^[CurSlot, CurAmmo] do |
|
282 |
begin |
|
542 | 283 |
if (Gear^.Message and gm_Left ) <> 0 then |
408 | 284 |
Pos:= (Pos + Ammoz[AmmoType].PosCount - 1) mod Ammoz[AmmoType].PosCount |
285 |
else |
|
542 | 286 |
if (Gear^.Message and gm_Right ) <> 0 then |
408 | 287 |
Pos:= (Pos + 1) mod Ammoz[AmmoType].PosCount |
288 |
else exit; |
|
423 | 289 |
StepTicks:= 200; |
408 | 290 |
exit |
291 |
end; |
|
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
292 |
|
1033 | 293 |
if ((Gear^.Message and gm_Animate) <> 0) then |
294 |
begin |
|
295 |
Gear^.Message:= 0; |
|
296 |
Gear^.State:= Gear^.State or gstAnimation; |
|
297 |
Gear^.Tag:= Gear^.MsgParam; |
|
298 |
Gear^.Timer:= 0; |
|
299 |
Gear^.Pos:= 0 |
|
300 |
end; |
|
301 |
||
351 | 302 |
if ((Gear^.Message and gm_LJump ) <> 0) then |
4 | 303 |
begin |
542 | 304 |
Gear^.Message:= Gear^.Message and not gm_LJump; |
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
305 |
DeleteCI(Gear); |
68 | 306 |
if not TestCollisionYwithGear(Gear, -1) then |
498 | 307 |
if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _2 else |
308 |
if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - _1; |
|
351 | 309 |
if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) |
68 | 310 |
or TestCollisionYwithGear(Gear, -1)) then |
4 | 311 |
begin |
351 | 312 |
Gear^.dY:= -_0_15; |
498 | 313 |
Gear^.dX:= SignAs(_0_15, Gear^.dX); |
542 | 314 |
Gear^.State:= Gear^.State or gstMoving or gstHHJumping; |
1669 | 315 |
PlaySound(sndJump1, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack); |
4 | 316 |
exit |
317 |
end; |
|
318 |
end; |
|
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
319 |
|
351 | 320 |
if ((Gear^.Message and gm_HJump ) <> 0) then |
4 | 321 |
begin |
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
322 |
DeleteCI(Gear); |
542 | 323 |
Gear^.Message:= Gear^.Message and not gm_HJump; |
855
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
324 |
|
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
325 |
Gear^.dY:= -_0_2; |
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
326 |
SetLittle(Gear^.dX); |
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
327 |
Gear^.State:= Gear^.State or gstMoving or gstHHJumping; |
1669 | 328 |
PlaySound(sndJump3, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack); |
855
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
329 |
exit |
4 | 330 |
end; |
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
331 |
|
351 | 332 |
PrevdX:= hwSign(Gear^.dX); |
333 |
if (Gear^.Message and gm_Left )<>0 then Gear^.dX:= -cLittle else |
|
334 |
if (Gear^.Message and gm_Right )<>0 then Gear^.dX:= cLittle else exit; |
|
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
335 |
|
74 | 336 |
StepTicks:= cHHStepTicks; |
610 | 337 |
if PrevdX <> hwSign(Gear^.dX) then |
338 |
begin |
|
339 |
FollowGear:= Gear; |
|
340 |
exit |
|
341 |
end; |
|
342 |
DeleteCI(Gear); // must be after exit!! (see previous line) |
|
838 | 343 |
|
351 | 344 |
PHedgehog(Gear^.Hedgehog)^.visStepPos:= (PHedgehog(Gear^.Hedgehog)^.visStepPos + 1) and 7; |
345 |
if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then |
|
4 | 346 |
begin |
498 | 347 |
if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX)) |
348 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
349 |
if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX)) |
|
350 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
351 |
if not (TestCollisionXwithXYShift(Gear, _0, -4, hwSign(Gear^.dX)) |
|
352 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
353 |
if not (TestCollisionXwithXYShift(Gear, _0, -3, hwSign(Gear^.dX)) |
|
354 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
355 |
if not (TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) |
|
356 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
357 |
if not (TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) |
|
358 |
or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1; |
|
4 | 359 |
end; |
1528 | 360 |
|
498 | 361 |
if not TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then Gear^.X:= Gear^.X + SignAs(_1, Gear^.dX); |
62 | 362 |
SetAllHHToActive; |
37 | 363 |
|
68 | 364 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 365 |
begin |
498 | 366 |
Gear^.Y:= Gear^.Y + _1; |
68 | 367 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 368 |
begin |
498 | 369 |
Gear^.Y:= Gear^.Y + _1; |
68 | 370 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 371 |
begin |
498 | 372 |
Gear^.Y:= Gear^.Y + _1; |
68 | 373 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 374 |
begin |
498 | 375 |
Gear^.Y:= Gear^.Y + _1; |
68 | 376 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 377 |
begin |
498 | 378 |
Gear^.Y:= Gear^.Y + _1; |
68 | 379 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 380 |
begin |
498 | 381 |
Gear^.Y:= Gear^.Y + _1; |
68 | 382 |
if not TestCollisionYwithGear(Gear, 1) then |
4 | 383 |
begin |
498 | 384 |
Gear^.Y:= Gear^.Y - _6; |
385 |
Gear^.dY:= _0; |
|
542 | 386 |
Gear^.State:= Gear^.State or gstMoving; |
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
387 |
exit |
4 | 388 |
end; |
389 |
end |
|
390 |
end |
|
391 |
end |
|
392 |
end |
|
393 |
end |
|
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
394 |
end; |
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
395 |
AddGearCI(Gear) |
4 | 396 |
end |
397 |
end; |
|
398 |
||
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
399 |
procedure HedgehogChAngle(Gear: PGear); |
958 | 400 |
var da: LongWord; |
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
401 |
begin |
958 | 402 |
with PHedgehog(Gear^.Hedgehog)^ do |
403 |
if (Ammo^[CurSlot, CurAmmo].AmmoType = amRope) |
|
404 |
and ((Gear^.State and (gstMoving or gstHHJumping)) = gstMoving) then da:= 2 else da:= 1; |
|
405 |
||
1639 | 406 |
if (((Gear^.Message and gm_Precise) = 0) or ((GameTicks mod 5) = 1)) then |
407 |
if ((Gear^.Message and gm_Up) <> 0) and (Gear^.Angle - da >= CurMinAngle) then dec(Gear^.Angle, da) |
|
408 |
else |
|
409 |
if ((Gear^.Message and gm_Down) <> 0) and (Gear^.Angle + da <= CurMaxAngle) then inc(Gear^.Angle, da); |
|
303
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
410 |
end; |
1659c4aad5ab
Now blow torch angle can be changed during blowing :)
unc0rr
parents:
302
diff
changeset
|
411 |
|
302 | 412 |
procedure doStepHedgehog(Gear: PGear); forward; |
413 |
//////////////////////////////////////////////////////////////////////////////// |
|
538 | 414 |
procedure doStepHedgehogMoving(Gear: PGear); |
545 | 415 |
var isFalling: boolean; |
538 | 416 |
begin |
855
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
417 |
isFalling:= (Gear^.dY.isNegative) or not TestCollisionYKick(Gear, 1); |
542 | 418 |
if isFalling then |
538 | 419 |
begin |
420 |
if (Gear^.dY.isNegative) and TestCollisionYKick(Gear, -1) then Gear^.dY:= _0; |
|
542 | 421 |
Gear^.State:= Gear^.State or gstMoving; |
538 | 422 |
Gear^.dY:= Gear^.dY + cGravity |
423 |
end else |
|
424 |
begin |
|
425 |
if ((hwAbs(Gear^.dX) + hwAbs(Gear^.dY)) < _0_55) |
|
426 |
and ((Gear^.State and gstHHJumping) <> 0) then SetLittle(Gear^.dX); |
|
427 |
||
540 | 428 |
if not Gear^.dY.isNegative then |
429 |
begin |
|
430 |
CheckHHDamage(Gear); |
|
790
a6f442173822
Make high jump behaviour like in worms (back somersault)
unc0rr
parents:
783
diff
changeset
|
431 |
|
a6f442173822
Make high jump behaviour like in worms (back somersault)
unc0rr
parents:
783
diff
changeset
|
432 |
if ((Gear^.State and gstHHHJump) <> 0) and |
a6f442173822
Make high jump behaviour like in worms (back somersault)
unc0rr
parents:
783
diff
changeset
|
433 |
(Gear^.dX.QWordValue < _0_02.QWordValue) then Gear^.dX.isNegative:= not Gear^.dX.isNegative; // landing after high jump |
a6f442173822
Make high jump behaviour like in worms (back somersault)
unc0rr
parents:
783
diff
changeset
|
434 |
|
542 | 435 |
Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); |
540 | 436 |
Gear^.dY:= _0; |
437 |
end else Gear^.dY:= Gear^.dY + cGravity; |
|
538 | 438 |
|
439 |
if ((Gear^.State and gstMoving) <> 0) then Gear^.dX:= Gear^.dX * Gear^.Friction |
|
440 |
end; |
|
441 |
||
442 |
if (Gear^.State <> 0) then DeleteCI(Gear); |
|
783 | 443 |
|
538 | 444 |
if (Gear^.State and gstMoving) <> 0 then |
445 |
if TestCollisionXKick(Gear, hwSign(Gear^.dX)) then |
|
542 | 446 |
if not isFalling then |
538 | 447 |
if hwAbs(Gear^.dX) > _0_01 then |
448 |
if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -1, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_96; Gear^.Y:= Gear^.Y - _1 end else |
|
449 |
if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -2, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_93; Gear^.Y:= Gear^.Y - _2 end else |
|
450 |
if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -3, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_9 ; Gear^.Y:= Gear^.Y - _3 end else |
|
451 |
if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -4, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_87; Gear^.Y:= Gear^.Y - _4 end else |
|
452 |
if not TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -5, hwSign(Gear^.dX)) then begin Gear^.X:= Gear^.X + Gear^.dX; Gear^.dX:= Gear^.dX * _0_84; Gear^.Y:= Gear^.Y - _5 end else |
|
453 |
if hwAbs(Gear^.dX) > _0_02 then Gear^.dX:= -Gear^.Elasticity * Gear^.dX |
|
454 |
else begin |
|
455 |
Gear^.State:= Gear^.State and not gstMoving; |
|
456 |
SetLittle(Gear^.dX) |
|
457 |
end |
|
458 |
else begin |
|
459 |
Gear^.State:= Gear^.State and not gstMoving; |
|
460 |
SetLittle(Gear^.dX) |
|
461 |
end |
|
1518 | 462 |
else if (hwAbs(Gear^.dX) > cLittle) |
463 |
and ((Gear^.State and gstHHJumping) = 0) |
|
464 |
then Gear^.dX:= -Gear^.Elasticity * Gear^.dX |
|
465 |
else SetLittle(Gear^.dX); |
|
538 | 466 |
|
542 | 467 |
if (not isFalling) and |
538 | 468 |
(hwAbs(Gear^.dX) + hwAbs(Gear^.dY) < _0_03) then |
469 |
begin |
|
470 |
Gear^.State:= Gear^.State and not gstMoving; |
|
471 |
SetLittle(Gear^.dX); |
|
472 |
Gear^.dY:= _0 |
|
473 |
end else Gear^.State:= Gear^.State or gstMoving; |
|
474 |
||
475 |
if (Gear^.State and gstMoving) <> 0 then |
|
476 |
begin |
|
477 |
Gear^.State:= Gear^.State and not gstAnimation; |
|
478 |
Gear^.X:= Gear^.X + Gear^.dX; |
|
479 |
Gear^.Y:= Gear^.Y + Gear^.dY; |
|
480 |
if (not Gear^.dY.isNegative) and |
|
481 |
(not TestCollisionYKick(Gear, 1)) and |
|
482 |
TestCollisionYwithXYShift(Gear, 0, 1, 1) then |
|
483 |
begin |
|
484 |
CheckHHDamage(Gear); |
|
485 |
Gear^.dY:= _0; |
|
486 |
Gear^.Y:= Gear^.Y + _1 |
|
487 |
end; |
|
1658
208a3258afdf
Fix a bug with visible cursor when hedgehog is dead
unc0rr
parents:
1645
diff
changeset
|
488 |
CheckGearDrowning(Gear); |
208a3258afdf
Fix a bug with visible cursor when hedgehog is dead
unc0rr
parents:
1645
diff
changeset
|
489 |
if (Gear^.State and gstDrowning) <> 0 then isCursorVisible:= false |
538 | 490 |
end |
491 |
end; |
|
492 |
||
302 | 493 |
procedure doStepHedgehogDriven(Gear: PGear); |
494 |
var t: PGear; |
|
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
495 |
wasJumping: boolean; |
302 | 496 |
begin |
558
b2b840eeb10a
Fix bug when hedgehog moves not right after it is kicked
unc0rr
parents:
553
diff
changeset
|
497 |
if not isInMultiShoot then |
b2b840eeb10a
Fix bug when hedgehog moves not right after it is kicked
unc0rr
parents:
553
diff
changeset
|
498 |
AllInactive:= false |
b2b840eeb10a
Fix bug when hedgehog moves not right after it is kicked
unc0rr
parents:
553
diff
changeset
|
499 |
else |
b2b840eeb10a
Fix bug when hedgehog moves not right after it is kicked
unc0rr
parents:
553
diff
changeset
|
500 |
Gear^.Message:= 0; |
505
fcba7d7aea0d
Fix old bug with grenade(bomd, etc..) not colliding with attacking hedgehog
unc0rr
parents:
498
diff
changeset
|
501 |
|
1035 | 502 |
if (TurnTimeLeft = 0) or (Gear^.Damage > 0) then |
1645 | 503 |
begin |
504 |
TurnTimeLeft:= 0; |
|
505 |
isCursorVisible:= false; |
|
506 |
Gear^.State:= Gear^.State and not (gstHHDriven or gstAnimation); |
|
507 |
if Gear^.Damage > 0 then |
|
508 |
Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); |
|
509 |
exit |
|
510 |
end; |
|
1035 | 511 |
|
1033 | 512 |
if (Gear^.State and gstAnimation) <> 0 then |
513 |
begin |
|
514 |
Gear^.Message:= 0; |
|
515 |
inc(Gear^.Timer); |
|
516 |
if Gear^.Timer = 125 then |
|
517 |
begin |
|
518 |
Gear^.Timer:= 0; |
|
519 |
inc(Gear^.Pos); |
|
1034 | 520 |
if Gear^.Pos = Wavez[TWave(Gear^.Tag)].FramesCount then |
1033 | 521 |
Gear^.State:= Gear^.State and not gstAnimation |
522 |
end; |
|
523 |
exit |
|
524 |
end; |
|
525 |
||
836 | 526 |
if ((Gear^.State and gstMoving) <> 0) |
527 |
or (StepTicks = cHHStepTicks) |
|
835
6f567934cc44
Automatically use parachute when vertical speed is high enough
unc0rr
parents:
829
diff
changeset
|
528 |
or (CurAmmoGear <> nil) then // we're moving |
836 | 529 |
begin |
839 | 530 |
with PHedgehog(Gear^.Hedgehog)^ do |
531 |
if (CurAmmoGear = nil) |
|
532 |
and (Gear^.dY > _0_39) |
|
533 |
and (Ammo^[CurSlot, CurAmmo].AmmoType = amParachute) then Gear^.Message:= Gear^.Message or gm_Attack; |
|
836 | 534 |
// check for case with ammo |
535 |
t:= CheckGearNear(Gear, gtCase, 36, 36); |
|
536 |
if t <> nil then |
|
537 |
PickUp(Gear, t) |
|
855
8842c71d16bf
- Fix too long delay between shotgun and deagle shots
unc0rr
parents:
854
diff
changeset
|
538 |
end; |
302 | 539 |
|
930 | 540 |
if (CurAmmoGear = nil) then |
541 |
if (((Gear^.Message and gm_Attack) <> 0) |
|
542 |
or ((Gear^.State and gstAttacking) <> 0)) then |
|
543 |
Attack(Gear) // should be before others to avoid desync with '/put' msg and changing weapon msgs |
|
544 |
else |
|
545 |
else with PHedgehog(Gear^.Hedgehog)^ do |
|
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
546 |
if ((CurAmmoGear^.Ammo^.Propz and ammoprop_AltAttack) <> 0) |
930 | 547 |
and ((Gear^.Message and gm_LJump) <> 0) |
931 | 548 |
and (((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_AltUse) <> 0) then |
549 |
begin |
|
550 |
Gear^.Message:= Gear^.Message and not gm_LJump; |
|
551 |
Attack(Gear) |
|
552 |
end; |
|
930 | 553 |
|
554 |
if (CurAmmoGear = nil) |
|
555 |
or ((CurAmmoGear^.Ammo^.Propz and ammoprop_AltAttack) <> 0) then |
|
556 |
begin |
|
557 |
if ((Gear^.Message and gm_Slot) <> 0) then ChangeAmmo(Gear); |
|
558 |
||
559 |
if ((Gear^.Message and gm_Weapon) <> 0) then HHSetWeapon(Gear); |
|
560 |
||
561 |
if ((Gear^.Message and gm_Timer) <> 0) then HHSetTimer(Gear); |
|
562 |
end; |
|
563 |
||
302 | 564 |
if CurAmmoGear <> nil then |
565 |
begin |
|
351 | 566 |
CurAmmoGear^.Message:= Gear^.Message; |
302 | 567 |
exit |
568 |
end; |
|
569 |
||
952 | 570 |
if not isInMultiShoot then |
571 |
HedgehogChAngle(Gear); |
|
926
d231e007452a
Timer as hedgehog message (avoid possible desync in very rare cases)
unc0rr
parents:
925
diff
changeset
|
572 |
|
542 | 573 |
if (Gear^.State and gstMoving) <> 0 then |
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
574 |
begin |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
575 |
wasJumping:= ((Gear^.State and gstHHJumping) <> 0); |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
576 |
|
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
577 |
if ((Gear^.Message and gm_HJump) <> 0) and |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
578 |
wasJumping and |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
579 |
((Gear^.State and gstHHHJump) = 0) then |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
580 |
if (not (hwAbs(Gear^.dX) > cLittle)) and (Gear^.dY < -_0_02) then |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
581 |
begin |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
582 |
Gear^.State:= Gear^.State or gstHHHJump or gstMoving; |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
583 |
Gear^.dY:= -_0_25; |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
584 |
Gear^.dX:= -SignAs(_0_02, Gear^.dX); |
1669 | 585 |
PlaySound(sndJump2, false, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack) |
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
586 |
end; |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
587 |
|
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
588 |
Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump); |
538 | 589 |
|
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
590 |
if wasJumping and |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
591 |
TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then SetLittle(Gear^.dX); |
538 | 592 |
|
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
593 |
doStepHedgehogMoving(Gear); |
542 | 594 |
|
1519
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
595 |
if ((Gear^.State and (gstMoving or gstDrowning)) = 0) then |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
596 |
begin |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
597 |
AddGearCI(Gear); |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
598 |
if wasJumping then |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
599 |
StepTicks:= 410 |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
600 |
else |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
601 |
StepTicks:= 95 |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
602 |
end; |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
603 |
exit |
7b6adbe5266a
More delay after jump, less delay after small fall for hedgehog
unc0rr
parents:
1518
diff
changeset
|
604 |
end; |
302 | 605 |
|
1033 | 606 |
if not isInMultiShoot then |
607 |
begin |
|
608 |
if StepTicks > 0 then dec(StepTicks); |
|
609 |
if (StepTicks = 0) then HedgehogStep(Gear) |
|
610 |
end |
|
302 | 611 |
end; |
612 |
||
4 | 613 |
//////////////////////////////////////////////////////////////////////////////// |
614 |
procedure doStepHedgehogFree(Gear: PGear); |
|
511 | 615 |
var prevState: Longword; |
4 | 616 |
begin |
511 | 617 |
prevState:= Gear^.State; |
4 | 618 |
|
538 | 619 |
doStepHedgehogMoving(Gear); |
4 | 620 |
|
1002 | 621 |
if (Gear^.State and (gstMoving or gstDrowning)) <> 0 then |
865 | 622 |
begin |
1012 | 623 |
if Gear^.Damage > 0 then CalcRotationDirAngle(Gear); |
865 | 624 |
AllInactive:= false; |
625 |
exit |
|
626 |
end; |
|
4 | 627 |
|
863 | 628 |
if (Gear^.Health = 0) then |
629 |
begin |
|
868 | 630 |
if PrvInactive then |
864 | 631 |
begin |
632 |
Gear^.Timer:= 0; |
|
868 | 633 |
Gear^.State:= Gear^.State or gstHHDeath; |
634 |
Gear^.doStep:= @doStepHedgehogDead; |
|
1347 | 635 |
FollowGear:= Gear; |
868 | 636 |
PrvInactive:= false; |
637 |
AllInactive:= false |
|
864 | 638 |
end; |
863 | 639 |
exit |
640 |
end; |
|
4 | 641 |
|
1033 | 642 |
if ((Gear^.State and gstWait) = 0) and |
863 | 643 |
(prevState <> Gear^.State) then |
644 |
begin |
|
1033 | 645 |
Gear^.State:= gstWait; |
863 | 646 |
Gear^.Timer:= 150 |
647 |
end else |
|
648 |
begin |
|
649 |
if Gear^.Timer = 0 then |
|
650 |
begin |
|
651 |
Gear^.State:= 0; |
|
652 |
Gear^.Active:= false; |
|
653 |
AddGearCI(Gear); |
|
654 |
exit |
|
655 |
end else dec(Gear^.Timer) |
|
656 |
end; |
|
657 |
||
658 |
AllInactive:= false |
|
4 | 659 |
end; |
660 |
||
661 |
//////////////////////////////////////////////////////////////////////////////// |
|
662 |
procedure doStepHedgehog(Gear: PGear); |
|
663 |
begin |
|
351 | 664 |
if (Gear^.Message and gm_Destroy) <> 0 then |
1505 | 665 |
begin |
666 |
DeleteGear(Gear); |
|
667 |
exit |
|
668 |
end; |
|
669 |
||
351 | 670 |
if (Gear^.State and gstHHDriven) = 0 then doStepHedgehogFree(Gear) |
511 | 671 |
else doStepHedgehogDriven(Gear) |
4 | 672 |
end; |