equal
deleted
inserted
replaced
245 Inc(MultiShootAttacks); |
245 Inc(MultiShootAttacks); |
246 |
246 |
247 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) then |
247 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) then |
248 begin |
248 begin |
249 s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - MultiShootAttacks); |
249 s:= inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn + 1 - MultiShootAttacks); |
250 AddCaption(format(trmsg[sidRemaining], s), |
250 AddCaption(format(trmsg[sidRemaining], s), cWhiteColor, capgrpAmmostate); |
251 $FFFFFF, |
|
252 capgrpAmmostate); |
|
253 end; |
251 end; |
254 |
252 |
255 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) or |
253 if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= MultiShootAttacks) or |
256 ((GameFlags and gfMultiWeapon) <> 0) then |
254 ((GameFlags and gfMultiWeapon) <> 0) then |
257 begin |
255 begin |
569 if (hwAbs(Gear^.dY) > _0) and (Gear^.FlightTime > 0) then |
567 if (hwAbs(Gear^.dY) > _0) and (Gear^.FlightTime > 0) then |
570 begin |
568 begin |
571 inc(Gear^.FlightTime, 1); |
569 inc(Gear^.FlightTime, 1); |
572 if Gear^.FlightTime = 2000 then |
570 if Gear^.FlightTime = 2000 then |
573 begin |
571 begin |
574 AddCaption(GetEventString(eidHomerun), $FFFFFF, capgrpMessage); |
572 AddCaption(GetEventString(eidHomerun), cWhiteColor, capgrpMessage); |
575 PlaySound(sndHomerun, false, nil) |
573 PlaySound(sndHomerun, false, nil) |
576 end; |
574 end; |
577 end |
575 end |
578 else |
576 else |
579 begin |
577 begin |
732 FollowGear:= Gear; |
730 FollowGear:= Gear; |
733 PrvInactive:= false; |
731 PrvInactive:= false; |
734 AllInactive:= false; |
732 AllInactive:= false; |
735 |
733 |
736 // Death message |
734 // Death message |
737 AddCaption(Format(GetEventString(eidDied), PHedgehog(Gear^.Hedgehog)^.Name), $FFFFFF, capgrpMessage); |
735 AddCaption(Format(GetEventString(eidDied), PHedgehog(Gear^.Hedgehog)^.Name), cWhiteColor, capgrpMessage); |
738 end; |
736 end; |
739 exit |
737 exit |
740 end; |
738 end; |
741 |
739 |
742 if ((Gear^.State and gstWait) = 0) and |
740 if ((Gear^.State and gstWait) = 0) and |