hedgewars/uAmmos.pas
author alfadur
Sat, 13 Apr 2019 00:16:23 +0300
changeset 14821 2107fd023733
parent 13875 ccfbc5f59c52
child 15241 ceb289e8a582
permissions -rw-r--r--
fix client ingame flag
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
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10818
diff changeset
     3
 * Copyright (c) 2004-2015 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
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10105
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
393
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
7754
e81dc9bef8b8 First pass at cleaver.
nemo
parents: 7426
diff changeset
    23
uses uConsts, uTypes, uStore;
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;
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
    29
procedure SetAmmoLoadout(var s: shortstring);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
    30
procedure SetAmmoProbability(var s: shortstring);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
    31
procedure SetAmmoDelay(var s: shortstring);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
    32
procedure SetAmmoReinforcement(var 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);
7337
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
    35
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; amt: LongWord);
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
    36
procedure SetAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; cnt: LongWord);
6770
7d2c6cdb816a Start on adding drowning bonus to bat/firepunch/whip. AI still is not smart enough to change direction when firepunching to face the water, or change the angle of the bat.
nemo
parents: 6762
diff changeset
    37
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): LongWord;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
    38
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
    39
procedure OnUsedAmmo(var Hedgehog: THedgehog);
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
    40
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
    41
procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
    42
procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
    43
procedure SetWeapon(weap: TAmmoType);
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
    44
procedure DisableSomeWeapons;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
    45
procedure ResetWeapons;
10560
9f09196d92a6 fix some pas2c related issues
sheepluva
parents: 10443
diff changeset
    46
function  GetAmmoByNum(num: LongInt): PHHAmmo;
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
    47
function  GetCurAmmoEntry(var Hedgehog: THedgehog): PAmmo;
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
    48
function  GetAmmoEntry(var Hedgehog: THedgehog; am: TAmmoType): PAmmo;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    49
10560
9f09196d92a6 fix some pas2c related issues
sheepluva
parents: 10443
diff changeset
    50
var StoreCnt: LongInt;
1966
31e449e1d9dd nemo's patch + ropes ammo scheme hack
unc0rr
parents: 1964
diff changeset
    51
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    52
implementation
12156
9755922396f5 Lua callback: onUsedAmmo, after using up an ammo
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
    53
uses uVariables, uCommands, uUtils, uCaptions, uDebug, uScript;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
    54
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
    55
type TAmmoArray = array[TAmmoType] of TAmmo;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    56
var StoresList: array[0..Pred(cMaxHHs)] of PHHAmmo;
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    57
    ammoLoadout, ammoProbability, ammoDelay, ammoReinforcement: shortstring;
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
    58
    InitialCountsLocal: array[0..Pred(cMaxHHs)] of TAmmoCounts;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    59
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
    60
procedure FillAmmoStore(Ammo: PHHAmmo; var newAmmo: TAmmoArray);
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    61
var mi: array[0..cMaxSlotIndex] of byte;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    62
    a: TAmmoType;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    63
begin
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
    64
{$HINTS OFF}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    65
FillChar(mi, sizeof(mi), 0);
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
    66
{$HINTS ON}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    67
FillChar(Ammo^, sizeof(Ammo^), 0);
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    68
for a:= Low(TAmmoType) to High(TAmmoType) do
2764
2613de505d8d Allow for ammos w/o teleports
nemo
parents: 2762
diff changeset
    69
    begin
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
    70
    if newAmmo[a].Count > 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
    71
        begin
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
    72
        if checkFails(mi[Ammoz[a].Slot] <= cMaxSlotAmmoIndex, 'Ammo slot overflow', true) then exit;
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
    73
        Ammo^[Ammoz[a].Slot, mi[Ammoz[a].Slot]]:= newAmmo[a];
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
    74
        inc(mi[Ammoz[a].Slot])
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
    75
        end
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6624
diff changeset
    76
    end;
930d5f070196 unbreak ammo menu
nemo
parents: 6624
diff changeset
    77
AmmoMenuInvalidated:= true;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    78
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    79
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
    80
procedure AddAmmoStore;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    81
var cnt: Longword;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    82
    a: TAmmoType;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
    83
    ammos: TAmmoCounts;
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
    84
    newAmmos: TAmmoArray;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    85
begin
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
    86
    if checkFails((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))))
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
    87
                  , 'Incomplete or missing ammo scheme set (incompatible frontend or demo/save?)'
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
    88
                  , true)
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
    89
    then exit;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    90
11534
0ead3a2e0309 Fix a crasher
unc0rr
parents: 11532
diff changeset
    91
if checkFails(StoreCnt < cMaxHHs, 'Ammo stores overflow', true) then exit;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    92
inc(StoreCnt);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    93
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    94
new(StoresList[Pred(StoreCnt)]);
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    95
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    96
for a:= Low(TAmmoType) to High(TAmmoType) do
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
    97
    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
    98
    if a <> amNothing then
1895
7ba647a88b2f More game options by nemo
unc0rr
parents: 1865
diff changeset
    99
        begin
13456
794dcf69a5aa New Lua API function: GetAmmo, to get ammo config
Wuzzy <Wuzzy2@mail.ru>
parents: 12733
diff changeset
   100
        Ammoz[a].Probability:= probabilityLevels[byte(ammoProbability[ord(a)]) - byte('0')];
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   101
        Ammoz[a].SkipTurns:= (byte(ammoDelay[ord(a)]) - byte('0'));
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   102
        Ammoz[a].NumberInCase:= (byte(ammoReinforcement[ord(a)]) - byte('0'));
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   103
        cnt:= byte(ammoLoadout[ord(a)]) - byte('0');
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   104
        // 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
   105
        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
   106
            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
   107
            cnt:= AMMO_INFINITE;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   108
            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
   109
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   110
        if Ammoz[a].NumberInCase = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   111
            Ammoz[a].Probability:= 0;
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
   112
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   113
        // avoid things we already have by scheme
2461
5e58b1e3210b Tweak shoppa probabilities
nemo
parents: 2457
diff changeset
   114
        // merge this into DisableSomeWeapons ?
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   115
        if ((a = amLowGravity) and ((GameFlags and gfLowGravity) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   116
        or ((a = amInvulnerable) and ((GameFlags and gfInvulnerable) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   117
        or ((a = amLaserSight) and ((GameFlags and gfLaserSight) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   118
        or ((a = amVampiric) and ((GameFlags and gfVampiric) <> 0))
13875
ccfbc5f59c52 Hide creeper from frontend, prevent addition of creeper ammo via ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents: 13504
diff changeset
   119
        or ((a = amExtraTime) and (cHedgehogTurnTime >= 1000000))
ccfbc5f59c52 Hide creeper from frontend, prevent addition of creeper ammo via ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents: 13504
diff changeset
   120
        // Always remove creeper because it's unfinished.
ccfbc5f59c52 Hide creeper from frontend, prevent addition of creeper ammo via ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents: 13504
diff changeset
   121
        // TODO: Re-enable creeper when creeper is done
ccfbc5f59c52 Hide creeper from frontend, prevent addition of creeper ammo via ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents: 13504
diff changeset
   122
        or (a = amCreeper) then
2128
903fdb9f44b0 explicit nesting
nemo
parents: 2073
diff changeset
   123
            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
   124
            cnt:= 0;
2370
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   125
            Ammoz[a].Probability:= 0
2ff8fce5e06f - Support probabilies from ammo scheme in engine
unc0rr
parents: 2369
diff changeset
   126
            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
   127
        ammos[a]:= cnt;
2730
f56592281526 Remove king invulnerability, disable everything but teleport instead.
nemo
parents: 2716
diff changeset
   128
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   129
        if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   130
        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
   131
            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
   132
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   133
        if ((GameFlags and gfPlaceHog) <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   134
        and (a <> amTeleport) and (a <> amSkip)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   135
        and (Ammoz[a].SkipTurns < 10000) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   136
            inc(Ammoz[a].SkipTurns,10000);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   137
    if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   138
        ammos[a]:= AMMO_INFINITE
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   139
        end
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   140
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   141
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   142
        ammos[a]:= AMMO_INFINITE;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   143
    if ((GameFlags and gfPlaceHog) <> 0) and (a = amTeleport) then
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   144
        begin
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   145
        InitialCountsLocal[Pred(StoreCnt)][a]:= cnt;
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   146
        InitialAmmoCounts[a]:= cnt;
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   147
        end
4344
23ab3bdbf218 This should fix Chip's bug with unlimited teleports. Also remove more hog placement special behaviour and just use ResetWeapons with a check against PlacingHogs mode
nemo
parents: 4339
diff changeset
   148
    else
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   149
        begin
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   150
        InitialCountsLocal[Pred(StoreCnt)][a]:= ammos[a];
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   151
        InitialAmmoCounts[a]:= ammos[a];
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   152
        end
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   153
    end;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   154
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   155
    for a:= Low(TAmmoType) to High(TAmmoType) do
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   156
        begin
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   157
        newAmmos[a]:= Ammoz[a].Ammo;
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   158
        newAmmos[a].Count:= ammos[a]
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   159
        end;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   160
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   161
FillAmmoStore(StoresList[Pred(StoreCnt)], newAmmos)
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   162
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   163
10560
9f09196d92a6 fix some pas2c related issues
sheepluva
parents: 10443
diff changeset
   164
function GetAmmoByNum(num: LongInt): PHHAmmo;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   165
begin
13504
c41b16ac2e05 Clarify the wording of a few checkFails messages
Wuzzy <Wuzzy2@mail.ru>
parents: 13457
diff changeset
   166
    if checkFails(num < StoreCnt, 'Invalid ammo store number', true) then
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
   167
        GetAmmoByNum:= nil
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
   168
    else
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
   169
        GetAmmoByNum:= StoresList[num]
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   170
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   171
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   172
function GetCurAmmoEntry(var Hedgehog: THedgehog): PAmmo;
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   173
begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   174
    GetCurAmmoEntry:= GetAmmoEntry(Hedgehog, Hedgehog.CurAmmoType)
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   175
end;
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   176
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   177
function GetAmmoEntry(var Hedgehog: THedgehog; am: TAmmoType): PAmmo;
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
   178
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
   179
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
   180
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
   181
    begin
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   182
    slot:= Ammoz[am].Slot;
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
   183
    ammoidx:= 0;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   184
    while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> am) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   185
        inc(ammoidx);
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
   186
    GetAmmoEntry:= @Ammo^[slot, ammoidx];
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   187
    if (Ammo^[slot, ammoidx].AmmoType <> am) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   188
        GetAmmoEntry:= GetAmmoEntry(Hedgehog, amNothing)
5676
a655dfab27d7 Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents: 5640
diff changeset
   189
    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
   190
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
   191
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   192
procedure AssignStores;
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   193
var t: LongInt;
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   194
    i: Longword;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   195
begin
547
b81a055f2d06 Convert teams list to array
unc0rr
parents: 545
diff changeset
   196
for t:= 0 to Pred(TeamsCount) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   197
    with TeamsArray[t]^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   198
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   199
        for i:= 0 to cMaxHHIndex do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   200
            if Hedgehogs[i].Gear <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   201
                begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   202
                Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   203
                if (GameFlags and gfPlaceHog) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   204
                    Hedgehogs[i].CurAmmoType:= amTeleport
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   205
                else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   206
                    Hedgehogs[i].CurAmmoType:= amNothing
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   207
                end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   208
        end
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   209
end;
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   210
7337
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   211
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; amt: LongWord);
5273
nemo
parents: 5272
diff changeset
   212
var cnt: LongWord;
5676
a655dfab27d7 Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents: 5640
diff changeset
   213
    a: PAmmo;
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   214
begin
5676
a655dfab27d7 Scripting changes. Add override of mapgen, templatefilter. Expose waterline, add "GetAmmoCount". Default to amNothing in uAmmos if entry is not found.
nemo
parents: 5640
diff changeset
   215
a:= GetAmmoEntry(Hedgehog, ammo);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   216
if (a^.AmmoType <> amNothing) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   217
    cnt:= a^.Count
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   218
else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   219
    cnt:= 0;
12733
353cb2ce6f9c Fix AddAmmo setting ammo to 99 when trying to add infinite ammo
Wuzzy <Wuzzy2@mail.ru>
parents: 12691
diff changeset
   220
if (cnt >= AMMO_INFINITE) or (amt >= AMMO_INFINITE) then
353cb2ce6f9c Fix AddAmmo setting ammo to 99 when trying to add infinite ammo
Wuzzy <Wuzzy2@mail.ru>
parents: 12691
diff changeset
   221
    cnt:= AMMO_INFINITE
353cb2ce6f9c Fix AddAmmo setting ammo to 99 when trying to add infinite ammo
Wuzzy <Wuzzy2@mail.ru>
parents: 12691
diff changeset
   222
else
12671
87b3009f51c3 Fix team getting inf. ammo when stockpiling >= 100 ammo
Wuzzy <almikes@aol.com>
parents: 12649
diff changeset
   223
    cnt:= min(AMMO_FINITE_MAX, cnt + amt);
12733
353cb2ce6f9c Fix AddAmmo setting ammo to 99 when trying to add infinite ammo
Wuzzy <Wuzzy2@mail.ru>
parents: 12691
diff changeset
   224
SetAmmo(Hedgehog, ammo, cnt);
5272
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   225
end;
a85d331ab5bb Allow scripting to set arbitrary weapon counts
nemo
parents: 5167
diff changeset
   226
7337
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   227
procedure AddAmmo(var Hedgehog: THedgehog; ammo: TAmmoType);
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   228
begin
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   229
    AddAmmo(Hedgehog, ammo, Ammoz[ammo].NumberInCase);
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   230
end;
c224cd2d32f3 Allow script to set number of ammo in a crate. untested.
nemo
parents: 7037
diff changeset
   231
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   232
procedure SetAmmo(var Hedgehog: THedgehog; ammo: TAmmoType; cnt: LongWord);
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   233
var ammos: TAmmoArray;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   234
    slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   235
    hhammo: PHHAmmo;
5316
191cd6c06203 Allow control of grenade bounce. Not sure if this is a good idea, but has been requested a lot, so...
nemo
parents: 5273
diff changeset
   236
    CurWeapon: PAmmo;
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   237
    a: TAmmoType;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   238
begin
9660
267c0005baaf Prevent using SetAmmo to set amNothing to anything.
nemo
parents: 9391
diff changeset
   239
if ammo = amNothing then exit;
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
   240
{$HINTS OFF}
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   241
FillChar(ammos, sizeof(ammos), 0);
3407
dcc129c4352e Engine:
smxx
parents: 3405
diff changeset
   242
{$HINTS ON}
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   243
hhammo:= Hedgehog.Ammo;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   244
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   245
for a:= Low(TAmmoType) to High(TAmmoType) do
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   246
    begin
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   247
    ammos[a]:= Ammoz[a].Ammo;
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   248
    ammos[a].Count:= 0
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   249
    end;
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   250
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   251
for slot:= 0 to cMaxSlotIndex do
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   252
    for ami:= 0 to cMaxSlotAmmoIndex do
351
29bc9c36ad5f Fixed-point arithmetics in engine.
unc0rr
parents: 295
diff changeset
   253
        if hhammo^[slot, ami].Count > 0 then
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   254
            ammos[hhammo^[slot, ami].AmmoType]:= hhammo^[slot, ami];
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   255
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   256
ammos[ammo].Count:= cnt;
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   257
if ammos[ammo].Count > AMMO_INFINITE then ammos[ammo].Count:= AMMO_INFINITE;
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
   258
5316
191cd6c06203 Allow control of grenade bounce. Not sure if this is a good idea, but has been requested a lot, so...
nemo
parents: 5273
diff changeset
   259
FillAmmoStore(hhammo, ammos);
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   260
CurWeapon:= GetCurAmmoEntry(Hedgehog);
5345
3c5480e91951 Simplify code using 'with', convert some tabs to spaces
unc0rr
parents: 5316
diff changeset
   261
with Hedgehog, CurWeapon^ do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   262
    if (Count = 0) or (AmmoType = amNothing) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   263
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   264
        PackAmmo(Ammo, Ammoz[AmmoType].Slot);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   265
        CurAmmoType:= amNothing
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   266
        end
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   267
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   268
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   269
procedure PackAmmo(Ammo: PHHAmmo; Slot: LongInt);
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   270
var ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   271
    b: boolean;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   272
begin
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   273
    repeat
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   274
        b:= false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   275
        ami:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   276
        while (not b) and (ami < cMaxSlotAmmoIndex) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   277
            if (Ammo^[Slot, ami].Count = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   278
            and (Ammo^[Slot, ami + 1].Count > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   279
                b:= true
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   280
            else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   281
                inc(ami);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   282
        if b then // there is a free item in ammo stack
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   283
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   284
            Ammo^[Slot, ami]:= Ammo^[Slot, ami + 1];
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   285
            Ammo^[Slot, ami + 1].Count:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   286
            end;
8026
4a4f21070479 merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents: 7754
diff changeset
   287
    until (not b);
6631
930d5f070196 unbreak ammo menu
nemo
parents: 6624
diff changeset
   288
AmmoMenuInvalidated:= true;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   289
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   290
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   291
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
   292
var CurWeapon: PAmmo;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   293
begin
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   294
CurWeapon:= GetCurAmmoEntry(Hedgehog);
534
92fb2b0d5117 - Fix some bugs
unc0rr
parents: 394
diff changeset
   295
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   296
    begin
12156
9755922396f5 Lua callback: onUsedAmmo, after using up an ammo
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
   297
    if CurAmmoType <> amNothing then
9755922396f5 Lua callback: onUsedAmmo, after using up an ammo
Wuzzy <almikes@aol.com>
parents: 11939
diff changeset
   298
        ScriptCall('onUsedAmmo', ord(CurAmmoType));
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
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   300
    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
   301
    with CurWeapon^ do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   302
        if Count <> AMMO_INFINITE then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   303
            begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   304
            dec(Count);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   305
            if Count = 0 then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   306
                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
   307
                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
   308
                //SwitchNotHeldAmmo(Hedgehog);
7754
e81dc9bef8b8 First pass at cleaver.
nemo
parents: 7426
diff changeset
   309
                if CurAmmoType = amKnife then LoadHedgehogHat(Hedgehog, Hedgehog.Hat);
9006
552517b23882 bleah. sorry for spam. this reverts the first attempt in uAmmos
nemo
parents: 9004
diff changeset
   310
                CurAmmoType:= amNothing
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   311
                end
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   312
            end
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3836
diff changeset
   313
    end;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   314
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   315
6770
7d2c6cdb816a Start on adding drowning bonus to bat/firepunch/whip. AI still is not smart enough to change direction when firepunching to face the water, or change the angle of the bat.
nemo
parents: 6762
diff changeset
   316
function  HHHasAmmo(var Hedgehog: THedgehog; Ammo: TAmmoType): LongWord;
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 351
diff changeset
   317
var slot, ami: LongInt;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   318
begin
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   319
    HHHasAmmo:= 0;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   320
    Slot:= Ammoz[Ammo].Slot;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   321
    ami:= 0;
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   322
    while (ami <= cMaxSlotAmmoIndex) do
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   323
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   324
        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
   325
            if (AmmoType = Ammo) then
6770
7d2c6cdb816a Start on adding drowning bonus to bat/firepunch/whip. AI still is not smart enough to change direction when firepunching to face the water, or change the angle of the bat.
nemo
parents: 6762
diff changeset
   326
                if Hedgehog.Team^.Clan^.TurnNumber > Ammoz[AmmoType].SkipTurns then
7037
7edce323558f uAmmos.c now compiles (3 warnings though)
unc0rr
parents: 6990
diff changeset
   327
                    exit(Count)
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   328
                else
7037
7edce323558f uAmmos.c now compiles (3 warnings though)
unc0rr
parents: 6990
diff changeset
   329
                    exit(0);
6990
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   330
        inc(ami)
40e5af28d026 change every return value into a more pascal-ish form, using the name of the fucntion (helps the parser and macpas compaitilibity)
koda
parents: 6924
diff changeset
   331
    end;
295
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   332
end;
8834f3cb620e - Implement ammo cases
unc0rr
parents: 288
diff changeset
   333
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   334
procedure ApplyAngleBounds(var Hedgehog: THedgehog; AmmoType: TAmmoType);
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   335
begin
7341
d70478d265ec Fix crash when hedgehog dies while switching from it
unc0rr
parents: 7337
diff changeset
   336
if Hedgehog.Gear <> nil then
d70478d265ec Fix crash when hedgehog dies while switching from it
unc0rr
parents: 7337
diff changeset
   337
    with Hedgehog do
d70478d265ec Fix crash when hedgehog dies while switching from it
unc0rr
parents: 7337
diff changeset
   338
        begin
9717
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   339
        if (AmmoType <> amNothing) then
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   340
            begin
12691
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   341
            if ((CurAmmoGear <> nil) and (CurAmmoGear^.AmmoType = amRope)) then
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   342
                begin
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   343
                CurMaxAngle:= Ammoz[amRope].maxAngle;
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   344
                CurMinAngle:= Ammoz[amRope].minAngle;
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   345
                end
9717
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   346
            else
12691
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   347
                begin
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   348
                CurMinAngle:= Ammoz[AmmoType].minAngle;
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   349
                if Ammoz[AmmoType].maxAngle <> 0 then
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   350
                    CurMaxAngle:= Ammoz[AmmoType].maxAngle
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   351
                else
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   352
                    CurMaxAngle:= cMaxAngle;
286afe079117 Fix rope angle possible to go below 0° if having secondary weapon selected
Wuzzy <almikes@aol.com>
parents: 12671
diff changeset
   353
                end;
1964
dc9ea05c9d2f - Another way of defining official server
unc0rr
parents: 1922
diff changeset
   354
9717
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   355
            with Hedgehog.Gear^ do
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   356
                begin
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   357
                if Angle < CurMinAngle then
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   358
                    Angle:= CurMinAngle;
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   359
                if Angle > CurMaxAngle then
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   360
                    Angle:= CurMaxAngle;
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   361
                end
7341
d70478d265ec Fix crash when hedgehog dies while switching from it
unc0rr
parents: 7337
diff changeset
   362
            end
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   363
        end
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   364
end;
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   365
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   366
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
   367
var slot, ammoidx: LongWord;
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   368
begin
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   369
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   370
    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
   371
    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
   372
    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
   373
    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
   374
    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
   375
        ((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
   376
        (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
   377
        do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   378
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   379
            while (ammoidx <= cMaxSlotAmmoIndex)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   380
            and ((Ammo^[slot, ammoidx].Count = 0) or (Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   381
                do inc(ammoidx);
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   382
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
   383
        if (ammoidx > cMaxSlotAmmoIndex) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   384
            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
   385
            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
   386
            inc(slot)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   387
            end
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   388
        end;
11532
bf86c6cb9341 Bye-bye TryDo
unc0rr
parents: 11046
diff changeset
   389
    if checkFails(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true) then exit;
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
   390
    CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   391
    end
2432
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   392
end;
1a0bb82d55f0 Switch to first legal ammo when hedgehog can't hold current one
unc0rr
parents: 2431
diff changeset
   393
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   394
procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10116
diff changeset
   395
var s: ansistring;
12649
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   396
    OldWeapon, CurWeapon: PAmmo;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   397
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   398
TargetPoint.X:= NoPointX;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   399
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   400
with Hedgehog do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   401
    begin
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   402
    CurWeapon:= GetCurAmmoEntry(Hedgehog);
12649
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   403
    OldWeapon:= GetCurAmmoEntry(Hedgehog);
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
   404
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
   405
    if (CurWeapon^.Count = 0) then
6131
4e8816cf9459 merge the changes applied to 0.9.16
koda
parents: 5995
diff changeset
   406
        SwitchToFirstLegalAmmo(Hedgehog)
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   407
    else if CurWeapon^.AmmoType = amNothing then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   408
        Hedgehog.CurAmmoType:= amNothing;
2431
23242609c44b Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents: 2409
diff changeset
   409
6924
57b66ee3bff3 Get rid of overloaded functions in uAmmo
unc0rr
parents: 6898
diff changeset
   410
    CurWeapon:= GetCurAmmoEntry(Hedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   411
12649
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   412
    // Weapon selection animation (if new ammo type)
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   413
    if CurWeapon^.AmmoType <> OldWeapon^.AmmoType then
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   414
        Timer:= 10;
2837dee472cc Show selected weapon again when using it in inf attack mode
Wuzzy <almikes@aol.com>
parents: 12156
diff changeset
   415
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
   416
    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
   417
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
   418
    with CurWeapon^ do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   419
        begin
11939
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11534
diff changeset
   420
        if length(trluaammo[Ammoz[AmmoType].NameId]) > 0 then
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11534
diff changeset
   421
            s:= trluaammo[Ammoz[AmmoType].NameId]
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11534
diff changeset
   422
        else
c7ec309cd685 Add Lua API function SetAmmoTexts (see issue 82)
Wuzzy <almikes@aol.com>
parents: 11534
diff changeset
   423
            s:= trammo[Ammoz[AmmoType].NameId];
7426
55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots.
nemo
parents: 7341
diff changeset
   424
        if (Count <> AMMO_INFINITE) and (not (Hedgehog.Team^.ExtDriven or (Hedgehog.BotLevel > 0))) then
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10116
diff changeset
   425
            s:= s + ansistring(' (' + IntToStr(Count) + ')');
4807
180dbfb13903 display caption for ammotype amNothing when switched to so that players know what just happened
sheepluva
parents: 4403
diff changeset
   426
        if (Propz and ammoprop_Timerable) <> 0 then
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10116
diff changeset
   427
            s:= s + ansistring(', ' + IntToStr(Timer div 1000) + ' ') + trammo[sidSeconds];
10116
dd27562b6f21 rolling back my PChar stuff, because unC0Rr improves string handling pas2c instead <3
sheepluva
parents: 10108
diff changeset
   428
        AddCaption(s, Team^.Clan^.Color, capgrpAmmoinfo);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   429
        if (Propz and ammoprop_NeedTarget) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   430
            begin
10818
f642a28cab0c Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents: 10560
diff changeset
   431
            if Gear <> nil then Gear^.State:= Gear^.State or      gstChooseTarget;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   432
            isCursorVisible:= true
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   433
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   434
        else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   435
            begin
10818
f642a28cab0c Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents: 10560
diff changeset
   436
            if Gear <> nil then Gear^.State:= Gear^.State and (not gstChooseTarget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   437
            isCursorVisible:= false
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   438
            end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   439
        end
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3836
diff changeset
   440
    end;
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   441
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   442
1922
88cdabb51995 Fix bug with rope and bazooka
unc0rr
parents: 1915
diff changeset
   443
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
   444
begin
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   445
with Hedgehog do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   446
    if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_DontHold) <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   447
    or (Ammoz[CurAmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber >= 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   448
        SwitchToFirstLegalAmmo(Hedgehog);
553
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   449
end;
5478386d935f - Switch to bazooka (or whatever) after use of some weapon (fixes problem with bots)
unc0rr
parents: 547
diff changeset
   450
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   451
procedure SetWeapon(weap: TAmmoType);
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   452
begin
1850
a0332e79fdc9 a patch :P
unc0rr
parents: 1849
diff changeset
   453
ParseCommand('/setweap ' + char(weap), true)
783
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   454
end;
4f59db6f147d - New command 'set weapon'
unc0rr
parents: 553
diff changeset
   455
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   456
procedure DisableSomeWeapons;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   457
var i, slot, a: Longword;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   458
    t: TAmmoType;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   459
begin
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   460
for i:= 0 to Pred(StoreCnt) do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   461
    for slot:= 0 to cMaxSlotIndex do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   462
        begin
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   463
        for a:= 0 to cMaxSlotAmmoIndex do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   464
            with StoresList[i]^[slot, a] do
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3407
diff changeset
   465
                if (Propz and ammoprop_NotBorder) <> 0 then
3319
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   466
                    begin
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   467
                    Count:= 0;
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   468
                    InitialCountsLocal[i][AmmoType]:= 0
3319
af0d256205c1 Correct interaction of cave and placement.
nemo
parents: 3255
diff changeset
   469
                    end;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   470
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   471
        PackAmmo(StoresList[i], slot)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   472
        end;
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   473
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   474
for t:= Low(TAmmoType) to High(TAmmoType) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   475
    if (Ammoz[t].Ammo.Propz and ammoprop_NotBorder) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   476
        Ammoz[t].Probability:= 0
1784
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   477
end;
dfe9bafb4590 Apply nemo's patch polished by me:
unc0rr
parents: 1066
diff changeset
   478
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   479
procedure SetAmmoLoadout(var s: shortstring);
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   480
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   481
    ammoLoadout:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   482
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   483
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   484
procedure SetAmmoProbability(var s: shortstring);
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   485
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   486
    ammoProbability:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   487
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   488
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   489
procedure SetAmmoDelay(var s: shortstring);
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   490
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   491
    ammoDelay:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   492
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   493
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   494
procedure SetAmmoReinforcement(var s: shortstring);
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   495
begin
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   496
    ammoReinforcement:= s;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   497
end;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   498
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   499
// 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
   500
procedure ResetWeapons;
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   501
var i, t: Longword;
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   502
    a: TAmmoType;
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   503
    newAmmos: TAmmoArray;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   504
begin
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   505
for t:= 0 to Pred(TeamsCount) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   506
    with TeamsArray[t]^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   507
        for i:= 0 to cMaxHHIndex do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   508
            Hedgehogs[i].CurAmmoType:= amNothing;
6519
b0dc69bb1f54 oops. this is more efficient anyway.
nemo
parents: 6515
diff changeset
   509
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   510
for a:= Low(TAmmoType) to High(TAmmoType) do
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   511
    newAmmos[a]:= Ammoz[a].Ammo;
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   512
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   513
for i:= 0 to Pred(StoreCnt) do
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   514
    begin
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   515
    for a:= Low(TAmmoType) to High(TAmmoType) do
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   516
        newAmmos[a].Count:= InitialCountsLocal[i][a];
9391
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   517
    FillAmmoStore(StoresList[i], newAmmos);
2af25494f3bb Preserve weapon settings in AddAmmo. Fixes issue 450.
unc0rr
parents: 9080
diff changeset
   518
    end;
2762
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   519
3955
d14ecff9502b You win fillammostore
nemo
parents: 3951
diff changeset
   520
for a:= Low(TAmmoType) to High(TAmmoType) do
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   521
    if Ammoz[a].SkipTurns >= 10000 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   522
        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
   523
end;
2fbc8d35eb52 Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents: 2732
diff changeset
   524
4401
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   525
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   526
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   527
procedure chAddAmmoStore(var descr: shortstring);
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   528
begin
10015
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   529
    descr:= ''; // avoid compiler hint
4feced261c68 partial merge of the webgl branch
koda
parents: 9998 9950
diff changeset
   530
    AddAmmoStore
4401
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   531
end;
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   532
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
   533
procedure initModule;
6762
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   534
var i: Longword;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   535
begin
6898
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   536
    RegisterVariable('ammloadt', @SetAmmoLoadout, false);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   537
    RegisterVariable('ammdelay', @SetAmmoDelay, false);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   538
    RegisterVariable('ammprob',  @SetAmmoProbability, false);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   539
    RegisterVariable('ammreinf', @SetAmmoReinforcement, false);
344b0dbd9690 - Remove support for variables in command handlers
unc0rr
parents: 6770
diff changeset
   540
    RegisterVariable('ammstore', @chAddAmmoStore , false);
4401
9cb6990af584 Remove uAmmos dependaency from uCommands
unc0rr
parents: 4393
diff changeset
   541
9717
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   542
    CurMinAngle:= 0;
b8b7ef99a084 don't let (am)Nothing change allowed aiming angles. e.g. fixes aiming problems when on last rope. please test for possible side effects (flying saucer and whatnot)
sheepluva
parents: 9660
diff changeset
   543
    CurMaxAngle:= cMaxAngle;
3346
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   544
    StoreCnt:= 0;
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   545
    ammoLoadout:= '';
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   546
    ammoProbability:= '';
967fd96f7373 Engine/Frontend:
smxx
parents: 3319
diff changeset
   547
    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
   548
    ammoReinforcement:= '';
6762
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   549
    for i:=1 to ord(High(TAmmoType)) do
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   550
        begin
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   551
        ammoLoadout:= ammoLoadout + '0';
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   552
        ammoProbability:= ammoProbability + '0';
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   553
        ammoDelay:= ammoDelay + '0';
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   554
        ammoReinforcement:= ammoReinforcement + '0'
85ba0c55d077 Set default empty ammo sets. Current mission handling appears to not pass any default ammo set, so script was never getting a chance to set its own.
nemo
parents: 6700
diff changeset
   555
        end;
13457
38814954a248 Fix GetAmmo getting wrong ammo count
Wuzzy <Wuzzy2@mail.ru>
parents: 13456
diff changeset
   556
    FillChar(InitialCountsLocal, sizeof(InitialCountsLocal), 0)
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   557
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2715
diff changeset
   558
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 3033
diff changeset
   559
procedure freeModule;
2715
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   560
var i: LongWord;
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   561
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2860
diff changeset
   562
    if StoreCnt > 0 then
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   563
        for i:= 0 to Pred(StoreCnt) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6519
diff changeset
   564
            Dispose(StoresList[i])
2715
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   565
end;
0e4e0db79e2a Free up some unfreed memory. Needed for Koda's iphone lib work
nemo
parents: 2630
diff changeset
   566
288
929c44745fd9 Ammo schemes and ammo stores support in engine
unc0rr
parents:
diff changeset
   567
end.