hedgewars/uAmmos.pas
author nemo
Sat, 13 Nov 2010 15:32:53 -0500
changeset 4317 ba5d5a2f4c4b
parent 4234 60920aeb1606
child 4330 1e03ca5d4311
permissions -rw-r--r--
merge 0.9.14 back into trunk
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
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2608
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2608
diff changeset
    20
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    21
unit uAmmos;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    22
interface
3033
2a8f385ab466 FillAmmoStore is reused - check for before start of play.
nemo
parents: 3030
diff changeset
    23
uses uConsts, uTeams, uStats;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    24
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
    25
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
    26
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
    27
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    28
procedure AddAmmoStore;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    29
procedure SetAmmoLoadout(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    30
procedure SetAmmoProbability(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    31
procedure SetAmmoDelay(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    32
procedure SetAmmoReinforcement(s: shortstring);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    33
procedure AssignStores;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
    34
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
    35
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    36
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
    37
procedure OnUsedAmmo(var Hedgehog: THedgehog);
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
    38
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
    39
procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
    40
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
    41
procedure SetWeapon(weap: TAmmoType);
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
    42
procedure DisableSomeWeapons;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
    43
procedure ResetWeapons;
3405
8fdb08497bf1 js' patch that restores Vsync on snow leopard
koda
parents: 3346
diff changeset
    44
function  GetAmmoByNum(num: Longword): PHHAmmo;
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
    45
function  GetAmmoEntry(var Hedgehog: THedgehog): PAmmo;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    46
4143
eb7981f34800 Remove the last vestiges of the shoppa hack by adding 2 spinners for percentage health and amount of health in crate, also update translations and increase SD spinner (some users have requested it)
henek
parents: 4141
diff changeset
    47
var StoreCnt: Longword;
1966
31e449e1d9dd nemo's patch + ropes ammo scheme hack
unc0rr
parents: 1964
diff changeset
    48
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    49
implementation
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3836
diff changeset
    50
uses uMisc, uGears, uWorld, uLocale, uConsole, uMobile;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
    51
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    52
type TAmmoCounts = array[TAmmoType] of Longword;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    53
var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo;
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    54
    ammoLoadout, ammoProbability, ammoDelay, ammoReinforcement: shortstring;
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    55
    InitialCounts: array[0..Pred(cMaxHHs)] of TAmmoCounts;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    56
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    57
procedure FillAmmoStore(Ammo: PHHAmmo; var cnts: TAmmoCounts);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    58
var mi: array[0..cMaxSlotIndex] of byte;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    59
    a: TAmmoType;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    60
begin
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
    61
{$HINTS OFF}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    62
FillChar(mi, sizeof(mi), 0);
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
    63
{$HINTS ON}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    64
FillChar(Ammo^, sizeof(Ammo^), 0);
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    65
for a:= Low(TAmmoType) to High(TAmmoType) do
2764
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    66
    begin
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    67
    if cnts[a] > 0 then
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    68
       begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    69
       TryDo(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
    70
       Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= Ammoz[a].Ammo;
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    71
       with Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]] do
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    72
           begin
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    73
           Count:= cnts[a];
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    74
           if (TotalRounds < 0) and ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then Count:= AMMO_INFINITE;
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
    75
           end;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    76
       inc(mi[Ammoz[a].Slot])
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    77
       end
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3407
diff changeset
    78
    else if (TotalRounds < 0) and ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
2764
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    79
       begin
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    80
       TryDo(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true);
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    81
       Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= Ammoz[a].Ammo;
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    82
2767
77c030ac978e Yay for burning through revision numbers
nemo
parents: 2766
diff changeset
    83
       Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]].Count:= AMMO_INFINITE;
2764
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    84
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    85
       inc(mi[Ammoz[a].Slot])
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    86
       end
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    87
    end
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    88
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    89
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    90
procedure AddAmmoStore;
3255
6d6f4241debe Alter distribution of probabilities from frontend, allow utility crates in shoppa if probabilities permit (still ban health crates)
nemo
parents: 3114
diff changeset
    91
const probability: array [0..8] of LongWord = (0,20,30,60,100,200,400,600,800);
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    92
var cnt: Longword;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    93
    a: TAmmoType;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    94
    ammos: TAmmoCounts;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    95
begin
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    96
TryDo((byte(ammoLoadout[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoProbability[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoDelay[0]) = byte(ord(High(TAmmoType)))) and (byte(ammoReinforcement[0]) = byte(ord(High(TAmmoType)))), 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)', true);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    97
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    98
inc(StoreCnt);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    99
TryDo(StoreCnt <= cMaxHHs, 'Ammo stores overflow', true);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   100
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   101
new(StoresList[Pred(StoreCnt)]);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   102
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   103
for a:= Low(TAmmoType) to High(TAmmoType) do
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   104
    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
   105
    if a <> amNothing then
1895
7ba647a88b2f More game options by nemo
unc0rr
parents: 1865
diff changeset
   106
        begin
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   107
        Ammoz[a].Probability:= probability[byte(ammoProbability[ord(a)]) - byte('0')];
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   108
        Ammoz[a].SkipTurns:= (byte(ammoDelay[ord(a)]) - byte('0'));
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   109
        Ammoz[a].NumberInCase:= (byte(ammoReinforcement[ord(a)]) - byte('0'));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   110
        if (TrainingFlags and tfIgnoreDelays) <> 0 then Ammoz[a].SkipTurns:= 0;
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   111
        cnt:= byte(ammoLoadout[ord(a)]) - byte('0');
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   112
        // 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
   113
        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
   114
            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
   115
            cnt:= AMMO_INFINITE;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   116
            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
   117
            end;
2860
13a53315ae18 Awesome patch from TheException - adds editing of weapon delay and crate count. Tiy might want to tweak the crate graphic, could make be smaller or less overlappy.
nemo
parents: 2855
diff changeset
   118
        if Ammoz[a].NumberInCase = 0 then Ammoz[a].Probability:= 0;
13a53315ae18 Awesome patch from TheException - adds editing of weapon delay and crate count. Tiy might want to tweak the crate graphic, could make be smaller or less overlappy.
nemo
parents: 2855
diff changeset
   119
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   120
        // avoid things we already have by scheme
2461
5e58b1e3210b Tweak shoppa probabilities
nemo
parents: 2457
diff changeset
   121
        // merge this into DisableSomeWeapons ?
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
   122
        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
   123
           ((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
   124
           ((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
   125
           ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0)) then
2128
903fdb9f44b0 explicit nesting
nemo
parents: 2073
diff changeset
   126
            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
   127
            cnt:= 0;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   128
            Ammoz[a].Probability:= 0
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   129
            end;
2457
ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets
nemo
parents: 2453
diff changeset
   130
        ammos[a]:= cnt;
2730
f56592281526 Remove king invulnerability, disable everything but teleport instead.
nemo
parents: 2716
diff changeset
   131
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3407
diff changeset
   132
        if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) and (Ammoz[a].SkipTurns = 0) and (a <> amTeleport) and (a <> amSkip) then
2732
d893901eff4a Only add turn timeout for weapons that don't already have a timeout
nemo
parents: 2731
diff changeset
   133
            Ammoz[a].SkipTurns:= 1;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   134
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   135
        if ((GameFlags and gfPlaceHog) <> 0) and
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3407
diff changeset
   136
            (a <> amTeleport) and (a <> amSkip) and
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   137
            (Ammoz[a].SkipTurns < 10000) then inc(Ammoz[a].SkipTurns,10000)
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   138
        end 
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   139
    else ammos[a]:= AMMO_INFINITE;
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   140
    InitialCounts[Pred(StoreCnt)][a]:= ammos[a];
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   141
    end;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   142
FillAmmoStore(StoresList[Pred(StoreCnt)], ammos)
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   143
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   144
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   145
function GetAmmoByNum(num: Longword): PHHAmmo;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   146
begin
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   147
TryDo(num < StoreCnt, 'Invalid store number', true);
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   148
exit(StoresList[num])
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   149
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   150
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   151
function GetAmmoEntry(var Hedgehog: THedgehog): PAmmo;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   152
var ammoidx, slot: LongWord;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   153
begin
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   154
with Hedgehog do
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   155
    begin
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   156
    slot:= Ammoz[CurAmmoType].Slot;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   157
    ammoidx:= 0;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   158
    while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   159
    GetAmmoEntry:= @Ammo^[slot, ammoidx];
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   160
    end
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   161
end;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   162
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   163
procedure AssignStores;
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   164
var t: LongInt;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   165
    i: Longword;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   166
begin
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   167
for t:= 0 to Pred(TeamsCount) do
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   168
   with TeamsArray[t]^ do
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   169
      begin
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   170
      for i:= 0 to cMaxHHIndex do
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   171
          if Hedgehogs[i].Gear <> nil then
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   172
             begin
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   173
             Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore);
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   174
             Hedgehogs[i].CurAmmoType:= amNothing;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   175
             end
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   176
      end
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   177
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   178
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   179
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType);
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   180
var ammos: TAmmoCounts;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   181
    slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   182
    hhammo: PHHAmmo;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   183
begin
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
   184
{$HINTS OFF}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   185
FillChar(ammos, sizeof(ammos), 0);
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
   186
{$HINTS ON}
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   187
hhammo:= Hedgehog.Ammo;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   188
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   189
for slot:= 0 to cMaxSlotIndex do
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   190
    for ami:= 0 to cMaxSlotAmmoIndex do
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   191
        if hhammo^[slot, ami].Count > 0 then
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   192
           ammos[hhammo^[slot, ami].AmmoType]:= hhammo^[slot, ami].Count;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   193
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
   194
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
   195
   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
   196
   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
   197
   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
   198
   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
   199
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   200
FillAmmoStore(hhammo, ammos)
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   201
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   202
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   203
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   204
var ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   205
    b: boolean;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   206
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   207
    repeat
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   208
      b:= false;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   209
      ami:= 0;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   210
      while (not b) and (ami < cMaxSlotAmmoIndex) do
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   211
          if (Ammo^[Slot, ami].Count = 0)
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   212
             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
   213
                                                  else inc(ami);
2221
koda
parents: 2176
diff changeset
   214
      if b then // there is a free item in ammo stack
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   215
         begin
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   216
         Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   217
         Ammo^[Slot, ami + 1].Count:= 0
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   218
         end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   219
    until not b;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   220
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   221
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   222
procedure OnUsedAmmo(var Hedgehog: THedgehog);
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   223
var CurWeapon: PAmmo;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   224
begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   225
CurWeapon:= GetAmmoEntry(Hedgehog);
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   226
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   227
    begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   228
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   229
    MultiShootAttacks:= 0;
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   230
    with CurWeapon^ do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   231
        if Count <> AMMO_INFINITE then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   232
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   233
            dec(Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   234
            if Count = 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   235
                begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   236
                PackAmmo(Ammo, Ammoz[AmmoType].Slot);
3931
fd04228971b3 Set ammo to amNothing after using up the current ammo. This should reduce noob fail where they blow themselves up w/ bazooka.
nemo
parents: 3836
diff changeset
   237
                //SwitchNotHeldAmmo(Hedgehog);
4234
60920aeb1606 hide crosshair when switching to no weapon
nemo
parents: 4148
diff changeset
   238
                ShowCrossHair:= false;
3931
fd04228971b3 Set ammo to amNothing after using up the current ammo. This should reduce noob fail where they blow themselves up w/ bazooka.
nemo
parents: 3836
diff changeset
   239
                CurAmmoType:= amNothing
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   240
                end
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   241
            end
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3836
diff changeset
   242
    end;
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3943
diff changeset
   243
perfExt_AmmoUpdate;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   244
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
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
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): boolean;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   247
var slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   248
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   249
Slot:= Ammoz[Ammo].Slot;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   250
ami:= 0;
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   251
while (ami <= cMaxSlotAmmoIndex) do
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   252
      begin
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   253
      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
   254
            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
   255
               exit((Count > 0) and (Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns));
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   256
      inc(ami)
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   257
      end;
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   258
HHHasAmmo:= false
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   259
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   260
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   261
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   262
begin
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   263
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   264
    begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   265
    CurMinAngle:= Ammoz[AmmoType].minAngle;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   266
    if Ammoz[AmmoType].maxAngle <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   267
        CurMaxAngle:= Ammoz[AmmoType].maxAngle
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   268
    else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   269
        CurMaxAngle:= cMaxAngle;
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   270
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   271
    with Hedgehog.Gear^ do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   272
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   273
        if Angle < CurMinAngle then Angle:= CurMinAngle;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   274
        if Angle > CurMaxAngle then Angle:= CurMaxAngle;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   275
        end
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   276
    end
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   277
end;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   278
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   279
procedure SwitchToFirstLegalAmmo(var Hedgehog: THedgehog);
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   280
var slot, ammoidx: LongWord;
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   281
begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   282
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   283
    begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   284
    CurAmmoType:= amNothing;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   285
    slot:= 0;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   286
    ammoidx:= 0;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   287
    while (slot <= cMaxSlotIndex) and
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   288
        ((Ammo^[slot, ammoidx].Count = 0) or
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   289
        (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   290
        do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   291
        begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   292
        while (ammoidx <= cMaxSlotAmmoIndex) and
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   293
            ((Ammo^[slot, ammoidx].Count = 0) or
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   294
            (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   295
            do inc(ammoidx);
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   296
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   297
        if (ammoidx > cMaxSlotAmmoIndex) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   298
            begin
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   299
            ammoidx:= 0;
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   300
            inc(slot)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   301
            end
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   302
        end;
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   303
    TryDo(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true);
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   304
    CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   305
    end
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   306
end;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   307
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   308
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
   309
var s: shortstring;
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   310
    CurWeapon: PAmmo;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   311
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   312
TargetPoint.X:= NoPointX;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   313
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   314
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   315
    begin
3030
411146650700 Remove Timer2 from Gear, add a Timer to Hedgehog
nemo
parents: 3028
diff changeset
   316
    Timer:= 10;
2409
dbf195c3e09c fix a very rare bug in which CurSlot becomes greater than cMaxCurSlot
koda
parents: 2370
diff changeset
   317
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   318
    CurWeapon:= GetAmmoEntry(Hedgehog);
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   319
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   320
    if (CurWeapon^.Count = 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   321
        SwitchToFirstLegalAmmo(Hedgehog);
2431
23242609c44b Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents: 2409
diff changeset
   322
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   323
    CurWeapon:= GetAmmoEntry(Hedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   324
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   325
    ApplyAngleBounds(Hedgehog, CurWeapon^.AmmoType);
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   326
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   327
    with CurWeapon^ do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   328
        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
   329
        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
   330
            begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   331
            s:= trammo[Ammoz[AmmoType].NameId];
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   332
            if (Count <> AMMO_INFINITE) and not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0)) then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   333
                s:= s + ' (' + IntToStr(Count) + ')';
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   334
            if (Propz and ammoprop_Timerable) <> 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   335
                s:= s + ', ' + inttostr(Timer div 1000) + ' ' + trammo[sidSeconds];
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   336
            AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
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
   337
            end;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   338
        if (Propz and ammoprop_NeedTarget) <> 0
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   339
            then begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   340
            Gear^.State:= Gear^.State or      gstHHChooseTarget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   341
            isCursorVisible:= true
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   342
            end else begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   343
            Gear^.State:= Gear^.State and not gstHHChooseTarget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   344
            isCursorVisible:= false
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   345
            end;
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   346
        if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   347
            ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0
3114
3a3d1ee2ebd0 Tidier way to handle crosshair drawing. show/hide based on CurAmmoGear for alt attack weps
nemo
parents: 3075
diff changeset
   348
        else
3a3d1ee2ebd0 Tidier way to handle crosshair drawing. show/hide based on CurAmmoGear for alt attack weps
nemo
parents: 3075
diff changeset
   349
            ShowCrosshair:= (Propz and ammoprop_NoCrosshair) = 0;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   350
        end
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3836
diff changeset
   351
    end;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   352
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   353
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   354
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
   355
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   356
with Hedgehog do
3836
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   357
    if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_DontHold) <> 0) or
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon.
nemo
parents: 3697
diff changeset
   358
        (Ammoz[CurAmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   359
        SwitchToFirstLegalAmmo(Hedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   360
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   361
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   362
procedure SetWeapon(weap: TAmmoType);
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   363
begin
1850
a0332e79fdc9 a patch :P
unc0rr
parents: 1849
diff changeset
   364
ParseCommand('/setweap ' + char(weap), true)
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   365
end;
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   366
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   367
procedure DisableSomeWeapons;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   368
var i, slot, a: Longword;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   369
    t: TAmmoType;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   370
begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   371
for i:= 0 to Pred(StoreCnt) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   372
    for slot:= 0 to cMaxSlotIndex do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   373
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   374
        for a:= 0 to cMaxSlotAmmoIndex do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   375
            with StoresList[i]^[slot, a] do
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3407
diff changeset
   376
                if (Propz and ammoprop_NotBorder) <> 0 then
3319
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   377
                    begin
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   378
                    Count:= 0;
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   379
                    InitialCounts[i][AmmoType]:= 0
3319
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   380
                    end;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   381
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   382
        PackAmmo(StoresList[i], slot)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   383
        end;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   384
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   385
for t:= Low(TAmmoType) to High(TAmmoType) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   386
    if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then Ammoz[t].Probability:= 0
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   387
end;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   388
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   389
procedure SetAmmoLoadout(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   390
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   391
    ammoLoadout:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   392
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   393
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   394
procedure SetAmmoProbability(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   395
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   396
    ammoProbability:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   397
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   398
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   399
procedure SetAmmoDelay(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   400
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   401
    ammoDelay:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   402
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   403
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   404
procedure SetAmmoReinforcement(s: shortstring);
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   405
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   406
    ammoReinforcement:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   407
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   408
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   409
// Restore indefinitely disabled weapons and initial weapon counts.  Only used for hog placement right now
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   410
procedure ResetWeapons;
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   411
var i, t: Longword;
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   412
    a: TAmmoType;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   413
begin
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   414
for t:= 0 to Pred(TeamsCount) do
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   415
   with TeamsArray[t]^ do
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   416
      for i:= 0 to cMaxHHIndex do
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   417
          if Hedgehogs[i].Gear <> nil then
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   418
             FillAmmoStore(Hedgehogs[i].Ammo, InitialCounts[Hedgehogs[i].AmmoStore]);
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   419
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   420
for a:= Low(TAmmoType) to High(TAmmoType) do
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   421
    if Ammoz[a].SkipTurns >= 10000 then dec(Ammoz[a].SkipTurns,10000)
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   422
end;
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   423
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
   424
procedure initModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   425
begin
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   426
    StoreCnt:= 0;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   427
    ammoLoadout:= '';
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   428
    ammoProbability:= '';
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   429
    ammoDelay:= '';
3951
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   430
    ammoReinforcement:= '';
c9a63db3e603 Correct another bug in slot switching, adjust width of theme list, really truly fix reset of weps (I hope) should also fix infinite teleport bug in place hogs mode. Slow update of health to 5s for inf attack mode.
nemo
parents: 3943
diff changeset
   431
    FillChar(InitialCounts, sizeof(InitialCounts), 0)
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   432
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   433
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
   434
procedure freeModule;
2715
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   435
var i: LongWord;
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   436
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   437
    if StoreCnt > 0 then
3052
unc0rr
parents: 3038
diff changeset
   438
        for i:= 0 to Pred(StoreCnt) do Dispose(StoresList[i])
2715
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   439
end;
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   440
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   441
end.