hedgewars/uAmmos.pas
author nemo
Thu, 15 Oct 2009 15:49:42 +0000
changeset 2453 fdb76012b688
parent 2434 5faa05d99241
child 2457 ecf0c7e7995b
permissions -rw-r--r--
Restore crate probability restriction for "shoppa" weapon sets
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 971
diff changeset
     2
 * Hedgewars, a free turn based strategy game
883
07a568ba44e0 Update copyright info in source files headers
unc0rr
parents: 784
diff changeset
     3
 * Copyright (c) 2006-2008 Andrey Korotaev <unC0Rr@gmail.com>
393
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     4
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     8
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    12
 * GNU General Public License for more details.
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    13
 *
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    14
 * You should have received a copy of the GNU General Public License
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    15
 * along with this program; if not, write to the Free Software
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    17
 *)
db01cc79f278 Update copyright information
unc0rr
parents: 371
diff changeset
    18
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    19
unit uAmmos;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    20
interface
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
    21
uses uConsts, uTeams;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    22
{$INCLUDE options.inc}
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    23
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    24
procedure AddAmmoStore(s: shortstring);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    25
procedure AssignStores;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
    26
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType);
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
    27
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    28
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
    29
procedure OnUsedAmmo(var Hedgehog: THedgehog);
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
    30
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
    31
procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
    32
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
    33
procedure SetWeapon(weap: TAmmoType);
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
    34
procedure DisableSomeWeapons;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    35
1966
31e449e1d9dd nemo's patch + ropes ammo scheme hack
unc0rr
parents: 1964
diff changeset
    36
var shoppa: Boolean = false;
31e449e1d9dd nemo's patch + ropes ammo scheme hack
unc0rr
parents: 1964
diff changeset
    37
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    38
implementation
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
    39
uses uMisc, uGears, uWorld, uLocale, uConsole;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    40
type TAmmoCounts = array[TAmmoType] of Longword;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    41
var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    42
    StoreCnt: Longword = 0;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    43
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    44
procedure FillAmmoStore(Ammo: PHHAmmo; var cnts: TAmmoCounts);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    45
var mi: array[0..cMaxSlotIndex] of byte;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    46
    a: TAmmoType;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    47
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    48
FillChar(mi, sizeof(mi), 0);
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    49
FillChar(Ammo^, sizeof(Ammo^), 0);
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    50
for a:= Low(TAmmoType) to High(TAmmoType) do
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    51
    if cnts[a] > 0 then
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    52
       begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    53
       TryDo(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
    54
       Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= Ammoz[a].Ammo;
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
    55
       Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]].Count:= cnts[a];
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    56
       inc(mi[Ammoz[a].Slot])
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    57
       end
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    58
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    59
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    60
procedure AddAmmoStore(s: shortstring);
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    61
const probability: array [0..8] of LongWord = (0,20,30,60,100,150,200,400,600);
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    62
var cnt: Longword;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    63
    a: TAmmoType;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    64
    ammos: TAmmoCounts;
2453
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    65
    substr: shortstring; // TEMPORARY
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    66
begin
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    67
TryDo(byte(s[0]) = byte(ord(High(TAmmoType))) * 2, 'Invalid ammo scheme (incompatible frontend)', true);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    68
2453
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    69
// FIXME - TEMPORARY hardcoded check on shoppa pending creation of crate *type* probability editor
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    70
substr:= Copy(s,1,15);
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    71
if (substr = '000000990000009') or 
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    72
   (substr = '000000990000000') then
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    73
    shoppa:= true;
fdb76012b688 Restore crate probability restriction for "shoppa" weapon sets
nemo
parents: 2434
diff changeset
    74
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    75
inc(StoreCnt);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    76
TryDo(StoreCnt <= cMaxHHs, 'Ammo stores overflow', true);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    77
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    78
new(StoresList[Pred(StoreCnt)]);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    79
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    80
for a:= Low(TAmmoType) to High(TAmmoType) do
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    81
    begin
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    82
    if a <> amNothing then
1895
7ba647a88b2f More game options by nemo
unc0rr
parents: 1865
diff changeset
    83
        begin
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    84
        Ammoz[a].Probability:= probability[byte(s[ord(a) + ord(High(TAmmoType))]) - byte('0')];
2434
5faa05d99241 Smaxx: less hacks
unc0rr
parents: 2432
diff changeset
    85
		if (TrainingFlags and tfIgnoreDelays) <> 0 then Ammoz[a].SkipTurns:= 0;
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    86
        cnt:= byte(s[ord(a)]) - byte('0');
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    87
        // avoid things we already have infinite number
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    88
        if cnt = 9 then
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    89
            begin
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    90
            cnt:= AMMO_INFINITE;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    91
            Ammoz[a].Probability:= 0
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    92
            end;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
    93
        // avoid things we already have by scheme
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    94
        if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0)) or
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    95
           ((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0)) or
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    96
           ((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0)) or
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    97
           ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0)) then
2128
903fdb9f44b0 explicit nesting
nemo
parents: 2073
diff changeset
    98
            begin
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
    99
            cnt:= 0;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   100
            Ammoz[a].Probability:= 0
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   101
            end;
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   102
        ammos[a]:= cnt
2360
d4d545da9dbe Ok. This time I think I have it. amNothing should work.
nemo
parents: 2357
diff changeset
   103
        end else
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   104
        ammos[a]:= AMMO_INFINITE
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   105
    end;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   106
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   107
FillAmmoStore(StoresList[Pred(StoreCnt)], ammos)
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   108
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   109
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   110
function GetAmmoByNum(num: Longword): PHHAmmo;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   111
begin
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   112
TryDo(num < StoreCnt, 'Invalid store number', true);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   113
exit(StoresList[num])
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   114
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   115
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   116
procedure AssignStores;
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   117
var t: LongInt;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   118
    i: Longword;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   119
begin
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   120
for t:= 0 to Pred(TeamsCount) do
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   121
   with TeamsArray[t]^ do
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   122
      begin
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   123
      for i:= 0 to cMaxHHIndex do
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   124
          if Hedgehogs[i].Gear <> nil then
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   125
             Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   126
      end
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   127
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   128
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   129
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType);
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   130
var ammos: TAmmoCounts;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   131
    slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   132
    hhammo: PHHAmmo;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   133
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   134
FillChar(ammos, sizeof(ammos), 0);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   135
hhammo:= Hedgehog.Ammo;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   136
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   137
for slot:= 0 to cMaxSlotIndex do
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   138
    for ami:= 0 to cMaxSlotAmmoIndex do
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   139
        if hhammo^[slot, ami].Count > 0 then
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   140
           ammos[hhammo^[slot, ami].AmmoType]:= hhammo^[slot, ami].Count;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   141
941
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   142
if ammos[ammo] <> AMMO_INFINITE then
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   143
   begin
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   144
   inc(ammos[ammo], Ammoz[ammo].NumberInCase);
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   145
   if ammos[ammo] > AMMO_INFINITE then ammos[ammo]:= AMMO_INFINITE
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   146
   end;
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   147
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   148
FillAmmoStore(hhammo, ammos)
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   149
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   150
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   151
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   152
var ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   153
    b: boolean;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   154
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   155
    repeat
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   156
      b:= false;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   157
      ami:= 0;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   158
      while (not b) and (ami < cMaxSlotAmmoIndex) do
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   159
          if (Ammo^[Slot, ami].Count = 0)
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   160
             and (Ammo^[Slot, ami + 1].Count > 0) then b:= true
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   161
                                                  else inc(ami);
2221
koda
parents: 2176
diff changeset
   162
      if b then // there is a free item in ammo stack
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   163
         begin
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   164
         Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   165
         Ammo^[Slot, ami + 1].Count:= 0
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   166
         end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   167
    until not b;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   168
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   169
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   170
procedure OnUsedAmmo(var Hedgehog: THedgehog);
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   171
begin
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   172
with Hedgehog do
971
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   173
	begin
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   174
	with Ammo^[CurSlot, CurAmmo] do
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   175
		if Count <> AMMO_INFINITE then
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   176
			begin
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   177
			dec(Count);
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   178
			if Count = 0 then
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   179
				begin
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   180
				PackAmmo(Ammo, CurSlot);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   181
				SwitchNotHeldAmmo(Hedgehog)
971
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   182
				end
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   183
			end
d2c49b730771 Fix a bug with automatic weapon switching when attacking from rope
unc0rr
parents: 941
diff changeset
   184
	end
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   185
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   186
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   187
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   188
var slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   189
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   190
Slot:= Ammoz[Ammo].Slot;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   191
ami:= 0;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   192
while (ami <= cMaxSlotAmmoIndex) do
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   193
      begin
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   194
      with Hedgehog.Ammo^[Slot, ami] do
941
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   195
            if (AmmoType = Ammo) then
b5222ddafe1f - Fix bug with picking up ammos from cases, when total ammo count may become more than AMMO_INFINITE
unc0rr
parents: 927
diff changeset
   196
               exit((Count > 0) and (Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns));
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   197
      inc(ami)
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   198
      end;
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   199
HHHasAmmo:= false
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   200
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   201
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   202
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   203
begin
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   204
with Hedgehog do
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   205
	begin
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   206
	CurMinAngle:= Ammoz[AmmoType].minAngle;
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   207
	if Ammoz[AmmoType].maxAngle <> 0 then
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   208
		CurMaxAngle:= Ammoz[AmmoType].maxAngle
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   209
	else
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   210
		CurMaxAngle:= cMaxAngle;
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   211
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   212
	with Hedgehog.Gear^ do
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   213
		begin
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   214
		if Angle < CurMinAngle then Angle:= CurMinAngle;
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   215
		if Angle > CurMaxAngle then Angle:= CurMaxAngle;
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   216
		end
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   217
	end
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   218
end;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   219
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   220
procedure SwitchToFirstLegalAmmo(var Hedgehog: THedgehog);
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   221
begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   222
with Hedgehog do
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   223
	begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   224
	CurAmmo:= 0;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   225
	CurSlot:= 0;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   226
	while (CurSlot <= cMaxSlotIndex) and
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   227
		((Ammo^[CurSlot, CurAmmo].Count = 0) or
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   228
		(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   229
		do
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   230
		begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   231
		while (CurAmmo <= cMaxSlotAmmoIndex) and
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   232
			((Ammo^[CurSlot, CurAmmo].Count = 0) or
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   233
			(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   234
			do inc(CurAmmo);
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   235
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   236
		if (CurAmmo > cMaxSlotAmmoIndex) then
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   237
			begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   238
			CurAmmo:= 0;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   239
			inc(CurSlot)
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   240
			end
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   241
		end;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   242
	TryDo(CurSlot <= cMaxSlotIndex, 'Ammo slot index overflow', true)
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   243
	end
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   244
end;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   245
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   246
procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   247
var s: shortstring;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   248
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   249
TargetPoint.X:= NoPointX;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   250
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   251
with Hedgehog do
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   252
	begin
2409
dbf195c3e09c fix a very rare bug in which CurSlot becomes greater than cMaxCurSlot
koda
parents: 2370
diff changeset
   253
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   254
	if (Ammo^[CurSlot, CurAmmo].Count = 0) then
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   255
		SwitchToFirstLegalAmmo(Hedgehog);
2431
23242609c44b Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents: 2409
diff changeset
   256
2409
dbf195c3e09c fix a very rare bug in which CurSlot becomes greater than cMaxCurSlot
koda
parents: 2370
diff changeset
   257
        //bad things could happen here in case CurSlot is overflowing
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   258
	ApplyAngleBounds(Hedgehog, Ammo^[CurSlot, CurAmmo].AmmoType);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   259
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   260
	with Ammo^[CurSlot, CurAmmo] do
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   261
		begin
2357
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   262
        if AmmoType <> amNothing then
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   263
            begin
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   264
		    s:= trammo[Ammoz[AmmoType].NameId];
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   265
		    if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   266
			    s:= s + ' (' + IntToStr(Count) + ')';
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   267
		    if (Propz and ammoprop_Timerable) <> 0 then
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   268
			    s:= s + ', ' + inttostr(Timer div 1000) + ' ' + trammo[sidSeconds];
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   269
		    AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
babe1a55e284 Add an empty weapon to avoid selection of weapons which aren't yet ready. Might all be useful to switch to amNothing in certain situations, like after using up all ropes, instead of bazooka.
nemo
parents: 2246
diff changeset
   270
            end;
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   271
		if (Propz and ammoprop_NeedTarget) <> 0
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   272
			then begin
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   273
			Gear^.State:= Gear^.State or      gstHHChooseTarget;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   274
			isCursorVisible:= true
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   275
			end else begin
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   276
			Gear^.State:= Gear^.State and not gstHHChooseTarget;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   277
			isCursorVisible:= false
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   278
			end;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   279
		ShowCrosshair:= (Propz and ammoprop_NoCrosshair) = 0
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   280
		end
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   281
	end
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   282
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   283
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   284
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   285
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   286
with Hedgehog do
2431
23242609c44b Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents: 2409
diff changeset
   287
	if ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_DontHold) <> 0) or
23242609c44b Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents: 2409
diff changeset
   288
		(Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   289
		SwitchToFirstLegalAmmo(Hedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   290
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   291
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   292
procedure SetWeapon(weap: TAmmoType);
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   293
begin
1850
a0332e79fdc9 a patch :P
unc0rr
parents: 1849
diff changeset
   294
ParseCommand('/setweap ' + char(weap), true)
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   295
end;
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   296
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   297
procedure DisableSomeWeapons;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   298
var i, slot, a: Longword;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   299
	t: TAmmoType;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   300
begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   301
for i:= 0 to Pred(StoreCnt) do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   302
	for slot:= 0 to cMaxSlotIndex do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   303
		begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   304
		for a:= 0 to cMaxSlotAmmoIndex do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   305
			with StoresList[i]^[slot, a] do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   306
				if (Propz and ammoprop_NotBorder) <> 0 then Count:= 0;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   307
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   308
		PackAmmo(StoresList[i], slot)
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   309
		end;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   310
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   311
for t:= Low(TAmmoType) to High(TAmmoType) do
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   312
	if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then Ammoz[t].Probability:= 0
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   313
end;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   314
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   315
end.