--- a/hedgewars/uWorld.pas	Mon Jun 28 21:49:59 2010 +0400
+++ b/hedgewars/uWorld.pas	Mon Jun 28 21:52:00 2010 +0200
@@ -596,7 +596,6 @@
 DrawWater(255, 0);
 
 // Attack bar
-// TODO: Add weapon offset
 if CurrentTeam <> nil then
     case AttackBar of
 (*        1: begin
@@ -974,7 +973,7 @@
    if not bShowAmmoMenu then
      begin
      with CurrentHedgehog^ do
-       if (Gear^.State and gstHHChooseTarget) <> 0 then
+       if (Gear <> nil) and ((Gear^.State and gstHHChooseTarget) <> 0) then
          begin
          i:= Ammo^[CurSlot, CurAmmo].Pos;
          with Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType] do