Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aaaand use the right name
authornemo
Fri, 17 Sep 2010 19:10:48 -0400
changeset 3874 57e7327d5817
parent 3873 28c3b8143573
child 3875 7d7c16ed5056
aaaand use the right name
hedgewars/PascalExports.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/PascalExports.pas	Fri Sep 17 18:59:44 2010 -0400
+++ b/hedgewars/PascalExports.pas	Fri Sep 17 19:10:48 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( (Ammoz[CurrentHedgehog^.CurWeapon].Ammo.Propz and ammoprop_Timerable) <> 0)
+        exit( (Ammoz[CurrentHedgehog^.CurAmmoType].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 = amRope)
+        exit (CurrentHedgehog^.CurAmmoType = 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 = amPiano) then
+       and (CurrentHedgehog^.CurAmmoType = amPiano) then
         case snd of
             0: PlaySound(sndPiano0);
             1: PlaySound(sndPiano1);
hedgewars