# HG changeset patch # User nemo # Date 1284764384 14400 # Node ID 28c3b8143573d6fc85f322b8cea4e690fb2ba9ab # Parent 110121efe3d26c6621ac153ae1991d7386118b56 Oops. Forgot to change these over after switching CurWeapon to AmmoType diff -r 110121efe3d2 -r 28c3b8143573 hedgewars/PascalExports.pas --- a/hedgewars/PascalExports.pas Fri Sep 17 13:32:37 2010 -0400 +++ b/hedgewars/PascalExports.pas Fri Sep 17 18:59:44 2010 -0400 @@ -220,7 +220,7 @@ function HW_isWeaponTimerable: boolean; cdecl; export; begin if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Ammo <> nil) and (CurrentHedgehog^.BotLevel = 0) then - exit( (CurrentHedgehog^.CurWeapon^.Propz and ammoprop_Timerable) <> 0) + exit( (Ammoz[CurrentHedgehog^.CurWeapon].Ammo.Propz and ammoprop_Timerable) <> 0) else exit(false); end; @@ -236,7 +236,7 @@ function HW_isWeaponRope: boolean cdecl; export; begin if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Ammo <> nil) and (CurrentHedgehog^.BotLevel = 0) then - exit (CurrentHedgehog^.CurWeapon^.AmmoType = amRope) + exit (CurrentHedgehog^.CurWeapon = amRope) else exit(false); end; @@ -250,7 +250,7 @@ begin // this most likely won't work in network game if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Ammo <> nil) and (CurrentHedgehog^.BotLevel = 0) - and (CurrentHedgehog^.CurWeapon^.AmmoType = amPiano) then + and (CurrentHedgehog^.CurWeapon = amPiano) then case snd of 0: PlaySound(sndPiano0); 1: PlaySound(sndPiano1);