sheepy-clone: comparison hedgewars/uAmmos.pas

equal deleted inserted replaced

-:31570b766315
+:ed5a6478e710
 (*
 * Hedgewars, a free turn based strategy game
-* Copyright (c) 2004-2013 Andrey Korotaev <unC0Rr@gmail.com>
+* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 2 of the License
 *
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *)
 {$INCLUDE "options.inc"}
 unit uAmmos;
 procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
 procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
 procedure SetWeapon(weap: TAmmoType);
 procedure DisableSomeWeapons;
 procedure ResetWeapons;
-function  GetAmmoByNum(num: Longword): PHHAmmo;
+function  GetAmmoByNum(num: LongInt): PHHAmmo;
 function  GetCurAmmoEntry(var Hedgehog: THedgehog): PAmmo;
 function  GetAmmoEntry(var Hedgehog: THedgehog; am: TAmmoType): PAmmo;
-var StoreCnt: Longword;
+var StoreCnt: LongInt;
 implementation
-uses uLocale, uVariables, uCommands, uUtils, uCaptions, uDebug;
+uses uVariables, uCommands, uUtils, uCaptions, uDebug;
 type TAmmoCounts = array[TAmmoType] of Longword;
 TAmmoArray = array[TAmmoType] of TAmmo;
 var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo;
 ammoLoadout, ammoProbability, ammoDelay, ammoReinforcement: shortstring;
 and (a <> amTeleport) and (a <> amSkip)
 and (Ammoz[a].SkipTurns < 10000) then
 inc(Ammoz[a].SkipTurns,10000);
 if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
 ammos[a]:= AMMO_INFINITE
 end
 else
 ammos[a]:= AMMO_INFINITE;
 if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
 InitialCounts[Pred(StoreCnt)][a]:= cnt
 else
 InitialCounts[Pred(StoreCnt)][a]:= ammos[a];
 end;
 for a:= Low(TAmmoType) to High(TAmmoType) do
 begin
 newAmmos[a]:= Ammoz[a].Ammo;
 newAmmos[a].Count:= ammos[a]
 end;
 FillAmmoStore(StoresList[Pred(StoreCnt)], newAmmos)
 end;
-function GetAmmoByNum(num: Longword): PHHAmmo;
+function GetAmmoByNum(num: LongInt): PHHAmmo;
 begin
 TryDo(num < StoreCnt, 'Invalid store number', true);
 GetAmmoByNum:= StoresList[num]
 end;
 if b then // there is a free item in ammo stack
 begin
 Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
 Ammo^[Slot, ami + 1].Count:= 0
 end;
-until not b;
+until (not b);
 AmmoMenuInvalidated:= true;
 end;
 procedure OnUsedAmmo(var Hedgehog: THedgehog);
 var CurWeapon: PAmmo;
 begin
 with Hedgehog.Ammo^[Slot, ami] do
 if (AmmoType = Ammo) then
 if Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns then
 exit(Count)
 else
 exit(0);
 inc(ami)
 end;
 end;
 inc(slot)
 end
 end;
 TryDo(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true);
 CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
-if CurAmmoType = amKnife then LoadHedgehogHat(Hedgehog, 'Reserved/chef')
 end
 end;
 procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
-var s: shortstring;
+var s: ansistring;
 CurWeapon: PAmmo;
 begin
 TargetPoint.X:= NoPointX;
 with Hedgehog do
 with CurWeapon^ do
 begin
 s:= trammo[Ammoz[AmmoType].NameId];
 if (Count <> AMMO_INFINITE) and (not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0))) then
-s:= s + ' (' + IntToStr(Count) + ')';
+s:= s + ansistring(' (' + IntToStr(Count) + ')');
 if (Propz and ammoprop_Timerable) <> 0 then
-s:= s + ', ' + IntToStr(Timer div 1000) + ' ' + trammo[sidSeconds];
+s:= s + ansistring(', ' + IntToStr(Timer div 1000) + ' ') + trammo[sidSeconds];
 AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
 if (Propz and ammoprop_NeedTarget) <> 0 then
 begin
-if Gear <> nil then Gear^.State:= Gear^.State or      gstHHChooseTarget;
+if Gear <> nil then Gear^.State:= Gear^.State or      gstChooseTarget;
 isCursorVisible:= true
 end
 else
 begin
-if Gear <> nil then Gear^.State:= Gear^.State and (not gstHHChooseTarget);
+if Gear <> nil then Gear^.State:= Gear^.State and (not gstChooseTarget);
 isCursorVisible:= false
 end;
 end
 end;
 end;
 for i:= 0 to cMaxHHIndex do
 Hedgehogs[i].CurAmmoType:= amNothing;
 for a:= Low(TAmmoType) to High(TAmmoType) do
 newAmmos[a]:= Ammoz[a].Ammo;
 for i:= 0 to Pred(StoreCnt) do
 begin
 for a:= Low(TAmmoType) to High(TAmmoType) do
 newAmmos[a].Count:= InitialCounts[i][a];
 FillAmmoStore(StoresList[i], newAmmos);
 procedure chAddAmmoStore(var descr: shortstring);
 begin
 descr:= ''; // avoid compiler hint
 AddAmmoStore
 end;
 procedure initModule;
 var i: Longword;
 begin

branch	sdl2transition
changeset 11342	ed5a6478e710
parent 11046	47a8c19ecb60
child 11537	bf86c6cb9341