equal
deleted
inserted
replaced
1235 oX, oY, tmpX, tmpY: hwFloat; |
1235 oX, oY, tmpX, tmpY: hwFloat; |
1236 begin |
1236 begin |
1237 AllInactive := false; |
1237 AllInactive := false; |
1238 |
1238 |
1239 if ((Gear^.State and gstAnimation) = 0) then |
1239 if ((Gear^.State and gstAnimation) = 0) then |
1240 begin |
1240 begin |
1241 dec(Gear^.Timer); |
1241 dec(Gear^.Timer); |
1242 if Gear^.Timer = 0 then |
1242 if Gear^.Timer = 0 then |
1243 begin |
1243 begin |
1244 PlaySound(sndShotgunFire); |
1244 PlaySound(sndShotgunFire); |
1245 CreateShellForGear(Gear, 0); |
1245 CreateShellForGear(Gear, 0); |
1246 Gear^.State := Gear^.State or gstAnimation |
1246 Gear^.State := Gear^.State or gstAnimation |
1247 end; |
1247 end |
1248 exit |
1248 else if (Gear^.Hedgehog^.Gear = nil) |
1249 end else |
1249 or ((Gear^.Hedgehog^.Gear^.State and (gstMoving or gstHHDriven)) = gstMoving) then |
1250 if(Gear^.Hedgehog^.Gear = nil) or ((Gear^.Hedgehog^.Gear^.State and gstMoving) <> 0) then |
1250 begin |
1251 begin |
|
1252 DeleteGear(Gear); |
1251 DeleteGear(Gear); |
1253 AfterAttack; |
1252 AfterAttack; |
1254 exit |
1253 end; |
1255 end |
1254 exit |
|
1255 end |
1256 else |
1256 else |
1257 inc(Gear^.Timer); |
1257 inc(Gear^.Timer); |
1258 |
1258 |
1259 i := 100; |
1259 i := 100; |
1260 oX := Gear^.X; |
1260 oX := Gear^.X; |