| changeset 3836 | 833c0f32e326 |
| parent 3832 | f949798219bf |
| child 3845 | 90034acb2e43 |
| 3835:cbee69165c6a | 3836:833c0f32e326 |
|---|---|
30 NextGear, PrevGear: PGear; |
30 NextGear, PrevGear: PGear; |
31 Active: Boolean; |
31 Active: Boolean; |
32 AdvBounce: Longword; |
32 AdvBounce: Longword; |
33 Invulnerable: Boolean; |
33 Invulnerable: Boolean; |
34 RenderTimer: Boolean; |
34 RenderTimer: Boolean; |
35 Ammo : PAmmo; |
35 AmmoType : TAmmoType; |
36 AmmoType : TAmmoType; // Used to track AmmoType at time of Gear creation, since Ammo can be reassigned |
|
37 State : Longword; |
36 State : Longword; |
38 X : hwFloat; |
37 X : hwFloat; |
39 Y : hwFloat; |
38 Y : hwFloat; |
40 dX: hwFloat; |
39 dX: hwFloat; |
41 dY: hwFloat; |
40 dY: hwFloat; |
994 |
993 |
995 procedure DrawAltWeapon(Gear: PGear; sx, sy: LongInt); |
994 procedure DrawAltWeapon(Gear: PGear; sx, sy: LongInt); |
996 begin |
995 begin |
997 with PHedgehog(Gear^.Hedgehog)^ do |
996 with PHedgehog(Gear^.Hedgehog)^ do |
998 begin |
997 begin |
999 if not (((Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and ((Gear^.State and gstAttacked) = 0)) then |
998 if not (((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and ((Gear^.State and gstAttacked) = 0)) then |
1000 exit; |
999 exit; |
1001 DrawTexture(round(sx + 16), round(sy + 16), ropeIconTex); |
1000 DrawTexture(round(sx + 16), round(sy + 16), ropeIconTex); |
1002 DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.75, round(sx + 30), round(sy + 30), ord(Ammo^[CurSlot, CurAmmo].AmmoType) - 1, 1, 32, 32); |
1001 DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.75, round(sx + 30), round(sy + 30), ord(CurAmmoType) - 1, 1, 32, 32); |
1003 end; |
1002 end; |
1004 end; |
1003 end; |
1005 |
1004 |
1006 procedure DrawRopeLinesRQ(Gear: PGear); |
1005 procedure DrawRopeLinesRQ(Gear: PGear); |
1007 begin |
1006 begin |