author | alfadur |
Sat, 03 Nov 2018 09:08:13 +0300 | |
changeset 14118 | be4419243735 |
parent 14078 | ff6e67066fd0 |
child 14224 | de21f6eb2366 |
permissions | -rw-r--r-- |
9285 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 5 |
* This program is free software; you can redistribute it and/or modify |
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
4 | 8 |
* |
183 | 9 |
* This program is distributed in the hope that it will be useful, |
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
4 | 13 |
* |
183 | 14 |
* You should have received a copy of the GNU General Public License |
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 |
4 | 17 |
*) |
18 |
||
2599 | 19 |
{$INCLUDE "options.inc"} |
2587
0dfa56a8513c
fix a segfault in the iphone simulator by moving options.inc at the beginning of the file
koda
parents:
2586
diff
changeset
|
20 |
|
4 | 21 |
unit uTeams; |
22 |
interface |
|
10015 | 23 |
uses uConsts, uInputHandler, uRandom, uFloat, uStats, |
9295
f8819c3dde54
Remove some GLunit dependencies noticed on graph. uUtils was using it for GLfloat - but, the stuff it was returning to was usually converting to "real" anyway. uLand was including it unnecessarily. Minor refactor
nemo
parents:
9291
diff
changeset
|
24 |
uCollisions, uSound, uStore, uTypes, uScript |
7837 | 25 |
{$IFDEF USE_TOUCH_INTERFACE}, uWorld{$ENDIF}; |
26 |
||
534 | 27 |
|
3038 | 28 |
procedure initModule; |
29 |
procedure freeModule; |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
30 |
|
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
31 |
function AddTeam(TeamColor: Longword): PTeam; |
4 | 32 |
procedure SwitchHedgehog; |
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
33 |
procedure AfterSwitchHedgehog; |
4 | 34 |
procedure InitTeams; |
35 |
function TeamSize(p: PTeam): Longword; |
|
47 | 36 |
procedure RecountTeamHealth(team: PTeam); |
10581 | 37 |
procedure RecountAllTeamsHealth(); |
8817
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
38 |
procedure RestoreHog(HH: PHedgehog); |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
39 |
|
72 | 40 |
procedure RestoreTeamsFromSave; |
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
41 |
function CheckForWin: boolean; |
2040 | 42 |
procedure TeamGoneEffect(var Team: TTeam); |
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
43 |
procedure SwitchCurrentHedgehog(newHog: PHedgehog); |
4 | 44 |
|
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9685
diff
changeset
|
45 |
var MaxTeamHealth: LongInt; |
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9685
diff
changeset
|
46 |
|
4 | 47 |
implementation |
8370 | 48 |
uses uLocale, uAmmos, uChat, uVariables, uUtils, uIO, uCaptions, uCommands, uDebug, |
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
49 |
uGearsUtils, uGearsList, uVisualGearsList, uTextures |
7837 | 50 |
{$IFDEF USE_TOUCH_INTERFACE}, uTouch{$ENDIF}; |
4377 | 51 |
|
12327
9aa483762025
Fix sndBoring being played when force-ending turn due to victory
Wuzzy <almikes@aol.com>
parents:
12281
diff
changeset
|
52 |
var TeamsGameOver: boolean; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8054
diff
changeset
|
53 |
NextClan: boolean; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
54 |
SwapClanPre, SwapClanReal: LongInt; |
4 | 55 |
|
92
0c359a7a2356
- Fix win message to appear only after all hedgehogs death
unc0rr
parents:
89
diff
changeset
|
56 |
function CheckForWin: boolean; |
576 | 57 |
var AliveClan: PClan; |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
58 |
s, cap: ansistring; |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
59 |
ts: array[0..(cMaxTeams - 1)] of ansistring; |
1011 | 60 |
t, AliveCount, i, j: LongInt; |
13813
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
61 |
allWin, winCamera: boolean; |
83 | 62 |
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:
6982
diff
changeset
|
63 |
CheckForWin:= false; |
548 | 64 |
AliveCount:= 0; |
549 | 65 |
for t:= 0 to Pred(ClansCount) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
66 |
if ClansArray[t]^.ClanHealth > 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
67 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
68 |
inc(AliveCount); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
69 |
AliveClan:= ClansArray[t] |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
70 |
end; |
548 | 71 |
|
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:
6982
diff
changeset
|
72 |
if (AliveCount > 1) or ((AliveCount = 1) and ((GameFlags and gfOneClanMode) <> 0)) then |
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:
6982
diff
changeset
|
73 |
exit; |
351 | 74 |
CheckForWin:= true; |
83 | 75 |
|
76 |
TurnTimeLeft:= 0; |
|
3774 | 77 |
ReadyTimeLeft:= 0; |
7669
a85e1c167b69
I didn't want to do this since it seems less clean, but...
sheepluva
parents:
7442
diff
changeset
|
78 |
|
13782
3fa9e30927f1
Fix team stats screwing up if game ends due to drowning in rising Sudden Death water
Wuzzy <Wuzzy2@mail.ru>
parents:
13773
diff
changeset
|
79 |
// If the game ends during a multishot, or after the Sudden Death |
3fa9e30927f1
Fix team stats screwing up if game ends due to drowning in rising Sudden Death water
Wuzzy <Wuzzy2@mail.ru>
parents:
13773
diff
changeset
|
80 |
// water has risen, do last turn stats / reaction. |
3fa9e30927f1
Fix team stats screwing up if game ends due to drowning in rising Sudden Death water
Wuzzy <Wuzzy2@mail.ru>
parents:
13773
diff
changeset
|
81 |
if ((not bBetweenTurns) and isInMultiShoot) or (bDuringWaterRise) then |
13760
6908d1e65cdc
Rip out stats code from TurnReaction and put it into new function TurnStats. Fixes buggy stats
Wuzzy <Wuzzy2@mail.ru>
parents:
13659
diff
changeset
|
82 |
begin |
6908d1e65cdc
Rip out stats code from TurnReaction and put it into new function TurnStats. Fixes buggy stats
Wuzzy <Wuzzy2@mail.ru>
parents:
13659
diff
changeset
|
83 |
TurnStats(); |
13782
3fa9e30927f1
Fix team stats screwing up if game ends due to drowning in rising Sudden Death water
Wuzzy <Wuzzy2@mail.ru>
parents:
13773
diff
changeset
|
84 |
if (not bDuringWaterRise) then |
3fa9e30927f1
Fix team stats screwing up if game ends due to drowning in rising Sudden Death water
Wuzzy <Wuzzy2@mail.ru>
parents:
13773
diff
changeset
|
85 |
TurnReaction(); |
13766
6fd56a26e8b8
Fix turn reaction not working properly after turn
Wuzzy <Wuzzy2@mail.ru>
parents:
13765
diff
changeset
|
86 |
TurnStatsReset(); |
13760
6908d1e65cdc
Rip out stats code from TurnReaction and put it into new function TurnStats. Fixes buggy stats
Wuzzy <Wuzzy2@mail.ru>
parents:
13659
diff
changeset
|
87 |
end; |
7669
a85e1c167b69
I didn't want to do this since it seems less clean, but...
sheepluva
parents:
7442
diff
changeset
|
88 |
|
12327
9aa483762025
Fix sndBoring being played when force-ending turn due to victory
Wuzzy <almikes@aol.com>
parents:
12281
diff
changeset
|
89 |
if not TeamsGameOver then |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
90 |
begin |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
91 |
if AliveCount = 0 then |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
92 |
begin // draw |
13647
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13602
diff
changeset
|
93 |
AddCaption(GetEventString(eidRoundDraw), capcolDefault, capgrpGameState); |
12337
657a8d63c99d
Lua API: SendAchevementsStatsOff, SendGameResultOff, SendRankingStatsOff
Wuzzy <almikes@aol.com>
parents:
12327
diff
changeset
|
94 |
if SendGameResultOn then |
657a8d63c99d
Lua API: SendAchevementsStatsOff, SendGameResultOff, SendRankingStatsOff
Wuzzy <almikes@aol.com>
parents:
12327
diff
changeset
|
95 |
SendStat(siGameResult, shortstring(trmsg[sidDraw])); |
13765 | 96 |
if PreviousTeam <> nil then |
14029
03a5d9f0bcc9
Play sndStupid on round draw instead of sndNutter
Wuzzy <Wuzzy2@mail.ru>
parents:
13882
diff
changeset
|
97 |
AddVoice(sndStupid, PreviousTeam^.voicepack) |
13765 | 98 |
else |
14029
03a5d9f0bcc9
Play sndStupid on round draw instead of sndNutter
Wuzzy <Wuzzy2@mail.ru>
parents:
13882
diff
changeset
|
99 |
AddVoice(sndStupid, TeamsArray[0]^.voicepack); |
12177
fe2946e2a859
Implement random round draw / team win messages
Wuzzy <almikes@aol.com>
parents:
11918
diff
changeset
|
100 |
AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
101 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
102 |
else // win |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
103 |
begin |
13773
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
104 |
allWin:= false; |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
105 |
with AliveClan^ do |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
106 |
begin |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
107 |
if TeamsNumber = 1 then // single team wins |
12177
fe2946e2a859
Implement random round draw / team win messages
Wuzzy <almikes@aol.com>
parents:
11918
diff
changeset
|
108 |
begin |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
109 |
s:= ansistring(Teams[0]^.TeamName); |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
110 |
// Victory caption is randomly selected |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
111 |
cap:= FormatA(GetEventString(eidRoundWin), s); |
13647
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13602
diff
changeset
|
112 |
AddCaption(cap, capcolDefault, capgrpGameState); |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
113 |
s:= FormatA(trmsg[sidWinner], s); |
12177
fe2946e2a859
Implement random round draw / team win messages
Wuzzy <almikes@aol.com>
parents:
11918
diff
changeset
|
114 |
end |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
115 |
else // clan with at least 2 teams wins |
12177
fe2946e2a859
Implement random round draw / team win messages
Wuzzy <almikes@aol.com>
parents:
11918
diff
changeset
|
116 |
begin |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
117 |
s:= ''; |
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
118 |
for j:= 0 to Pred(TeamsNumber) do |
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
119 |
begin |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
120 |
ts[j] := Teams[j]^.TeamName; |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
121 |
end; |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
122 |
|
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
123 |
// Write victory message for caption and stats page |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
124 |
if (TeamsNumber = cMaxTeams) or (TeamsCount = TeamsNumber) then |
13773
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
125 |
begin |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
126 |
// No enemies for some reason … Everyone wins!!1! |
13773
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
127 |
s:= trmsg[sidWinnerAll]; |
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
128 |
allWin:= true; |
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
129 |
end |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
130 |
else if (TeamsNumber >= 2) and (TeamsNumber < cMaxTeams) then |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
131 |
// List all winning teams in a list |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
132 |
if (TeamsNumber = 2) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
133 |
s:= FormatA(trmsg[TMsgStrId(sidWinner2)], ts[0], ts[1]) |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
134 |
else if (TeamsNumber = 3) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
135 |
s:= FormatA(trmsg[TMsgStrId(sidWinner3)], ts[0], ts[1], ts[2]) |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
136 |
else if (TeamsNumber = 4) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
137 |
s:= FormatA(trmsg[TMsgStrId(sidWinner4)], ts[0], ts[1], ts[2], ts[3]) |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
138 |
else if (TeamsNumber = 5) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
139 |
s:= FormatA(trmsg[TMsgStrId(sidWinner5)], ts[0], ts[1], ts[2], ts[3], ts[4]) |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
140 |
else if (TeamsNumber = 6) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
141 |
s:= FormatA(trmsg[TMsgStrId(sidWinner6)], ts[0], ts[1], ts[2], ts[3], ts[4], ts[5]) |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
142 |
else if (TeamsNumber = 7) then |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13813
diff
changeset
|
143 |
s:= FormatA(trmsg[TMsgStrId(sidWinner7)], ts[0], ts[1], ts[2], ts[3], ts[4], ts[5], ts[6]); |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
144 |
|
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
145 |
// The winner caption is the same as the stats message and not randomized |
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
146 |
cap:= s; |
13647
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13602
diff
changeset
|
147 |
AddCaption(cap, capcolDefault, capgrpGameState); |
13052
eadf8259306f
Improve/fix messaging when multiple teams win
Wuzzy <Wuzzy2@mail.ru>
parents:
13023
diff
changeset
|
148 |
// TODO (maybe): Show victory animation/captions per-team instead of all winners at once? |
12177
fe2946e2a859
Implement random round draw / team win messages
Wuzzy <almikes@aol.com>
parents:
11918
diff
changeset
|
149 |
end; |
549 | 150 |
|
13813
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
151 |
// Enable winner state for winning hogs and move camera to a winning hedgehog |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
152 |
winCamera:= false; |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
153 |
for j:= 0 to Pred(TeamsNumber) do |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
154 |
with Teams[j]^ do |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
155 |
for i:= 0 to cMaxHHIndex do |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
156 |
with Hedgehogs[i] do |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
157 |
if (Gear <> nil) then |
13813
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
158 |
begin |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
159 |
if (not winCamera) then |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
160 |
begin |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
161 |
FollowGear:= Gear; |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
162 |
winCamera:= true; |
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
163 |
end; |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
164 |
Gear^.State:= gstWinner; |
13813
5c6052351991
On victory, center camera on a winning hedgehog
Wuzzy <Wuzzy2@mail.ru>
parents:
13782
diff
changeset
|
165 |
end; |
4978 | 166 |
if Flawless then |
9157
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
167 |
AddVoice(sndFlawless, Teams[0]^.voicepack) |
4978 | 168 |
else |
5638
e35ba2a400d8
Try to avoid overlapping voices for major statements (not things like byebye or oof)
nemo
parents:
5357
diff
changeset
|
169 |
AddVoice(sndVictory, Teams[0]^.voicepack); |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
170 |
end; |
2376 | 171 |
|
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
172 |
if SendGameResultOn then |
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
173 |
SendStat(siGameResult, shortstring(s)); |
13773
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
174 |
if allWin and SendAchievementsStatsOn then |
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13766
diff
changeset
|
175 |
SendStat(siEverAfter, ''); |
12584
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
176 |
AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000) |
0411e04cf12a
Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com>
parents:
12415
diff
changeset
|
177 |
end; |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
178 |
SendStats; |
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
179 |
end; |
12327
9aa483762025
Fix sndBoring being played when force-ending turn due to victory
Wuzzy <almikes@aol.com>
parents:
12281
diff
changeset
|
180 |
TeamsGameOver:= true; |
4014
e9baae83370b
Avoid doing this stuff twice, even if CheckForWin is called twice
nemo
parents:
3996
diff
changeset
|
181 |
GameOver:= true |
83 | 182 |
end; |
183 |
||
4 | 184 |
procedure SwitchHedgehog; |
9137
d987230b85ed
fixed all engine compilation hints and notes (that I could see)
sheepluva
parents:
9080
diff
changeset
|
185 |
var c, i, t: LongWord; |
5052 | 186 |
PrevHH, PrevTeam : LongWord; |
4 | 187 |
begin |
188 |
TargetPoint.X:= NoPointX; |
|
13504
c41b16ac2e05
Clarify the wording of a few checkFails messages
Wuzzy <Wuzzy2@mail.ru>
parents:
13481
diff
changeset
|
189 |
if checkFails(CurrentTeam <> nil, 'Team is nil!', true) then exit; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
190 |
with CurrentHedgehog^ do |
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
191 |
if (PreviousTeam <> nil) and PlacingHogs and Unplaced then |
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
192 |
begin |
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
193 |
Unplaced:= false; |
3697 | 194 |
if Gear <> nil then |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
195 |
begin |
2763
f21d3ca74ef2
Do CI correctly. Still need to allow for mode in case of no teleports in ammo
nemo
parents:
2762
diff
changeset
|
196 |
DeleteCI(Gear); |
11476 | 197 |
FindPlace(Gear, false, 0, LAND_WIDTH, true); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
198 |
if Gear <> nil then |
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9285
diff
changeset
|
199 |
AddCI(Gear) |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
200 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
201 |
end; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
202 |
|
1678 | 203 |
PreviousTeam:= CurrentTeam; |
547 | 204 |
|
944 | 205 |
with CurrentHedgehog^ do |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
206 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
207 |
if Gear <> nil then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
208 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
209 |
MultiShootAttacks:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
210 |
Gear^.Message:= 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
211 |
Gear^.Z:= cHHZ; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
212 |
RemoveGearFromList(Gear); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
213 |
InsertGearToList(Gear) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
214 |
end |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
215 |
end; |
4391
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
216 |
// Try to make the ammo menu viewed when not your turn be a bit more useful for per-hog-ammo mode |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
217 |
with CurrentTeam^ do |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
218 |
if ((GameFlags and gfPerHogAmmo) <> 0) and (not ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
219 |
begin |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
220 |
c:= CurrHedgehog; |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
221 |
repeat |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
222 |
begin |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
223 |
inc(c); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
224 |
if c > cMaxHHIndex then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
225 |
c:= 0 |
4391
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
226 |
end |
10193
d7cd5b43588f
By request. Allow lua to make random things "talk". I'm not sure if this is a good idea, buuuut.
nemo
parents:
10124
diff
changeset
|
227 |
until (c = CurrHedgehog) or (Hedgehogs[c].Gear <> nil) and (Hedgehogs[c].Effects[heFrozen] < 50255); |
4391
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
228 |
LocalAmmo:= Hedgehogs[c].AmmoStore |
de9e1a5102b4
In the case of per-hog-ammo, switch the ammo viewed when not your turn to what will probably be your ammo, assuming that hog survives.
nemo
parents:
4377
diff
changeset
|
229 |
end; |
4 | 230 |
|
550 | 231 |
c:= CurrentTeam^.Clan^.ClanIndex; |
4 | 232 |
repeat |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
233 |
if (GameFlags and gfTagTeam) <> 0 then |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
234 |
begin |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
235 |
with ClansArray[c]^ do |
5021 | 236 |
begin |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
237 |
if (CurrTeam = TagTeamIndex) then |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
238 |
begin |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
239 |
TagTeamIndex:= Pred(TagTeamIndex) mod TeamsNumber; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
240 |
CurrTeam:= Pred(CurrTeam) mod TeamsNumber; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
241 |
inc(c); |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
242 |
if c = ClansCount then |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
243 |
c:= 0; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
244 |
if c = SwapClanReal then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
245 |
inc(TotalRoundsReal); |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
246 |
NextClan:= true; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
247 |
end; |
13651
67d8f75f048d
Backout 0f02dd1ff4c9. This is not how TotalRounds should work
Wuzzy <Wuzzy2@mail.ru>
parents:
13647
diff
changeset
|
248 |
end; |
5021 | 249 |
|
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
250 |
with ClansArray[c]^ do |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
251 |
begin |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
252 |
if (not PlacingHogs) and ((Succ(CurrTeam) mod TeamsNumber) = TagTeamIndex) then |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
253 |
begin |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
254 |
if c = SwapClanPre then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
255 |
inc(TotalRoundsPre); |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
256 |
end; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
257 |
end; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
258 |
end |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
259 |
else |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
260 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
261 |
inc(c); |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
262 |
if c = ClansCount then |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
263 |
c:= 0; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
264 |
if (not PlacingHogs) then |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
265 |
begin |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
266 |
if c = SwapClanPre then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
267 |
inc(TotalRoundsPre); |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
268 |
if c = SwapClanReal then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
269 |
inc(TotalRoundsReal); |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
270 |
end; |
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
271 |
end; |
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
272 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
273 |
with ClansArray[c]^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
274 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
275 |
PrevTeam:= CurrTeam; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
276 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
277 |
CurrTeam:= Succ(CurrTeam) mod TeamsNumber; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
278 |
CurrentTeam:= Teams[CurrTeam]; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
279 |
with CurrentTeam^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
280 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
281 |
PrevHH:= CurrHedgehog mod HedgehogsNumber; // prevent infinite loop when CurrHedgehog = 7, but HedgehogsNumber < 8 (team is destroyed before its first turn) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
282 |
repeat |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
283 |
CurrHedgehog:= Succ(CurrHedgehog) mod HedgehogsNumber; |
9067 | 284 |
until ((Hedgehogs[CurrHedgehog].Gear <> nil) and (Hedgehogs[CurrHedgehog].Effects[heFrozen] < 256)) or (CurrHedgehog = PrevHH) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
285 |
end |
9157
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
286 |
until ((CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen] < 256)) or (PrevTeam = CurrTeam) or ((CurrTeam = TagTeamIndex) and ((GameFlags and gfTagTeam) <> 0)) |
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
287 |
end; |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
288 |
if (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear = nil) or (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen] > 255) then |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
289 |
begin |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
290 |
with CurrentTeam^.Clan^ do |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
291 |
for t:= 0 to Pred(TeamsNumber) do |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
292 |
with Teams[t]^ do |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
293 |
for i:= 0 to Pred(HedgehogsNumber) do |
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
294 |
with Hedgehogs[i] do |
9157
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
295 |
begin |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
296 |
if Effects[heFrozen] > 255 then Effects[heFrozen]:= max(255,Effects[heFrozen]-50000); |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
297 |
if (Gear <> nil) and (Effects[heFrozen] < 256) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen] > 255) then |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
298 |
CurrHedgehog:= i |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
299 |
end; |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
300 |
if (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear = nil) or (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen] > 255) then |
2f8b60b89121
ok. this could be tidier, but, I'm sick of hogs w/ unmodified thaw thawing on exactly wrong turn.
nemo
parents:
9137
diff
changeset
|
301 |
inc(CurrentTeam^.Clan^.TurnNumber); |
8935 | 302 |
end |
8934
a4ec39eac0be
So. This should fix ammo delays being off on a team that is resurrected later in the game, even up freezing delays a bit, prevent an infinite loop in freezing, and reduces fuel burn when adjusting freezer to one-fourth.
nemo
parents:
8681
diff
changeset
|
303 |
until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen] < 256); |
83 | 304 |
|
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
305 |
SwitchCurrentHedgehog(@(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog])); |
6691
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
306 |
{$IFDEF USE_TOUCH_INTERFACE} |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
307 |
if (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NoCrosshair) = 0 then |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
308 |
begin |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
309 |
if not(arrowUp.show) then |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
310 |
begin |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
311 |
animateWidget(@arrowUp, true, true); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
312 |
animateWidget(@arrowDown, true, true); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
313 |
end; |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
314 |
end |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
315 |
else |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
316 |
if arrowUp.show then |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
317 |
begin |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
318 |
animateWidget(@arrowUp, true, false); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
319 |
animateWidget(@arrowDown, true, false); |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
320 |
end; |
79c96abd06d6
added hide/show animation for the aiming keys (should animateWidget() be moved to another unit?)
Xeli
parents:
6622
diff
changeset
|
321 |
{$ENDIF} |
6622 | 322 |
AmmoMenuInvalidated:= true; |
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
323 |
end; |
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
324 |
|
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
325 |
procedure AfterSwitchHedgehog; |
5357
ec36f3d53f3c
Tiny optimization: convert smooth wind indicator change gear into visual gear
unc0rr
parents:
5167
diff
changeset
|
326 |
var i, t: LongInt; |
3960
ada50f8d4186
Remove bit of debug code from prior, don't switch weapons on end of turn (stick with whatever the last weapon was)
nemo
parents:
3935
diff
changeset
|
327 |
CurWeapon: PAmmo; |
6913 | 328 |
w: real; |
329 |
vg: PVisualGear; |
|
13277
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
330 |
g: PGear; |
10124
aabd1b75d5a3
Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents:
10116
diff
changeset
|
331 |
s: ansistring; |
1058
c53c5c4e7b48
- Proper turns counting, split SwitchHedgehog into two functions
unc0rr
parents:
1011
diff
changeset
|
332 |
begin |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
333 |
if PlacingHogs then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
334 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
335 |
PlacingHogs:= false; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
336 |
for t:= 0 to Pred(TeamsCount) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
337 |
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:
6543
diff
changeset
|
338 |
if (TeamsArray[t]^.Hedgehogs[i].Gear <> nil) and (TeamsArray[t]^.Hedgehogs[i].Unplaced) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
339 |
PlacingHogs:= true; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
340 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
341 |
if not PlacingHogs then // Reset various things I mucked with |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
342 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
343 |
for i:= 0 to ClansCount do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
344 |
if ClansArray[i] <> nil then |
13761
a0d6404a80a2
Rework rankings of losing clans: Rank them in the reverse order they died
Wuzzy <Wuzzy2@mail.ru>
parents:
13760
diff
changeset
|
345 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
346 |
ClansArray[i]^.TurnNumber:= 0; |
13761
a0d6404a80a2
Rework rankings of losing clans: Rank them in the reverse order they died
Wuzzy <Wuzzy2@mail.ru>
parents:
13760
diff
changeset
|
347 |
end; |
13652
7b506f1357e4
Backed out changeset 2d787d122083 to revert TotalRounds to 0.9.23 behaviour
Wuzzy <Wuzzy2@mail.ru>
parents:
13651
diff
changeset
|
348 |
ResetWeapons |
13654
d5fe7db1baa9
Fix TotalRounds increasing incorrectly if gfRandomOrder is off
Wuzzy <Wuzzy2@mail.ru>
parents:
13653
diff
changeset
|
349 |
end; |
d5fe7db1baa9
Fix TotalRounds increasing incorrectly if gfRandomOrder is off
Wuzzy <Wuzzy2@mail.ru>
parents:
13653
diff
changeset
|
350 |
|
13653
f606ca8b80fd
Backed out changeset c265a3e6f6da to revert to 0.9.23 TotalRounds behaviour
Wuzzy <Wuzzy2@mail.ru>
parents:
13652
diff
changeset
|
351 |
end; |
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
352 |
|
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
353 |
if not PlacingHogs then |
13659
5b58aa82b5dc
Oops, add forgotten begin/end in uTeams
Wuzzy <Wuzzy2@mail.ru>
parents:
13657
diff
changeset
|
354 |
begin |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
355 |
if (TotalRoundsReal = -1) then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
356 |
TotalRoundsReal:= 0; |
13657
de2b7bc00d40
More straightforward TotalRoundsPre counting if there's only 1 clan
Wuzzy <Wuzzy2@mail.ru>
parents:
13656
diff
changeset
|
357 |
if (TotalRoundsPre = -1) and (ClansCount = 1) then |
de2b7bc00d40
More straightforward TotalRoundsPre counting if there's only 1 clan
Wuzzy <Wuzzy2@mail.ru>
parents:
13656
diff
changeset
|
358 |
TotalRoundsPre:= 0; |
13659
5b58aa82b5dc
Oops, add forgotten begin/end in uTeams
Wuzzy <Wuzzy2@mail.ru>
parents:
13657
diff
changeset
|
359 |
end; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
360 |
|
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
361 |
// Determine clan ID to check to determine whether to increase TotalRoundsPre/TotalRoundsReal |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
362 |
if (not PlacingHogs) then |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
363 |
begin |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
364 |
if SwapClanPre = -1 then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
365 |
begin |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
366 |
if (GameFlags and gfRandomOrder) <> 0 then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
367 |
SwapClanPre:= 0 |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
368 |
else |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
369 |
SwapClanPre:= ClansCount - 1; |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
370 |
end; |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
371 |
if SwapClanReal = -1 then |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
372 |
SwapClanReal:= CurrentTeam^.Clan^.ClanIndex; |
13655
34aeaa627400
Fix TotalRounds advancing incorrectly with gfRandomOrder off and/or gfTagTeam on
Wuzzy <Wuzzy2@mail.ru>
parents:
13654
diff
changeset
|
373 |
end; |
13654
d5fe7db1baa9
Fix TotalRounds increasing incorrectly if gfRandomOrder is off
Wuzzy <Wuzzy2@mail.ru>
parents:
13653
diff
changeset
|
374 |
|
2431
23242609c44b
Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents:
2376
diff
changeset
|
375 |
inc(CurrentTeam^.Clan^.TurnNumber); |
8935 | 376 |
with CurrentTeam^.Clan^ do |
377 |
for t:= 0 to Pred(TeamsNumber) do |
|
378 |
with Teams[t]^ do |
|
379 |
for i:= 0 to Pred(HedgehogsNumber) do |
|
380 |
with Hedgehogs[i] do |
|
381 |
if Effects[heFrozen] > 255 then |
|
382 |
Effects[heFrozen]:= max(255,Effects[heFrozen]-50000); |
|
2431
23242609c44b
Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents:
2376
diff
changeset
|
383 |
|
6924 | 384 |
CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
385 |
if CurWeapon^.Count = 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
386 |
CurrentHedgehog^.CurAmmoType:= amNothing; |
2431
23242609c44b
Real fix to ammo slot overflow (bug triggered by r2411 fix)
unc0rr
parents:
2376
diff
changeset
|
387 |
|
602 | 388 |
with CurrentHedgehog^ do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
389 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
390 |
with Gear^ do |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
391 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
392 |
Z:= cCurrHHZ; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
393 |
State:= gstHHDriven; |
5063 | 394 |
Active:= true; |
7835
a84936d1618a
Clear hedgehog's gear Power value when switching. Should fix issue 446 (not tested, but looks obvious).
unc0rr
parents:
7755
diff
changeset
|
395 |
Power:= 0; |
5063 | 396 |
LastDamage:= nil |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
397 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
398 |
RemoveGearFromList(Gear); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
399 |
InsertGearToList(Gear); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
400 |
FollowGear:= Gear |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
401 |
end; |
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
|
402 |
|
4218 | 403 |
if (GameFlags and gfDisableWind) = 0 then |
404 |
begin |
|
7001 | 405 |
cWindSpeed:= rndSign(GetRandomf * 2 * cMaxWindSpeed); |
6913 | 406 |
w:= hwFloat2Float(cWindSpeed); |
407 |
vg:= AddVisualGear(0, 0, vgtSmoothWindBar); |
|
408 |
if vg <> nil then vg^.dAngle:= w; |
|
4900 | 409 |
AddFileLog('Wind = '+FloatToStr(cWindSpeed)); |
4218 | 410 |
end; |
411 |
||
602 | 412 |
ApplyAmmoChanges(CurrentHedgehog^); |
800 | 413 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
414 |
if (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
415 |
SetBinds(CurrentTeam^.Binds); |
1650
a65681cc27c2
Don't fallback to default binds set when switching to remotely driven team
unc0rr
parents:
1495
diff
changeset
|
416 |
|
2762
2fbc8d35eb52
Mode to place hogs at start of game. Will probably need a bit more testing.
nemo
parents:
2758
diff
changeset
|
417 |
if PlacingHogs then |
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
418 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
419 |
if CurrentHedgehog^.Unplaced then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
420 |
TurnTimeLeft:= 15000 |
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
421 |
else TurnTimeLeft:= 0 |
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
422 |
end |
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
423 |
else |
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
424 |
begin |
13277
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
425 |
if ((GameFlags and gfTagTeam) <> 0) and (not NextClan) then |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
426 |
begin |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
427 |
if TagTurnTimeLeft <> 0 then |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
428 |
TurnTimeLeft:= TagTurnTimeLeft; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
429 |
TagTurnTimeLeft:= 0; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
430 |
end |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
431 |
else |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
432 |
begin |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
433 |
TurnTimeLeft:= cHedgehogTurnTime; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
434 |
TagTurnTimeLeft:= 0; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
435 |
NextClan:= false; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
436 |
end; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
437 |
|
14078
ff6e67066fd0
Fix bad "not" in uTeams (made pas2c angry)
Wuzzy <Wuzzy2@mail.ru>
parents:
14053
diff
changeset
|
438 |
if ((GameFlags and gfSwitchHog) <> 0) and (not CurrentTeam^.hasGone) then |
13277
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
439 |
begin |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
440 |
g:= AddGear(hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y), gtSwitcher, 0, _0, _0, 0); |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
441 |
CurAmmoGear:= g; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
442 |
lastGearByUID:= g; |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
443 |
end |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
444 |
else |
5984e8c6cbeb
Add new game flag gfSwitchHog, enable hog switching at turn start
Wuzzy <Wuzzy2@mail.ru>
parents:
13179
diff
changeset
|
445 |
bShowFinger:= true; |
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
446 |
end; |
11918
232b57a70aca
Make the timer red when it is the get-away time
Wuzzy <almikes@aol.com>
parents:
11739
diff
changeset
|
447 |
IsGetAwayTime:= false; |
7980
7f8df51553a7
Remove duplicate files from voices (add a fallback check in uSound). Add JustYouWait as an alternate to IllGetYou. Note that IllGetYou being called every turn seems awkward. IMO they probably should be reserved for significant enemy action. Maybe played by team of heavily damaged or killed hog.
nemo
parents:
7837
diff
changeset
|
448 |
|
14047
006f97a6f6a7
Enemy/AI hogs now say “Hmm” on turn start. Use IllGetYou/JustYouWait for hit after attack
Wuzzy <Wuzzy2@mail.ru>
parents:
14039
diff
changeset
|
449 |
// turn start taunt: sndYesSir for own team, sndHmm for enemy or computer team |
3774 | 450 |
if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then |
451 |
begin |
|
12281
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
452 |
if CurrentTeam^.ExtDriven then |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
453 |
begin |
14047
006f97a6f6a7
Enemy/AI hogs now say “Hmm” on turn start. Use IllGetYou/JustYouWait for hit after attack
Wuzzy <Wuzzy2@mail.ru>
parents:
14039
diff
changeset
|
454 |
AddVoice(sndHmm, CurrentTeam^.voicepack) |
12281
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
455 |
end |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
456 |
else |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
457 |
begin |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
458 |
GetRandom(2); // needed to avoid extdriven desync |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
459 |
AddVoice(sndYesSir, CurrentTeam^.voicepack); |
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
460 |
end; |
6905 | 461 |
if cHedgehogTurnTime < 1000000 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
462 |
ReadyTimeLeft:= cReadyDelay; |
10124
aabd1b75d5a3
Even more explicit type conversions and other stuff to help pas2c use ansistrings
unc0rr
parents:
10116
diff
changeset
|
463 |
s:= ansistring(CurrentTeam^.TeamName); |
13647
3d14950641a4
Refactor text color variable names, export 2 color values to Lua
Wuzzy <Wuzzy2@mail.ru>
parents:
13602
diff
changeset
|
464 |
AddCaption(FormatA(trmsg[sidReady], s), capcolDefault, capgrpGameState) |
3774 | 465 |
end |
466 |
else |
|
3798 | 467 |
begin |
468 |
if TurnTimeLeft > 0 then |
|
12281
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
469 |
begin |
14047
006f97a6f6a7
Enemy/AI hogs now say “Hmm” on turn start. Use IllGetYou/JustYouWait for hit after attack
Wuzzy <Wuzzy2@mail.ru>
parents:
14039
diff
changeset
|
470 |
AddVoice(sndHmm, CurrentTeam^.voicepack) |
12281
12f28d866c76
Backed out changeset 8e9603088f99
Wuzzy <almikes@aol.com>
parents:
12258
diff
changeset
|
471 |
end; |
3798 | 472 |
ReadyTimeLeft:= 0 |
3952
d6412423da45
moved some utilities to a separate column with round buttons
koda
parents:
3935
diff
changeset
|
473 |
end; |
4 | 474 |
end; |
475 |
||
549 | 476 |
function AddTeam(TeamColor: Longword): PTeam; |
2695 | 477 |
var team: PTeam; |
13073 | 478 |
c: LongInt; |
4 | 479 |
begin |
11537 | 480 |
if checkFails(TeamsCount < cMaxTeams, 'Too many teams', true) then exit(nil); |
2695 | 481 |
New(team); |
11537 | 482 |
if checkFails(team <> nil, 'AddTeam: team = nil', true) then exit(nil); |
2695 | 483 |
FillChar(team^, sizeof(TTeam), 0); |
484 |
team^.AttackBar:= 2; |
|
2806 | 485 |
team^.CurrHedgehog:= 0; |
2747 | 486 |
team^.Flag:= 'hedgewars'; |
547 | 487 |
|
2695 | 488 |
TeamsArray[TeamsCount]:= team; |
547 | 489 |
inc(TeamsCount); |
13179
061d55939e47
Use visible team count instead of total team count to determine rendered team bar height
Wuzzy <Wuzzy2@mail.ru>
parents:
13161
diff
changeset
|
490 |
inc(VisibleTeamsCount); |
547 | 491 |
|
13073 | 492 |
team^.Binds:= DefaultBinds; |
8346 | 493 |
|
549 | 494 |
c:= Pred(ClansCount); |
495 |
while (c >= 0) and (ClansArray[c]^.Color <> TeamColor) do dec(c); |
|
496 |
if c < 0 then |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
497 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
498 |
new(team^.Clan); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
499 |
FillChar(team^.Clan^, sizeof(TClan), 0); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
500 |
ClansArray[ClansCount]:= team^.Clan; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
501 |
inc(ClansCount); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
502 |
with team^.Clan^ do |
549 | 503 |
begin |
550 | 504 |
ClanIndex:= Pred(ClansCount); |
3379 | 505 |
Color:= TeamColor; |
5016
9347d82a26cc
added game mode Tag Team, mostly untested, please test :)
Henek
parents:
4978
diff
changeset
|
506 |
TagTeamIndex:= 0; |
13761
a0d6404a80a2
Rework rankings of losing clans: Rank them in the reverse order they died
Wuzzy <Wuzzy2@mail.ru>
parents:
13760
diff
changeset
|
507 |
Flawless:= true; |
13763
b1177e9c9ee9
Fix player rankings getting confused if a clan was revived
Wuzzy <Wuzzy2@mail.ru>
parents:
13761
diff
changeset
|
508 |
DeathLogged:= false; |
13761
a0d6404a80a2
Rework rankings of losing clans: Rank them in the reverse order they died
Wuzzy <Wuzzy2@mail.ru>
parents:
13760
diff
changeset
|
509 |
StatsHandled:= false; |
549 | 510 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
511 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
512 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
513 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
514 |
team^.Clan:= ClansArray[c]; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
515 |
end; |
549 | 516 |
|
2695 | 517 |
with team^.Clan^ do |
549 | 518 |
begin |
2695 | 519 |
Teams[TeamsNumber]:= team; |
549 | 520 |
inc(TeamsNumber) |
521 |
end; |
|
522 |
||
11739 | 523 |
// mirror changes into array for clans to spawn |
524 |
SpawnClansArray:= ClansArray; |
|
525 |
||
2695 | 526 |
CurrentTeam:= team; |
527 |
AddTeam:= team; |
|
4 | 528 |
end; |
529 |
||
47 | 530 |
procedure RecountAllTeamsHealth; |
547 | 531 |
var t: LongInt; |
2376 | 532 |
begin |
547 | 533 |
for t:= 0 to Pred(TeamsCount) do |
534 |
RecountTeamHealth(TeamsArray[t]) |
|
47 | 535 |
end; |
536 |
||
537 |
procedure InitTeams; |
|
547 | 538 |
var i, t: LongInt; |
2784 | 539 |
th, h: LongInt; |
47 | 540 |
begin |
2726 | 541 |
|
547 | 542 |
for t:= 0 to Pred(TeamsCount) do |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
543 |
with TeamsArray[t]^ do |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
544 |
begin |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
545 |
if (not ExtDriven) and (Hedgehogs[0].BotLevel = 0) then |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
546 |
begin |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
547 |
LocalClan:= Clan^.ClanIndex; |
4465
743673c67d0c
Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.
nemo
parents:
4413
diff
changeset
|
548 |
LocalTeam:= t; |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
549 |
LocalAmmo:= Hedgehogs[0].AmmoStore |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
550 |
end; |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
551 |
th:= 0; |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
552 |
for i:= 0 to cMaxHHIndex do |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
553 |
if Hedgehogs[i].Gear <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
554 |
inc(th, Hedgehogs[i].Gear^.Health); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
555 |
if th > MaxTeamHealth then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
556 |
MaxTeamHealth:= th; |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
557 |
// Some initial King buffs |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
558 |
if (GameFlags and gfKing) <> 0 then |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
559 |
begin |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
560 |
Hedgehogs[0].King:= true; |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
561 |
Hedgehogs[0].Hat:= 'crown'; |
7010
10a0a31804f3
Switch effects to longint for convenience of tracking ice states. I could add a new Hedgehog value, but since we have this effects list being all useless as booleans anyway...
nemo
parents:
7001
diff
changeset
|
562 |
Hedgehogs[0].Effects[hePoisoned] := 0; |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
563 |
h:= Hedgehogs[0].Gear^.Health; |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
564 |
Hedgehogs[0].Gear^.Health:= hwRound(int2hwFloat(th)*_0_375); |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
565 |
if Hedgehogs[0].Gear^.Health > h then |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
566 |
begin |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
567 |
dec(th, h); |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
568 |
inc(th, Hedgehogs[0].Gear^.Health); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
569 |
if th > MaxTeamHealth then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
570 |
MaxTeamHealth:= th |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
571 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
572 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
573 |
Hedgehogs[0].Gear^.Health:= h; |
13602
f7cbf7d8298d
Cap hedgehog health to prevent overflow bugs
Wuzzy <Wuzzy2@mail.ru>
parents:
13504
diff
changeset
|
574 |
// Prevent overflow |
f7cbf7d8298d
Cap hedgehog health to prevent overflow bugs
Wuzzy <Wuzzy2@mail.ru>
parents:
13504
diff
changeset
|
575 |
if (Hedgehogs[0].Gear^.Health < 0) or (Hedgehogs[0].Gear^.Health > cMaxHogHealth) then |
f7cbf7d8298d
Cap hedgehog health to prevent overflow bugs
Wuzzy <Wuzzy2@mail.ru>
parents:
13504
diff
changeset
|
576 |
Hedgehogs[0].Gear^.Health:= cMaxHogHealth; |
4102
96efb3bbf8e3
Extend shoppa hack to disable health crates to saucer and portal modes as well
nemo
parents:
4101
diff
changeset
|
577 |
Hedgehogs[0].InitialHealth:= Hedgehogs[0].Gear^.Health |
4101
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
578 |
end; |
c5967f360beb
Apply the reset to all hogs on all teams in uGears. Make InitialHealth same type as Health to avoid issues w/ initial health > 255. Update InitialHealth with the king buff.
nemo
parents:
4099
diff
changeset
|
579 |
end; |
2726 | 580 |
|
47 | 581 |
RecountAllTeamsHealth |
4 | 582 |
end; |
583 |
||
584 |
function TeamSize(p: PTeam): Longword; |
|
2695 | 585 |
var i, value: Longword; |
4 | 586 |
begin |
2695 | 587 |
value:= 0; |
4 | 588 |
for i:= 0 to cMaxHHIndex do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
589 |
if p^.Hedgehogs[i].Gear <> nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
590 |
inc(value); |
2695 | 591 |
TeamSize:= value; |
4 | 592 |
end; |
593 |
||
549 | 594 |
procedure RecountClanHealth(clan: PClan); |
595 |
var i: LongInt; |
|
596 |
begin |
|
597 |
with clan^ do |
|
598 |
begin |
|
599 |
ClanHealth:= 0; |
|
600 |
for i:= 0 to Pred(TeamsNumber) do |
|
601 |
inc(ClanHealth, Teams[i]^.TeamHealth) |
|
602 |
end |
|
603 |
end; |
|
604 |
||
47 | 605 |
procedure RecountTeamHealth(team: PTeam); |
371 | 606 |
var i: LongInt; |
47 | 607 |
begin |
608 |
with team^ do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
609 |
begin |
7990 | 610 |
TeamHealth:= 0; |
611 |
for i:= 0 to cMaxHHIndex do |
|
612 |
if Hedgehogs[i].Gear <> nil then |
|
613 |
inc(TeamHealth, Hedgehogs[i].Gear^.Health) |
|
614 |
else if Hedgehogs[i].GearHidden <> nil then |
|
615 |
inc(TeamHealth, Hedgehogs[i].GearHidden^.Health); |
|
2376 | 616 |
|
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9685
diff
changeset
|
617 |
if TeamHealth > MaxTeamHealth then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
618 |
begin |
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9685
diff
changeset
|
619 |
MaxTeamHealth:= TeamHealth; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
620 |
RecountAllTeamsHealth; |
9720
453a1c29b7e4
Animate hedgehogs healths inside team health bar. Proper animation for the case when max team health grows is lost though.
unc0rr
parents:
9685
diff
changeset
|
621 |
end |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
622 |
end; |
549 | 623 |
|
624 |
RecountClanHealth(team^.Clan); |
|
625 |
||
2005 | 626 |
AddVisualGear(0, 0, vgtTeamHealthSorter) |
47 | 627 |
end; |
628 |
||
8817
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
629 |
procedure RestoreHog(HH: PHedgehog); |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
630 |
begin |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
631 |
HH^.Gear:=HH^.GearHidden; |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
632 |
HH^.GearHidden:= nil; |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
633 |
InsertGearToList(HH^.Gear); |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
634 |
HH^.Gear^.State:= (HH^.Gear^.State and (not (gstHHDriven or gstInvisible or gstAttacking))) or gstAttacked; |
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9285
diff
changeset
|
635 |
AddCI(HH^.Gear); |
8817
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
636 |
HH^.Gear^.Active:= true; |
13145
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13073
diff
changeset
|
637 |
ScriptCall('onHogRestore', HH^.Gear^.Uid); |
e330feceb662
Hide team bar if all hedgehogs in it are hidden or dead
Wuzzy <Wuzzy2@mail.ru>
parents:
13073
diff
changeset
|
638 |
AddVisualGear(0, 0, vgtTeamHealthSorter); |
8817
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
639 |
end; |
0d3014097240
move RestoreHog from uGears to uTeams to break a circular dependency
koda
parents:
8681
diff
changeset
|
640 |
|
72 | 641 |
procedure RestoreTeamsFromSave; |
547 | 642 |
var t: LongInt; |
72 | 643 |
begin |
547 | 644 |
for t:= 0 to Pred(TeamsCount) do |
645 |
TeamsArray[t]^.ExtDriven:= false |
|
72 | 646 |
end; |
647 |
||
2040 | 648 |
procedure TeamGoneEffect(var Team: TTeam); |
649 |
var i: LongInt; |
|
650 |
begin |
|
10345 | 651 |
with Team do |
652 |
if skippedTurns < 3 then |
|
6131 | 653 |
begin |
10349
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
654 |
inc(skippedTurns); |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
655 |
for i:= 0 to cMaxHHIndex do |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
656 |
with Hedgehogs[i] do |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
657 |
if Gear <> nil then |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
658 |
Gear^.State:= Gear^.State and (not gstHHDriven); |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
659 |
|
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10345
diff
changeset
|
660 |
ParseCommand('/skip', true); |
10345 | 661 |
end |
662 |
else |
|
663 |
for i:= 0 to cMaxHHIndex do |
|
664 |
with Hedgehogs[i] do |
|
665 |
begin |
|
666 |
if Hedgehogs[i].GearHidden <> nil then |
|
667 |
RestoreHog(@Hedgehogs[i]); |
|
6131 | 668 |
|
10345 | 669 |
if Gear <> nil then |
670 |
begin |
|
671 |
Gear^.Hedgehog^.Effects[heInvulnerable]:= 0; |
|
672 |
Gear^.Damage:= Gear^.Health; |
|
673 |
Gear^.State:= (Gear^.State or gstHHGone) and (not gstHHDriven) |
|
674 |
end |
|
675 |
end |
|
2040 | 676 |
end; |
677 |
||
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
678 |
procedure chAddHH(var id: shortstring); |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
679 |
var s: shortstring; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
680 |
Gear: PGear; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
681 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
682 |
s:= ''; |
10883
294ef49efdd2
terminate engine and output fatal error message if hedgehogs are added incorrectly
sheepluva
parents:
10665
diff
changeset
|
683 |
if (not isDeveloperMode) then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
684 |
exit; |
11537 | 685 |
if checkFails((CurrentTeam <> nil), 'Can''t add hedgehogs yet, add a team first!', true) then exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
686 |
with CurrentTeam^ do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
687 |
begin |
11537 | 688 |
if checkFails(HedgehogsNumber<=cMaxHHIndex, 'Can''t add hedgehog to "' + TeamName + '"! (already ' + intToStr(HedgehogsNumber) + ' hogs)', true) then exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
689 |
SplitBySpace(id, s); |
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
690 |
SwitchCurrentHedgehog(@Hedgehogs[HedgehogsNumber]); |
8370 | 691 |
CurrentHedgehog^.BotLevel:= StrToInt(id); |
9749
443d233316e5
make the team association with hog before calling gear creation. makes some lua a little easier
nemo
parents:
9720
diff
changeset
|
692 |
CurrentHedgehog^.Team:= CurrentTeam; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
693 |
Gear:= AddGear(0, 0, gtHedgehog, 0, _0, _0, 0); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
694 |
SplitBySpace(s, id); |
8370 | 695 |
Gear^.Health:= StrToInt(s); |
13602
f7cbf7d8298d
Cap hedgehog health to prevent overflow bugs
Wuzzy <Wuzzy2@mail.ru>
parents:
13504
diff
changeset
|
696 |
if checkFails((Gear^.Health > 0) and (Gear^.Health <= cMaxHogHealth), 'Invalid hedgehog health (must be between 1 and '+IntToStr(cMaxHogHealth)+')', true) then exit; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
697 |
if (GameFlags and gfSharedAmmo) <> 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
698 |
CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
699 |
else if (GameFlags and gfPerHogAmmo) <> 0 then |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
700 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
701 |
AddAmmoStore; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
702 |
CurrentHedgehog^.AmmoStore:= StoreCnt - 1 |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
703 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
704 |
else CurrentHedgehog^.AmmoStore:= TeamsCount - 1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
705 |
CurrentHedgehog^.Gear:= Gear; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
706 |
CurrentHedgehog^.Name:= id; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
707 |
CurrentHedgehog^.InitialHealth:= Gear^.Health; |
14039 | 708 |
CurrentHedgehog^.RevengeHog:= nil; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
709 |
CurrHedgehog:= HedgehogsNumber; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
710 |
inc(HedgehogsNumber) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
711 |
end |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
712 |
end; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
713 |
|
9407
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
714 |
procedure loadTeamBinds(s: shortstring); |
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
715 |
var i: LongInt; |
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
716 |
begin |
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
717 |
for i:= 1 to length(s) do |
9521
8054d9d775fd
merge with latest defaul, fixing compiling with fpc, parsing and rendering with pas2c, some minor problems with compiling with clang
koda
diff
changeset
|
718 |
if ((s[i] = '\') or |
8054d9d775fd
merge with latest defaul, fixing compiling with fpc, parsing and rendering with pas2c, some minor problems with compiling with clang
koda
diff
changeset
|
719 |
(s[i] = '/') or |
8054d9d775fd
merge with latest defaul, fixing compiling with fpc, parsing and rendering with pas2c, some minor problems with compiling with clang
koda
diff
changeset
|
720 |
(s[i] = ':')) then |
8054d9d775fd
merge with latest defaul, fixing compiling with fpc, parsing and rendering with pas2c, some minor problems with compiling with clang
koda
diff
changeset
|
721 |
s[i]:= '_'; |
9407
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
722 |
|
9466 | 723 |
s:= cPathz[ptTeams] + '/' + s + '.hwt'; |
9464
901e363d5837
Finish rework of default binds system. Default binds now work even before first turn.
unc0rr
parents:
9407
diff
changeset
|
724 |
|
9466 | 725 |
loadBinds('bind', s); |
9407
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
726 |
end; |
860f959f92c9
Engine loads team binds from team config. Frontend still sends default binds commands, and default binds in team config aren't processed.
unc0rr
parents:
9295
diff
changeset
|
727 |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
728 |
procedure chAddTeam(var s: shortstring); |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
729 |
var Color: Longword; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
730 |
ts, cs: shortstring; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
731 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
732 |
cs:= ''; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
733 |
ts:= ''; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
734 |
if isDeveloperMode then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
735 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
736 |
SplitBySpace(s, cs); |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
737 |
SplitBySpace(cs, ts); |
8370 | 738 |
Color:= StrToInt(cs); |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
739 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
740 |
// color is always little endian so the mask must be constant also in big endian archs |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
741 |
Color:= Color or $FF000000; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
742 |
AddTeam(Color); |
11544 | 743 |
|
744 |
if CurrentTeam <> nil then |
|
745 |
begin |
|
746 |
CurrentTeam^.TeamName:= ts; |
|
747 |
CurrentTeam^.PlayerHash:= s; |
|
748 |
loadTeamBinds(ts); |
|
10015 | 749 |
|
11544 | 750 |
if GameType in [gmtDemo, gmtSave, gmtRecord] then |
751 |
CurrentTeam^.ExtDriven:= true; |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
752 |
|
11544 | 753 |
CurrentTeam^.voicepack:= AskForVoicepack('Default') |
754 |
end |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
755 |
end |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
756 |
end; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
757 |
|
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
758 |
procedure chSetHHCoords(var x: shortstring); |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
759 |
var y: shortstring; |
8370 | 760 |
t: Longint; |
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
761 |
begin |
8370 | 762 |
y:= ''; |
763 |
if (not isDeveloperMode) or (CurrentHedgehog = nil) or (CurrentHedgehog^.Gear = nil) then |
|
764 |
exit; |
|
765 |
SplitBySpace(x, y); |
|
766 |
t:= StrToInt(x); |
|
767 |
CurrentHedgehog^.Gear^.X:= int2hwFloat(t); |
|
768 |
t:= StrToInt(y); |
|
769 |
CurrentHedgehog^.Gear^.Y:= int2hwFloat(t) |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
770 |
end; |
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
771 |
|
4401 | 772 |
procedure chBind(var id: shortstring); |
773 |
begin |
|
9466 | 774 |
if CurrentTeam = nil then |
775 |
exit; |
|
7191
9419294e5f33
first attempt at implementing support for keys with modifiers
Xeli
parents:
7184
diff
changeset
|
776 |
|
9466 | 777 |
addBind(CurrentTeam^.Binds, id) |
4401 | 778 |
end; |
779 |
||
4404 | 780 |
procedure chTeamGone(var s:shortstring); |
10344
cceabf9628bb
Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits
unc0rr
parents:
10343
diff
changeset
|
781 |
var t, i: LongInt; |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
782 |
isSynced: boolean; |
4404 | 783 |
begin |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
784 |
isSynced:= s[1] = 's'; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
785 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
786 |
Delete(s, 1, 1); |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
787 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
788 |
t:= 0; |
10665 | 789 |
while (t < TeamsCount) and (TeamsArray[t]^.TeamName <> s) do |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
790 |
inc(t); |
10665 | 791 |
if t = TeamsCount then |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
792 |
exit; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
793 |
|
10397 | 794 |
TeamsArray[t]^.isGoneFlagPendingToBeSet:= true; |
10344
cceabf9628bb
Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits
unc0rr
parents:
10343
diff
changeset
|
795 |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
796 |
if isSynced then |
10665 | 797 |
begin |
798 |
for i:= 0 to Pred(TeamsCount) do |
|
799 |
with TeamsArray[i]^ do |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
800 |
begin |
10665 | 801 |
if (not hasGone) and isGoneFlagPendingToBeSet then |
802 |
begin |
|
13882 | 803 |
AddChatString(#7 + Format('* '+shortstring(trmsg[sidTeamGone]), TeamName)); |
10665 | 804 |
if not CurrentTeam^.ExtDriven then SendIPC(_S'f' + s); |
805 |
hasGone:= true; |
|
806 |
skippedTurns:= 0; |
|
807 |
isGoneFlagPendingToBeSet:= false; |
|
808 |
RecountTeamHealth(TeamsArray[i]) |
|
809 |
end; |
|
810 |
if hasGone and isGoneFlagPendingToBeUnset then |
|
811 |
ParseCommand('/teamback s' + s, true) |
|
812 |
end |
|
813 |
end |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
814 |
else |
10665 | 815 |
begin |
10944
c4b3440eeac6
- Fix order of messages, also don't duplicate last timestamped message
unc0rr
parents:
10883
diff
changeset
|
816 |
//TeamsArray[t]^.isGoneFlagPendingToBeSet:= true; |
10344
cceabf9628bb
Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits
unc0rr
parents:
10343
diff
changeset
|
817 |
|
10398 | 818 |
if (not CurrentTeam^.ExtDriven) or (CurrentTeam^.TeamName = s) or (CurrentTeam^.hasGone) then |
10665 | 819 |
ParseCommand('/teamgone s' + s, true) |
820 |
end; |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
821 |
end; |
4404 | 822 |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
823 |
procedure chTeamBack(var s:shortstring); |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
824 |
var t: LongInt; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
825 |
isSynced: boolean; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
826 |
begin |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
827 |
isSynced:= s[1] = 's'; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
828 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
829 |
Delete(s, 1, 1); |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
830 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
831 |
t:= 0; |
10665 | 832 |
while (t < TeamsCount) and (TeamsArray[t]^.TeamName <> s) do |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
833 |
inc(t); |
10665 | 834 |
if t = TeamsCount then |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
835 |
exit; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
836 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
837 |
if isSynced then |
7119 | 838 |
begin |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
839 |
with TeamsArray[t]^ do |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
840 |
if hasGone then |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
841 |
begin |
13882 | 842 |
AddChatString(#8 + Format('* '+shortstring(trmsg[sidTeamBack]), TeamName)); |
10344
cceabf9628bb
Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits
unc0rr
parents:
10343
diff
changeset
|
843 |
if not CurrentTeam^.ExtDriven then SendIPC(_S'g' + s); |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
844 |
hasGone:= false; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
845 |
|
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
846 |
RecountTeamHealth(TeamsArray[t]); |
4404 | 847 |
|
10397 | 848 |
if isGoneFlagPendingToBeUnset and (Owner = UserNick) then |
10350
4e919f7b9d92
Don't pick up own team if only recieved synced teamback message. Fixes second rejoin desync (untested).
unc0rr
parents:
10349
diff
changeset
|
849 |
ExtDriven:= false; |
4e919f7b9d92
Don't pick up own team if only recieved synced teamback message. Fixes second rejoin desync (untested).
unc0rr
parents:
10349
diff
changeset
|
850 |
|
10397 | 851 |
isGoneFlagPendingToBeUnset:= false; |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
852 |
end; |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
853 |
end |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
854 |
else |
10665 | 855 |
begin |
10397 | 856 |
TeamsArray[t]^.isGoneFlagPendingToBeUnset:= true; |
10344
cceabf9628bb
Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits
unc0rr
parents:
10343
diff
changeset
|
857 |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
858 |
if not CurrentTeam^.ExtDriven then |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
859 |
ParseCommand('/teamback s' + s, true); |
10665 | 860 |
end; |
4404 | 861 |
end; |
862 |
||
863 |
||
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
864 |
procedure SwitchCurrentHedgehog(newHog: PHedgehog); |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
865 |
var oldCI, newCI: boolean; |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
866 |
oldHH: PHedgehog; |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
867 |
begin |
7755
b8958e64e68d
Also shove using shotgun, switch off hat when not active hog
nemo
parents:
7669
diff
changeset
|
868 |
if (CurrentHedgehog <> nil) and (CurrentHedgehog^.CurAmmoType = amKnife) then |
b8958e64e68d
Also shove using shotgun, switch off hat when not active hog
nemo
parents:
7669
diff
changeset
|
869 |
LoadHedgehogHat(CurrentHedgehog^, CurrentHedgehog^.Hat); |
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
870 |
oldCI:= (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.CollisionIndex >= 0); |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
871 |
newCI:= (newHog^.Gear <> nil) and (newHog^.Gear^.CollisionIndex >= 0); |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
872 |
if oldCI then DeleteCI(CurrentHedgehog^.Gear); |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
873 |
if newCI then DeleteCI(newHog^.Gear); |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
874 |
oldHH:= CurrentHedgehog; |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
875 |
CurrentHedgehog:= newHog; |
9291
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9285
diff
changeset
|
876 |
if oldCI then AddCI(oldHH^.Gear); |
15f7bb217b66
Make add/delete consistent (this has bugged me for so long)
nemo
parents:
9285
diff
changeset
|
877 |
if newCI then AddCI(newHog^.Gear) |
7270
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
878 |
end; |
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
879 |
|
93e92e82d5c8
Step 1. Add current hedgehog as top bit of bottom byte.
nemo
parents:
7191
diff
changeset
|
880 |
|
9790 | 881 |
procedure chSetHat(var s: shortstring); |
882 |
begin |
|
883 |
if (not isDeveloperMode) or (CurrentTeam = nil) then exit; |
|
884 |
with CurrentTeam^ do |
|
885 |
begin |
|
886 |
if not CurrentHedgehog^.King then |
|
887 |
if (s = '') |
|
888 |
or (((GameFlags and gfKing) <> 0) and (s = 'crown')) |
|
889 |
or ((Length(s) > 39) and (Copy(s,1,8) = 'Reserved') and (Copy(s,9,32) <> PlayerHash)) then |
|
890 |
CurrentHedgehog^.Hat:= 'NoHat' |
|
891 |
else |
|
892 |
CurrentHedgehog^.Hat:= s |
|
893 |
end; |
|
894 |
end; |
|
895 |
||
896 |
procedure chGrave(var s: shortstring); |
|
897 |
begin |
|
898 |
if CurrentTeam = nil then |
|
899 |
OutError(errmsgIncorrectUse + ' "/grave"', true); |
|
900 |
if s[1]='"' then |
|
901 |
Delete(s, 1, 1); |
|
902 |
if s[byte(s[0])]='"' then |
|
903 |
Delete(s, byte(s[0]), 1); |
|
904 |
CurrentTeam^.GraveName:= s |
|
905 |
end; |
|
906 |
||
907 |
procedure chFort(var s: shortstring); |
|
908 |
begin |
|
909 |
if CurrentTeam = nil then |
|
910 |
OutError(errmsgIncorrectUse + ' "/fort"', true); |
|
911 |
if s[1]='"' then |
|
912 |
Delete(s, 1, 1); |
|
913 |
if s[byte(s[0])]='"' then |
|
914 |
Delete(s, byte(s[0]), 1); |
|
915 |
CurrentTeam^.FortName:= s |
|
916 |
end; |
|
917 |
||
918 |
procedure chFlag(var s: shortstring); |
|
919 |
begin |
|
920 |
if CurrentTeam = nil then |
|
921 |
OutError(errmsgIncorrectUse + ' "/flag"', true); |
|
922 |
if s[1]='"' then |
|
923 |
Delete(s, 1, 1); |
|
924 |
if s[byte(s[0])]='"' then |
|
925 |
Delete(s, byte(s[0]), 1); |
|
926 |
CurrentTeam^.flag:= s |
|
927 |
end; |
|
928 |
||
929 |
procedure chOwner(var s: shortstring); |
|
930 |
begin |
|
931 |
if CurrentTeam = nil then |
|
932 |
OutError(errmsgIncorrectUse + ' "/owner"', true); |
|
933 |
||
934 |
CurrentTeam^.Owner:= s |
|
935 |
end; |
|
936 |
||
3038 | 937 |
procedure initModule; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
938 |
begin |
6898 | 939 |
RegisterVariable('addhh', @chAddHH, false); |
940 |
RegisterVariable('addteam', @chAddTeam, false); |
|
941 |
RegisterVariable('hhcoords', @chSetHHCoords, false); |
|
942 |
RegisterVariable('bind', @chBind, true ); |
|
943 |
RegisterVariable('teamgone', @chTeamGone, true ); |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10193
diff
changeset
|
944 |
RegisterVariable('teamback', @chTeamBack, true ); |
9790 | 945 |
RegisterVariable('fort' , @chFort , false); |
946 |
RegisterVariable('grave' , @chGrave , false); |
|
947 |
RegisterVariable('hat' , @chSetHat , false); |
|
948 |
RegisterVariable('flag' , @chFlag , false); |
|
949 |
RegisterVariable('owner' , @chOwner , false); |
|
4398
36d7e4b6ca81
Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents:
4393
diff
changeset
|
950 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
951 |
CurrentTeam:= nil; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
952 |
PreviousTeam:= nil; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
953 |
CurrentHedgehog:= nil; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
954 |
TeamsCount:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
955 |
ClansCount:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
956 |
LocalClan:= -1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
957 |
LocalTeam:= -1; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
958 |
LocalAmmo:= -1; |
13250
195208deff1d
- Correct initialisation of TeamsGameOver (on mobile it doesn't get reset between plays, so ones set to true, prevents game to be finished next time)
antonc27 <antonc27@mail.ru>
parents:
12584
diff
changeset
|
959 |
TeamsGameOver:= false; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
960 |
NextClan:= true; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
961 |
SwapClanPre:= -1; |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
962 |
SwapClanReal:= -1; |
6982 | 963 |
MaxTeamHealth:= 0; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
964 |
end; |
4 | 965 |
|
3038 | 966 |
procedure freeModule; |
4881
35e6269227b6
still in developement take on adding structures, working hiding of hogs and ejecting them later.
Henek
parents:
4514
diff
changeset
|
967 |
var i, h: LongWord; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
968 |
begin |
10635
8e8b320eefad
nil out CurrentHedgehog in FreeModule, add a test for nil'd CurrentHedgehog in DelCI since I'd still like to use DeleteGear for the other stuff it does. Move some variable initialiasations in AI Misc to hopefully avoid some uninit val errors.
nemo
parents:
10634
diff
changeset
|
969 |
CurrentHedgehog:= nil; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
970 |
if TeamsCount > 0 then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
971 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
972 |
for i:= 0 to Pred(TeamsCount) do |
4881
35e6269227b6
still in developement take on adding structures, working hiding of hogs and ejecting them later.
Henek
parents:
4514
diff
changeset
|
973 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
974 |
for h:= 0 to cMaxHHIndex do |
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
975 |
with TeamsArray[i]^.Hedgehogs[h] do |
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
976 |
begin |
10646
0be6442946b1
put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
nemo
parents:
10643
diff
changeset
|
977 |
// if Gear <> nil then |
0be6442946b1
put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
nemo
parents:
10643
diff
changeset
|
978 |
// DeleteGearStage(Gear, true); |
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
979 |
if GearHidden <> nil then |
10646
0be6442946b1
put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
nemo
parents:
10643
diff
changeset
|
980 |
Dispose(GearHidden); |
0be6442946b1
put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
nemo
parents:
10643
diff
changeset
|
981 |
// DeleteGearStage(GearHidden, true); |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9468
diff
changeset
|
982 |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
983 |
FreeAndNilTexture(NameTagTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
984 |
FreeAndNilTexture(HealthTagTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
985 |
FreeAndNilTexture(HatTex) |
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
986 |
end; |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9468
diff
changeset
|
987 |
|
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
988 |
with TeamsArray[i]^ do |
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
989 |
begin |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
990 |
FreeAndNilTexture(NameTagTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
991 |
FreeAndNilTexture(OwnerTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
992 |
FreeAndNilTexture(GraveTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
993 |
FreeAndNilTexture(AIKillsTex); |
13023
0248cf0da834
Add SetTeamLabel to Lua API, can set arbitrary string as team label
Wuzzy <Wuzzy2@mail.ru>
parents:
12924
diff
changeset
|
994 |
FreeAndNilTexture(LuaTeamValueTex); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
995 |
FreeAndNilTexture(FlagTex); |
9468
3d07fd84c39d
- Actually call uTexture.initModule and .freeModule
unc0rr
parents:
9466
diff
changeset
|
996 |
end; |
9655
e154ccca4dad
Tinted crosshair (without that cool white dot in the middle)
unc0rr
parents:
9468
diff
changeset
|
997 |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
998 |
Dispose(TeamsArray[i]) |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
999 |
end; |
9656 | 1000 |
for i:= 0 to Pred(ClansCount) do |
1001 |
begin |
|
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
1002 |
FreeAndNilTexture(ClansArray[i]^.HealthTex); |
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10581
diff
changeset
|
1003 |
Dispose(ClansArray[i]) |
9656 | 1004 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
1005 |
end; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
1006 |
TeamsCount:= 0; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6543
diff
changeset
|
1007 |
ClansCount:= 0; |
13656
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
1008 |
SwapClanPre:= -1; |
56a925256039
Add separate TotalRounds var for Lua to count the *actual* number of rounds that have been played
Wuzzy <Wuzzy2@mail.ru>
parents:
13655
diff
changeset
|
1009 |
SwapClanReal:= -1; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
1010 |
end; |
4 | 1011 |
|
1012 |
end. |