hedgewars-draft: comparison hedgewars/uAmmos.pas

equal deleted inserted replaced

-:803b277e4894
+:3f21a9dc93d0
 if a <> amNothing then
 begin
 Ammoz[a].Probability:= probability[byte(s[ord(a) + ord(High(TAmmoType))]) - byte('0')];
 Ammoz[a].SkipTurns:= (byte(s[ord(a) + ord(High(TAmmoType)) + ord(High(TAmmoType))]) - byte('0'));
 Ammoz[a].NumberInCase:= (byte(s[ord(a) + ord(High(TAmmoType)) + ord(High(TAmmoType)) + ord(High(TAmmoType))]) - byte('0'));
-		if (TrainingFlags and tfIgnoreDelays) <> 0 then Ammoz[a].SkipTurns:= 0;
+if (TrainingFlags and tfIgnoreDelays) <> 0 then Ammoz[a].SkipTurns:= 0;
 cnt:= byte(s[ord(a)]) - byte('0');
 // avoid things we already have infinite number
 if cnt = 9 then
 begin
 cnt:= AMMO_INFINITE;
 end;
 procedure OnUsedAmmo(var Hedgehog: THedgehog);
 begin
 with Hedgehog do
-	begin
+begin
-	MultiShootAttacks:= 0;
+MultiShootAttacks:= 0;
-	with Ammo^[CurSlot, CurAmmo] do
+with Ammo^[CurSlot, CurAmmo] do
-		if Count <> AMMO_INFINITE then
+if Count <> AMMO_INFINITE then
-			begin
+begin
-			dec(Count);
+dec(Count);
-			if Count = 0 then
+if Count = 0 then
-				begin
+begin
-				PackAmmo(Ammo, CurSlot);
+PackAmmo(Ammo, CurSlot);
-				SwitchNotHeldAmmo(Hedgehog)
+SwitchNotHeldAmmo(Hedgehog)
-				end
+end
-			end
+end
-	end
+end
 end;
 function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
 var slot, ami: LongInt;
 begin
 end;
 procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType);
 begin
 with Hedgehog do
-	begin
+begin
-	CurMinAngle:= Ammoz[AmmoType].minAngle;
+CurMinAngle:= Ammoz[AmmoType].minAngle;
-	if Ammoz[AmmoType].maxAngle <> 0 then
+if Ammoz[AmmoType].maxAngle <> 0 then
-		CurMaxAngle:= Ammoz[AmmoType].maxAngle
+CurMaxAngle:= Ammoz[AmmoType].maxAngle
-	else
+else
-		CurMaxAngle:= cMaxAngle;
+CurMaxAngle:= cMaxAngle;
-	with Hedgehog.Gear^ do
+with Hedgehog.Gear^ do
-		begin
+begin
-		if Angle < CurMinAngle then Angle:= CurMinAngle;
+if Angle < CurMinAngle then Angle:= CurMinAngle;
-		if Angle > CurMaxAngle then Angle:= CurMaxAngle;
+if Angle > CurMaxAngle then Angle:= CurMaxAngle;
-		end
+end
-	end
+end
 end;
 procedure SwitchToFirstLegalAmmo(var Hedgehog: THedgehog);
 begin
 with Hedgehog do
-	begin
+begin
-	CurAmmo:= 0;
+CurAmmo:= 0;
-	CurSlot:= 0;
+CurSlot:= 0;
-	while (CurSlot <= cMaxSlotIndex) and
+while (CurSlot <= cMaxSlotIndex) and
-		((Ammo^[CurSlot, CurAmmo].Count = 0) or
+((Ammo^[CurSlot, CurAmmo].Count = 0) or
-		(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
+(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
-		do
+do
-		begin
+begin
-		while (CurAmmo <= cMaxSlotAmmoIndex) and
+while (CurAmmo <= cMaxSlotAmmoIndex) and
-			((Ammo^[CurSlot, CurAmmo].Count = 0) or
+((Ammo^[CurSlot, CurAmmo].Count = 0) or
-			(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
+(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
-			do inc(CurAmmo);
+do inc(CurAmmo);
-		if (CurAmmo > cMaxSlotAmmoIndex) then
+if (CurAmmo > cMaxSlotAmmoIndex) then
-			begin
+begin
-			CurAmmo:= 0;
+CurAmmo:= 0;
-			inc(CurSlot)
+inc(CurSlot)
-			end
+end
-		end;
+end;
-	TryDo(CurSlot <= cMaxSlotIndex, 'Ammo slot index overflow', true)
+TryDo(CurSlot <= cMaxSlotIndex, 'Ammo slot index overflow', true)
-	end
+end
 end;
 procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
 var s: shortstring;
 begin
 TargetPoint.X:= NoPointX;
 with Hedgehog do
-	begin
+begin
-	if (Ammo^[CurSlot, CurAmmo].Count = 0) then
+if (Ammo^[CurSlot, CurAmmo].Count = 0) then
-		SwitchToFirstLegalAmmo(Hedgehog);
+SwitchToFirstLegalAmmo(Hedgehog);
 //bad things could happen here in case CurSlot is overflowing
-	ApplyAngleBounds(Hedgehog, Ammo^[CurSlot, CurAmmo].AmmoType);
+ApplyAngleBounds(Hedgehog, Ammo^[CurSlot, CurAmmo].AmmoType);
-	with Ammo^[CurSlot, CurAmmo] do
+with Ammo^[CurSlot, CurAmmo] do
-		begin
+begin
 if AmmoType <> amNothing then
 begin
-		    s:= trammo[Ammoz[AmmoType].NameId];
+s:= trammo[Ammoz[AmmoType].NameId];
-		    if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
+if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
-			    s:= s + ' (' + IntToStr(Count) + ')';
+s:= s + ' (' + IntToStr(Count) + ')';
-		    if (Propz and ammoprop_Timerable) <> 0 then
+if (Propz and ammoprop_Timerable) <> 0 then
-			    s:= s + ', ' + inttostr(Timer div 1000) + ' ' + trammo[sidSeconds];
+s:= s + ', ' + inttostr(Timer div 1000) + ' ' + trammo[sidSeconds];
-		    AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
+AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
 end;
-		if (Propz and ammoprop_NeedTarget) <> 0
+if (Propz and ammoprop_NeedTarget) <> 0
-			then begin
+then begin
-			Gear^.State:= Gear^.State or      gstHHChooseTarget;
+Gear^.State:= Gear^.State or      gstHHChooseTarget;
-			isCursorVisible:= true
+isCursorVisible:= true
-			end else begin
+end else begin
-			Gear^.State:= Gear^.State and not gstHHChooseTarget;
+Gear^.State:= Gear^.State and not gstHHChooseTarget;
-			isCursorVisible:= false
+isCursorVisible:= false
-			end;
+end;
-		ShowCrosshair:= (Propz and ammoprop_NoCrosshair) = 0
+ShowCrosshair:= (Propz and ammoprop_NoCrosshair) = 0
-		end
+end
-	end
+end
 end;
 procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
 begin
 with Hedgehog do
-	if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or
+if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or
-		(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
+(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
-		SwitchToFirstLegalAmmo(Hedgehog);
+SwitchToFirstLegalAmmo(Hedgehog);
 end;
 procedure SetWeapon(weap: TAmmoType);
 begin
 ParseCommand('/setweap ' + char(weap), true)
 end;
 procedure DisableSomeWeapons;
 var i, slot, a: Longword;
-	t: TAmmoType;
+t: TAmmoType;
 begin
 for i:= 0 to Pred(StoreCnt) do
-	for slot:= 0 to cMaxSlotIndex do
+for slot:= 0 to cMaxSlotIndex do
-		begin
+begin
-		for a:= 0 to cMaxSlotAmmoIndex do
+for a:= 0 to cMaxSlotAmmoIndex do
-			with StoresList[i]^[slot, a] do
+with StoresList[i]^[slot, a] do
-				if (Propz and ammoprop_NotBorder) <> 0 then Count:= 0;
+if (Propz and ammoprop_NotBorder) <> 0 then Count:= 0;
-		PackAmmo(StoresList[i], slot)
+PackAmmo(StoresList[i], slot)
-		end;
+end;
 for t:= Low(TAmmoType) to High(TAmmoType) do
-	if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then Ammoz[t].Probability:= 0
+if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then Ammoz[t].Probability:= 0
 end;
 // Restore indefinitely disabled weapons and initial weapon counts.  Only used for hog placement right now
 procedure ResetWeapons;
 var i, slot, a: Longword;
-	t: TAmmoType;
+t: TAmmoType;
 begin
 for i:= 0 to Pred(StoreCnt) do
-	for slot:= 0 to cMaxSlotIndex do
+for slot:= 0 to cMaxSlotIndex do
-		begin
+begin
-		for a:= 0 to cMaxSlotAmmoIndex do
+for a:= 0 to cMaxSlotAmmoIndex do
-			with StoresList[i]^[slot, a] do
+with StoresList[i]^[slot, a] do
 Count:= InitialCount;
-		PackAmmo(StoresList[i], slot)
+PackAmmo(StoresList[i], slot)
-		end;
+end;
 for t:= Low(TAmmoType) to High(TAmmoType) do
-	if Ammoz[t].SkipTurns >= 10000 then dec(Ammoz[t].SkipTurns,10000);
+if Ammoz[t].SkipTurns >= 10000 then dec(Ammoz[t].SkipTurns,10000);
 end;
 procedure init_uAmmos;
 begin
-	shoppa:= false;
+shoppa:= false;
-	StoreCnt:= 0
+StoreCnt:= 0
 end;
 procedure free_uAmmos;
 var i: LongWord;
 begin
-	if StoreCnt > 0 then
+if StoreCnt > 0 then
-		for i:= 0 to Pred(StoreCnt) do Dispose(StoresList[i]);
+for i:= 0 to Pred(StoreCnt) do Dispose(StoresList[i]);
-	StoreCnt:= 0
+StoreCnt:= 0
 end;
 end.

changeset 2948	3f21a9dc93d0
parent 2860	13a53315ae18
child 2991	142ea64ce8a2