hedgewars-draft: hedgewars/GSHandlers.inc@ad1ec7212ac7 (annotated)

4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1	(*
1066 1f1b3686a2b0 Update copyright headers a bit unc0rr parents: 1047 diff changeset	2	* Hedgewars, a free turn based strategy game
9080 9b42757d7e71 bump copyright year for Andrey entries unc0rr parents: 9077 diff changeset	3	* Copyright (c) 2004-2013 Andrey Korotaev <unC0Rr@gmail.com>
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	4	*
183 57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	5	* This program is free software; you can redistribute it and/or modify
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	6	* it under the terms of the GNU General Public License as published by
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	7	* the Free Software Foundation; version 2 of the License
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	8	*
183 57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	9	* This program is distributed in the hope that it will be useful,
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	12	* GNU General Public License for more details.
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	13	*
183 57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	14	* You should have received a copy of the GNU General Public License
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	15	* along with this program; if not, write to the Free Software
57c2ef19f719 Relicense to GPL unc0rr parents: 161 diff changeset	16	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	17	*)
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	18
5121 2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	19	(*
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	20	* This file contains the step handlers for gears.
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	21	*
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	22	* Important: Since gears change the course of the game, calculations that
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	23	* lead to different results for different clients/players/machines
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	24	* should NOT occur!
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	25	* Use safe functions and data types! (e.g. GetRandom() and hwFloat)
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	26	*)
2d34ec60992c added some comments in order to confuse the GSoC students as much as possible ;D sheepluva parents: 5076 diff changeset	27
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	28	procedure doStepPerPixel(Gear: PGear; step: TGearStepProcedure; onlyCheckIfChanged: boolean);
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	29	var
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	30	dX, dY, sX, sY: hwFloat;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	31	i, steps: LongWord;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	32	caller: TGearStepProcedure;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	33	begin
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	34	dX:= Gear^.dX;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	35	dY:= Gear^.dY;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	36	steps:= max(abs(hwRound(Gear^.X+dX)-hwRound(Gear^.X)), abs(hwRound(Gear^.Y+dY)-hwRound(Gear^.Y)));
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	37
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	38	// Gear is still on the same Pixel it was before
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	39	if steps < 1 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	40	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	41	if onlyCheckIfChanged then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	42	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	43	Gear^.X := Gear^.X + dX;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	44	Gear^.Y := Gear^.Y + dY;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	45	EXIT;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	46	end
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	47	else
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	48	steps := 1;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	49	end;
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	50
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	51	if steps > 1 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	52	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	53	sX:= dX / steps;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	54	sY:= dY / steps;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	55	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	56
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	57	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	58	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	59	sX:= dX;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	60	sY:= dY;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	61	end;
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	62
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	63	caller:= Gear^.doStep;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	64
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	65	for i:= 1 to steps do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	66	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	67	Gear^.X := Gear^.X + sX;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	68	Gear^.Y := Gear^.Y + sY;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	69	step(Gear);
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	70	if (Gear^.doStep <> caller)
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	71	or ((Gear^.State and gstCollision) <> 0)
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	72	or ((Gear^.State and gstMoving) = 0) then
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	73	break;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	74	end;
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	75	end;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	76
2647 0e1208e92dfe Smaxx patch with tuning by me: unc0rr parents: 2634 diff changeset	77	procedure makeHogsWorry(x, y: hwFloat; r: LongInt);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	78	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	79	gi: PGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	80	d: LongInt;
2647 0e1208e92dfe Smaxx patch with tuning by me: unc0rr parents: 2634 diff changeset	81	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	82	gi := GearsList;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	83	while gi <> nil do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	84	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	85	if (gi^.Kind = gtHedgehog) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	86	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	87	d := r - hwRound(Distance(gi^.X - x, gi^.Y - y));
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	88	if (d > 1) and (not gi^.Invulnerable) and (GetRandom(2) = 0) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	89	begin
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	90	if (CurrentHedgehog^.Gear = gi) then
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	91	PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	92
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	93	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	94	begin
8632 b5ed76d2a1f9 Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle. nemo parents: 8628 diff changeset	95	if ((gi^.State and gstMoving) = 0) and (gi^.Hedgehog^.Effects[heFrozen] = 0) then
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	96	begin
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	97	gi^.dX.isNegative:= X<gi^.X;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	98	gi^.State := gi^.State or gstLoser;
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	99	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	100
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	101	if d > r div 2 then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	102	PlaySoundV(sndNooo, gi^.Hedgehog^.Team^.voicepack)
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	103	else
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	104	PlaySoundV(sndUhOh, gi^.Hedgehog^.Team^.voicepack);
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	105	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	106	end;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	107	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	108
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	109	gi := gi^.NextGear
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	110	end;
2647 0e1208e92dfe Smaxx patch with tuning by me: unc0rr parents: 2634 diff changeset	111	end;
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	112
5807 5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	113	procedure HideHog(HH: PHedgehog);
5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	114	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	115	ScriptCall('onHogHide', HH^.Gear^.Uid);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	116	DeleteCI(HH^.Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	117	if FollowGear = HH^.Gear then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	118	FollowGear:= nil;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	119
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	120	if lastGearByUID = HH^.Gear then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	121	lastGearByUID := nil;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	122
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	123	HH^.Gear^.Message:= HH^.Gear^.Message or gmRemoveFromList;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	124	with HH^.Gear^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	125	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	126	Z := cHHZ;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	127	HH^.Gear^.Active:= false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	128	State:= State and (not (gstHHDriven or gstAttacking or gstAttacked));
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	129	Message := Message and (not gmAttack);
5807 5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	130	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	131	HH^.GearHidden:= HH^.Gear;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	132	HH^.Gear:= nil
5807 5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	133	end;
5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	134
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	135
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	136	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	137	procedure doStepDrowningGear(Gear: PGear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	138	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	139	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	140	Gear^.Y := Gear^.Y + cDrownSpeed;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	141	Gear^.X := Gear^.X + Gear^.dX * cDrownSpeed;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	142	// Create some bubbles (0.5% might be better but causes too few bubbles sometimes)
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	143	if ((not SuddenDeathDmg and (WaterOpacity < $FF))
8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	144	or (SuddenDeathDmg and (SDWaterOpacity < $FF))) and ((GameTicks and $1F) = 0) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	145	if (Gear^.Kind = gtHedgehog) and (Random(4) = 0) then
5494 5f55e9202122 Fix crasher. thanks to dagni for the demo file that tracked it down. nemo parents: 5480 diff changeset	146	AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble)
2225 162d8f6bca25 Fewer bubbles for non-breathing gears nemo parents: 2221 diff changeset	147	else if Random(12) = 0 then
5494 5f55e9202122 Fix crasher. thanks to dagni for the demo file that tracked it down. nemo parents: 5480 diff changeset	148	AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble);
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	149	if (not SuddenDeathDmg and (WaterOpacity > $FE))
8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	150	or (SuddenDeathDmg and (SDWaterOpacity > $FE))
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	151	or (hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater) then
5494 5f55e9202122 Fix crasher. thanks to dagni for the demo file that tracked it down. nemo parents: 5480 diff changeset	152	DeleteGear(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	153	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	154
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	155	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	156	procedure doStepFallingGear(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	157	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	158	isFalling: boolean;
3020 9b443edb8dd1 use cWaterLine for steam, splashes and droplets nemo parents: 3019 diff changeset	159	//tmp: QWord;
2998 5b74906c14bb Slightly better behaved bounce, assuming we can make this 45 deg thing work, calcs could stand some optimisation. nemo parents: 2995 diff changeset	160	tdX, tdY: hwFloat;
3001 a1d1e0d0067a Still fiddling with bouncing, hoping to make it work nemo parents: 2998 diff changeset	161	collV, collH: LongInt;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	162	land: word;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	163	begin
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	164	// clip velocity at 2 - over 1 per pixel, but really shouldn't cause many actual problems.
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	165	if Gear^.dX.Round > 2 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	166	Gear^.dX.QWordValue:= 8589934592;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	167	if Gear^.dY.Round > 2 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	168	Gear^.dY.QWordValue:= 8589934592;
8838 aa2ffd427f6a strip PAS2C, old WEB symbols and outdated pas2c sources from default branch, all c-related development is done on the webgl branch koda parents: 8822 diff changeset	169
8992 5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	170	if (Gear^.State and gstSubmersible <> 0) and (hwRound(Gear^.Y) > cWaterLine) then
5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	171	begin
5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	172	Gear^.dX:= Gear^.dX * _0_999;
5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	173	Gear^.dY:= Gear^.dY * _0_999
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	174	end;
8992 5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	175
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	176	Gear^.State := Gear^.State and (not gstCollision);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	177	collV := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	178	collH := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	179	tdX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	180	tdY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	181
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	182
8992 5b0be812dcdb Rename submersible state, increase getaway time for attack underwater, slow down gear dx/dy underwater to simulate water resistance nemo parents: 8990 diff changeset	183
3359 d17b9f6adae5 Engine: smxx parents: 3358 diff changeset	184	// might need some testing/adjustments - just to avoid projectiles to fly forever (accelerated by wind/skips)
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	185	if (hwRound(Gear^.X) < min(LAND_WIDTH div -2, -2048))
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	186	or (hwRound(Gear^.X) > max(LAND_WIDTH * 3 div 2, 6144)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	187	Gear^.State := Gear^.State or gstCollision;
3359 d17b9f6adae5 Engine: smxx parents: 3358 diff changeset	188
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	189	if Gear^.dY.isNegative then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	190	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	191	isFalling := true;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	192	land:= TestCollisionYwithGear(Gear, -1);
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	193	if land <> 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	194	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	195	collV := -1;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	196	if land and lfIce <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	197	Gear^.dX := Gear^.dX * (_0_9 + Gear^.Friction * _0_1)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	198	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	199	Gear^.dX := Gear^.dX * Gear^.Friction;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	200
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	201	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	202	Gear^.State := Gear^.State or gstCollision
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	203	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	204	else if (Gear^.AdvBounce=1) and (TestCollisionYwithGear(Gear, 1) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	205	collV := 1;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	206	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	207	else
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	208	begin // Gear^.dY.isNegative is false
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	209	land:= TestCollisionYwithGear(Gear, 1);
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	210	if land <> 0 then
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	211	begin
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	212	collV := 1;
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	213	isFalling := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	214	if land and lfIce <> 0 then
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	215	Gear^.dX := Gear^.dX * (_0_9 + Gear^.Friction * _0_1)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	216	else
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	217	Gear^.dX := Gear^.dX * Gear^.Friction;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	218
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	219	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	220	Gear^.State := Gear^.State or gstCollision
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	221	end
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	222	else
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	223	begin
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	224	isFalling := true;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	225	if (Gear^.AdvBounce=1) and (TestCollisionYwithGear(Gear, -1) <> 0) then
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	226	collV := -1
537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	227	end
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	228	end;
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	229
2989 b49d87499398 Add back sheepluva's 45° patch for some weapons. Rescale Tiy's latest icons to his specifications. nemo parents: 2983 diff changeset	230
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	231	if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	232	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	233	collH := hwSign(Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	234	Gear^.dX := - Gear^.dX * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	235	Gear^.dY := Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	236	Gear^.State := Gear^.State or gstCollision
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	237	end
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	238	else if (Gear^.AdvBounce=1) and TestCollisionXwithGear(Gear, -hwSign(Gear^.dX)) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	239	collH := -hwSign(Gear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	240	//if Gear^.AdvBounce and (collV <>0) and (collH <> 0) and (hwSqr(tdX) + hwSqr(tdY) > _0_08) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	241	if (Gear^.AdvBounce=1) and (collV <>0) and (collH <> 0) and ((collV=-1)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	242	or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	243	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	244	Gear^.dX := tdYGear^.ElasticityGear^.Friction;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	245	Gear^.dY := tdX*Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	246	//*Gear^.Friction;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	247	Gear^.dY.isNegative := not tdY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	248	isFalling := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	249	Gear^.AdvBounce := 10;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	250	end;
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	251
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	252	if Gear^.AdvBounce > 1 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	253	dec(Gear^.AdvBounce);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	254
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	255	if isFalling then
4299 d23f8a25fc3f tweak more wind mode nemo parents: 4297 diff changeset	256	begin
d23f8a25fc3f tweak more wind mode nemo parents: 4297 diff changeset	257	Gear^.dY := Gear^.dY + cGravity;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	258	if (GameFlags and gfMoreWind) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	259	Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	260	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	261
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	262	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	263	Gear^.Y := Gear^.Y + Gear^.dY;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	264	if Gear^.Kind <> gtBee then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	265	CheckGearDrowning(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	266	//if (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) < _0_0002) and
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	267	if (not isFalling) and ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_02.QWordValue) then
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	268	Gear^.State := Gear^.State and (not gstMoving)
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	269	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	270	Gear^.State := Gear^.State or gstMoving;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	271
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	272	if (Gear^.nImpactSounds > 0) and
7777 e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	273	(Gear^.State and gstCollision <> 0) and
e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	274	(((Gear^.Kind <> gtMine) and (Gear^.Damage <> 0)) or (Gear^.State and gstMoving <> 0)) and
e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	275	(((Gear^.Radius < 3) and (Gear^.dY < -_0_1)) or
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	276	((Gear^.Radius >= 3) and
7777 e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	277	((Gear^.dX.QWordValue > _0_1.QWordValue) or (Gear^.dY.QWordValue > _0_1.QWordValue)))) then
5461 3c2d4e46440f Deletion was a bad idea. nemo parents: 5417 diff changeset	278	PlaySound(TSound(ord(Gear^.ImpactSound) + LongInt(GetRandom(Gear^.nImpactSounds))), true);
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	279	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	280
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	281	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	282	procedure doStepBomb(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	283	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	284	i, x, y: LongInt;
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	285	dX, dY, gdX: hwFloat;
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	286	vg: PVisualGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	287	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	288	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	289
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	290	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	291
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	292	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	293	if Gear^.Timer = 1000 then // might need adjustments
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	294	case Gear^.Kind of
5139 090a8b8d1083 grenade back to old damage, but from now on explosions assume they are not closer to a gear's center than the gear's radius sheepluva parents: 5137 diff changeset	295	gtGrenade: makeHogsWorry(Gear^.X, Gear^.Y, 50);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	296	gtClusterBomb: makeHogsWorry(Gear^.X, Gear^.Y, 20);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	297	gtWatermelon: makeHogsWorry(Gear^.X, Gear^.Y, 75);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	298	gtHellishBomb: makeHogsWorry(Gear^.X, Gear^.Y, 90);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	299	gtGasBomb: makeHogsWorry(Gear^.X, Gear^.Y, 50);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	300	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	301
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	302	if (Gear^.Kind = gtBall) and ((Gear^.State and gstTmpFlag) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	303	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	304	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	305	if (Gear^.State and gstCollision) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	306	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLDontDraw or EXPLNoGfx);
7726 1137406bce12 Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420 nemo parents: 7721 diff changeset	307	end;
3004 e9b3613cc3fb Engine: smxx parents: 3002 diff changeset	308
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	309	if (Gear^.Kind = gtGasBomb) and ((GameTicks mod 200) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	310	begin
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	311	vg:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite);
95345f98da19 Engine: smxx parents: 3473 diff changeset	312	if vg <> nil then
95345f98da19 Engine: smxx parents: 3473 diff changeset	313	vg^.Tint:= $FFC0C000;
7726 1137406bce12 Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420 nemo parents: 7721 diff changeset	314	end;
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	315
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	316	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	317	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	318	case Gear^.Kind of
5139 090a8b8d1083 grenade back to old damage, but from now on explosions assume they are not closer to a gear's center than the gear's radius sheepluva parents: 5137 diff changeset	319	gtGrenade: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	320	gtBall: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 40, Gear^.Hedgehog, EXPLAutoSound);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	321	gtClusterBomb:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	322	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	323	x := hwRound(Gear^.X);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	324	y := hwRound(Gear^.Y);
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	325	gdX:= Gear^.dX;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	326	doMakeExplosion(x, y, 20, Gear^.Hedgehog, EXPLAutoSound);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	327	for i:= 0 to 4 do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	328	begin
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	329	dX := rndSign(GetRandomf * _0_1) + gdX / 5;
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	330	dY := (GetRandomf - _3) * _0_08;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	331	FollowGear := AddGear(x, y, gtCluster, 0, dX, dY, 25)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	332	end
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	333	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	334	gtWatermelon:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	335	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	336	x := hwRound(Gear^.X);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	337	y := hwRound(Gear^.Y);
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	338	gdX:= Gear^.dX;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	339	doMakeExplosion(x, y, 75, Gear^.Hedgehog, EXPLAutoSound);
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	340	for i:= 0 to 5 do
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	341	begin
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	342	dX := rndSign(GetRandomf * _0_1) + gdX / 5;
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	343	dY := (GetRandomf - _1_5) * _0_3;
6120 85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	344	FollowGear:= AddGear(x, y, gtMelonPiece, 0, dX, dY, 75);
85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	345	FollowGear^.DirAngle := i * 60
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	346	end
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	347	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	348	gtHellishBomb:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	349	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	350	x := hwRound(Gear^.X);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	351	y := hwRound(Gear^.Y);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	352	doMakeExplosion(x, y, 90, Gear^.Hedgehog, EXPLAutoSound);
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	353
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	354	for i:= 0 to 127 do
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	355	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	356	dX := AngleCos(i * 16) * _0_5 * (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	357	dY := AngleSin(i * 16) * _0_5 * (GetRandomf + _1);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	358	if i mod 2 = 0 then
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	359	begin
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	360	AddGear(x, y, gtFlame, gstTmpFlag, dX, dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	361	AddGear(x, y, gtFlame, 0, dX, -dY, 0)
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	362	end
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	363	else
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	364	begin
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	365	AddGear(x, y, gtFlame, 0, dX, dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	366	AddGear(x, y, gtFlame, gstTmpFlag, dX, -dY, 0)
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	367	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	368	end
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	369	end;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	370	gtGasBomb:
de2026031833 Engine: smaxx parents: 3710 diff changeset	371	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	372	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLAutoSound);
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	373	for i:= 0 to 2 do
4160 043c17a8b3ca Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable. unc0rr parents: 4155 diff changeset	374	begin
043c17a8b3ca Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable. unc0rr parents: 4155 diff changeset	375	x:= GetRandom(60);
043c17a8b3ca Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable. unc0rr parents: 4155 diff changeset	376	y:= GetRandom(40);
6120 85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	377	FollowGear:= AddGear(hwRound(Gear^.X) - 30 + x, hwRound(Gear^.Y) - 20 + y, gtPoisonCloud, 0, _0, _0, 0);
4160 043c17a8b3ca Don't call getrandom() from parameters to a function. The order of calls is undefined, so desyncs are probable. unc0rr parents: 4155 diff changeset	378	end
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	379	end;
7726 1137406bce12 Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420 nemo parents: 7721 diff changeset	380	end;
1137406bce12 Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420 nemo parents: 7721 diff changeset	381	DeleteGear(Gear);
1137406bce12 Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420 nemo parents: 7721 diff changeset	382	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	383	end;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	384
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	385	CalcRotationDirAngle(Gear);
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	386
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	387	if Gear^.Kind = gtHellishBomb then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	388	begin
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	389
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	390	if Gear^.Timer = 3000 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	391	begin
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	392	Gear^.nImpactSounds := 0;
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	393	PlaySound(sndHellish);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	394	end;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	395
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	396	if (GameTicks and $3F) = 0 then
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	397	if (Gear^.State and gstCollision) = 0 then
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	398	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	399	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	400	end;
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	401
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	402	////////////////////////////////////////////////////////////////////////////////
ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	403	procedure doStepMolotov(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	404	var
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	405	s: Longword;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	406	i, gX, gY: LongInt;
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	407	dX, dY: hwFloat;
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	408	smoke, glass: PVisualGear;
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	409	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	410	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	411
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	412	doStepFallingGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	413	CalcRotationDirAngle(Gear);
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	414
5870 b9b9fb00c9dd smoke for molotov sheepluva parents: 5869 diff changeset	415	// let's add some smoke depending on speed
8906 82756a90a343 I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request. nemo parents: 8838 diff changeset	416	s:= max(32,152 - round((abs(hwFloat2FLoat(Gear^.dX))+abs(hwFloat2Float(Gear^.dY)))*120))+random(10);
6011 519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code) unC0Rr parents: 6002 diff changeset	417	if (GameTicks mod s) = 0 then
5871 09daa06191d7 Since we are tweaking molotov. make the flame flickery and add a drowning frame nemo parents: 5870 diff changeset	418	begin
5873 4f2d8ce3732b fix side-effects of nemo's bottle-turnin' sheepluva parents: 5871 diff changeset	419	// adjust angle to match the texture
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	420	if Gear^.dX.isNegative then
8906 82756a90a343 I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request. nemo parents: 8838 diff changeset	421	i:= 130
82756a90a343 I see no reason why a visual effect needs Distance. IMO square should look just fine. Untested. Oh. Also reduced flake count at Randi's request. nemo parents: 8838 diff changeset	422	else i:= 50;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	423
5873 4f2d8ce3732b fix side-effects of nemo's bottle-turnin' sheepluva parents: 5871 diff changeset	424	smoke:= AddVisualGear(hwRound(Gear^.X)-round(cos((Gear^.DirAngle+i) * pi / 180)20), hwRound(Gear^.Y)-round(sin((Gear^.DirAngle+i) pi / 180)*20), vgtSmoke);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	425	if smoke <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	426	smoke^.Scale:= 0.75;
5871 09daa06191d7 Since we are tweaking molotov. make the flame flickery and add a drowning frame nemo parents: 5870 diff changeset	427	end;
5870 b9b9fb00c9dd smoke for molotov sheepluva parents: 5869 diff changeset	428
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	429	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	430	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	431	PlaySound(sndMolotov);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	432	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	433	gY := hwRound(Gear^.Y);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	434	for i:= 0 to 4 do
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	435	begin
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	436	(*glass:= AddVisualGear(gx+random(7)-3, gy+random(5)-2, vgtEgg);
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	437	if glass <> nil then
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	438	begin
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	439	glass^.Frame:= 2;
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	440	glass^.Tint:= $41B83ED0 - i * $10081000;
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	441	glass^.dX:= 1/(10*(random(11)-5));
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	442	glass^.dY:= -1/(random(4)+5);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	443	end;*)
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	444	glass:= AddVisualGear(gx+random(7)-3, gy+random(7)-3, vgtStraightShot);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	445	if glass <> nil then
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	446	with glass^ do
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	447	begin
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	448	Frame:= 2;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	449	Tint:= $41B83ED0 - i * $10081000;
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	450	Angle:= random(360);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	451	dx:= 0.0000001;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	452	dy:= 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	453	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	454	dx := -dx;
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	455	FrameTicks:= 750;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	456	State:= ord(sprEgg)
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	457	end;
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	458	end;
5415 94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	459	for i:= 0 to 24 do
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	460	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	461	dX := AngleCos(i * 2) * ((_0_15(i div 5))) (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	462	dY := AngleSin(i * 8) * _0_5 * (GetRandomf + _1);
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	463	AddGear(gX, gY, gtFlame, gstTmpFlag, dX, dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	464	AddGear(gX, gY, gtFlame, gstTmpFlag, dX,-dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	465	AddGear(gX, gY, gtFlame, gstTmpFlag,-dX, dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	466	AddGear(gX, gY, gtFlame, gstTmpFlag,-dX,-dY, 0);
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	467	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	468	DeleteGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	469	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	470	end;
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	471	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	472
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	473	////////////////////////////////////////////////////////////////////////////////
1279 33cae6d1635c Use new sounds unc0rr parents: 1273 diff changeset	474
78 66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	475	procedure doStepCluster(Gear: PGear);
66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	476	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	477	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	478	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	479	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	480	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	481	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Timer, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	482	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	483	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	484	end;
1262 e9191c693e44 Add watermelon sprite unc0rr parents: 1261 diff changeset	485
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	486	if (Gear^.Kind = gtMelonPiece)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	487	or (Gear^.Kind = gtBall) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	488	CalcRotationDirAngle(Gear)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	489	else if (GameTicks and $1F) = 0 then
8993 839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	490	begin
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	491	if hwRound(Gear^.Y) > cWaterLine then
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	492	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	493	else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	494	end
78 66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	495	end;
66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	496
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	497	////////////////////////////////////////////////////////////////////////////////
4168 49ad7bea4a33 renaming gtAmmo_Bomb and gtAmmo_Grenade Henek parents: 4160 diff changeset	498	procedure doStepShell(Gear: PGear);
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	499	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	500	AllInactive := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	501	if (GameFlags and gfMoreWind) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	502	Gear^.dX := Gear^.dX + cWindSpeed;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	503	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	504	if (Gear^.State and gstCollision) <> 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	505	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	506	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	507	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	508	exit
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	509	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	510	if (GameTicks and $3F) = 0 then
8993 839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	511	begin
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	512	if hwRound(Gear^.Y) > cWaterLine then
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	513	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	514	else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	515	end
95 1ef5e2c41115 - Fixed compilation unc0rr parents: 89 diff changeset	516	end;
1ef5e2c41115 - Fixed compilation unc0rr parents: 89 diff changeset	517
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	518	////////////////////////////////////////////////////////////////////////////////
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	519	procedure doStepSnowball(Gear: PGear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	520	var kick, i: LongInt;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	521	particle: PVisualGear;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	522	gdX, gdY: hwFloat;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	523	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	524	AllInactive := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	525	if (GameFlags and gfMoreWind) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	526	Gear^.dX := Gear^.dX + cWindSpeed;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	527	gdX := Gear^.dX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	528	gdY := Gear^.dY;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	529	doStepFallingGear(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	530	CalcRotationDirAngle(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	531	if (Gear^.State and gstCollision) <> 0 then
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	532	begin
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	533	kick:= hwRound((hwAbs(gdX)+hwAbs(gdY)) * _20);
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	534	Gear^.dX:= gdX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	535	Gear^.dY:= gdY;
7621 f0d739c34f2b disable snowball damage, by request of sheepluva nemo parents: 7592 diff changeset	536	AmmoShove(Gear, 0, kick);
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	537	for i:= 15 + kick div 10 downto 0 do
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	538	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	539	particle := AddVisualGear(hwRound(Gear^.X) + Random(25), hwRound(Gear^.Y) + Random(25), vgtDust);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	540	if particle <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	541	particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	542	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	543	DeleteGear(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	544	exit
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	545	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	546	if ((GameTicks and $1F) = 0) and (Random(3) = 0) then
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	547	begin
4582 85e92b6e5ad4 FAIL - actually assign nemo parents: 4578 diff changeset	548	particle:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	549	if particle <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	550	particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	551	end
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	552	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	553
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	554	////////////////////////////////////////////////////////////////////////////////
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	555	procedure doStepSnowflake(Gear: PGear);
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	556	var xx, yy, px, py, rx, ry, lx, ly: LongInt;
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	557	move, draw, allpx, gun: Boolean;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	558	s: PSDL_Surface;
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	559	p: PLongwordArray;
5693 24a93bbdb81a Avoid unsightly gaps in landbacktex nemo parents: 5692 diff changeset	560	lf: LongWord;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	561	begin
5695 f1015857deb8 Prevent flakes from drawing if they spawn in land nemo parents: 5693 diff changeset	562	inc(Gear^.Pos);
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	563	gun:= (Gear^.State and gstTmpFlag) <> 0;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	564	move:= false;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	565	draw:= false;
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	566	if gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	567	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	568	Gear^.State:= Gear^.State and (not gstInvisible);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	569	doStepFallingGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	570	CheckCollision(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	571	if ((Gear^.State and gstCollision) <> 0) or ((Gear^.State and gstMoving) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	572	draw:= true;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	573	xx:= hwRound(Gear^.X);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	574	yy:= hwRound(Gear^.Y);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	575	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	576	else if GameTicks and $7 = 0 then
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	577	begin
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	578	with Gear^ do
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	579	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	580	State:= State and (not gstInvisible);
5355 9e0c51a882aa match snow to visual gear nemo parents: 5340 diff changeset	581	X:= X + cWindSpeed * 3200 + dX;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	582	Y:= Y + dY + cGravity * vobFallSpeed * 8; // using same value as flakes to try and get similar results
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	583	xx:= hwRound(X);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	584	yy:= hwRound(Y);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	585	if vobVelocity <> 0 then
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	586	begin
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	587	DirAngle := DirAngle + (Damage / 1000);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	588	if DirAngle < 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	589	DirAngle := DirAngle + 360
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	590	else if 360 < DirAngle then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	591	DirAngle := DirAngle - 360;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	592	end;
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	593	(*
df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	594	We aren't using frametick right now, so just a waste of cycles.
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	595	inc(Health, 8);
5186 a05c14510c8a fix some more warnings koda parents: 5173 diff changeset	596	if longword(Health) > vobFrameTicks then
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	597	begin
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	598	dec(Health, vobFrameTicks);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	599	inc(Timer);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	600	if Timer = vobFramesCount then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	601	Timer:= 0
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	602	end;
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	603	*)
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	604	// move back to cloud layer
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	605	if yy > cWaterLine then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	606	move:= true
7477 26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM. nemo parents: 7468 diff changeset	607	else if (xx > snowRight) or (xx < snowLeft) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	608	move:=true
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	609	// Solid pixel encountered
7477 26706bf32ecf First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM. nemo parents: 7468 diff changeset	610	else if ((yy and LAND_HEIGHT_MASK) = 0) and ((xx and LAND_WIDTH_MASK) = 0) and (Land[yy, xx] <> 0) then
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	611	begin
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	612	lf:= Land[yy, xx] and (lfObject or lfBasic or lfIndestructible);
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	613	if lf = 0 then lf:= lfObject;
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	614	// If there's room below keep falling
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	615	if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (Land[yy-1, xx] = 0) then
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	616	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	617	X:= X - cWindSpeed * 1600 - dX;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	618	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	619	// If there's room below, on the sides, fill the gaps
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	620	else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx-(1hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx-(1hwSign(cWindSpeed)))] = 0) then
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	621	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	622	X:= X - _0_8 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	623	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	624	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	625	else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx-(2hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx-(2hwSign(cWindSpeed)))] = 0) then
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	626	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	627	X:= X - _0_8 * 2 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	628	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	629	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	630	else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx+(1hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx+(1hwSign(cWindSpeed)))] = 0) then
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	631	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	632	X:= X + _0_8 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	633	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	634	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	635	else if (((yy-1) and LAND_HEIGHT_MASK) = 0) and (((xx+(2hwSign(cWindSpeed))) and LAND_WIDTH_MASK) = 0) and (Land[yy-1, (xx+(2hwSign(cWindSpeed)))] = 0) then
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	636	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	637	X:= X + _0_8 * 2 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	638	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	639	end
4805 01332828b568 Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms. Palewolf parents: 4803 diff changeset	640	// if there's an hog/object below do nothing
01332828b568 Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms. Palewolf parents: 4803 diff changeset	641	else if ((((yy+1) and LAND_HEIGHT_MASK) = 0) and ((Land[yy+1, xx] and $FF) <> 0))
01332828b568 Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms. Palewolf parents: 4803 diff changeset	642	then move:=true
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	643	else draw:= true
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	644	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	645	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	646	end;
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	647	if draw then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	648	with Gear^ do
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	649	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	650	// we've collided with land. draw some stuff and get back into the clouds
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	651	move:= true;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	652	if (Pos > 20) and ((CurAmmoGear = nil)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	653	or (CurAmmoGear^.Kind <> gtRope)) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	654	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	655	////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS ////////////////////////////////////
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	656	if not gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	657	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	658	dec(yy,3);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	659	dec(xx,1)
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	660	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	661	s:= SpritesData[sprSnow].Surface;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	662	p:= s^.pixels;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	663	allpx:= true;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	664	for py:= 0 to Pred(s^.h) do
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	665	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	666	for px:= 0 to Pred(s^.w) do
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	667	begin
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	668	lx:=xx + px; ly:=yy + py;
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	669	if (ly and LAND_HEIGHT_MASK = 0) and (lx and LAND_WIDTH_MASK = 0) and (Land[ly, lx] and $FF = 0) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	670	begin
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	671	rx:= lx;
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	672	ry:= ly;
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	673	if cReducedQuality and rqBlurryLand <> 0 then
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	674	begin
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	675	rx:= rx div 2;ry:= ry div 2;
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	676	end;
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	677	if Land[yy + py, xx + px] <= lfAllObjMask then
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	678	if gun then
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	679	begin
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	680	LandDirty[yy div 32, xx div 32]:= 1;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	681	if LandPixels[ry, rx] = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	682	Land[ly, lx]:= lfDamaged or lfObject
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	683	else Land[ly, lx]:= lfDamaged or lfBasic
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	684	end
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	685	else Land[ly, lx]:= lf;
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	686	if gun then
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	687	LandPixels[ry, rx]:= (ExplosionBorderColor and (not AMask)) or (p^[px] and AMask)
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	688	else LandPixels[ry, rx]:= addBgColor(LandPixels[ry, rx], p^[px]);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	689	end
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	690	else allpx:= false
6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	691	end;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	692	p:= @(p^[s^.pitch shr 2])
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	693	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	694
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	695	// Why is this here. For one thing, there's no test on +1 being safe.
6419 6a464d0a5c13 Tidy up flake land generation, to avoid ragged holes in landbacktex. Remove of one odd Land[] change forces a PROTO bump. Well, had to happen eventually. nemo parents: 6389 diff changeset	696	//Land[py, px+1]:= lfBasic;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	697
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	698	if allpx then
7170 84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws nemo parents: 7168 diff changeset	699	UpdateLandTexture(xx, Pred(s^.h), yy, Pred(s^.w), true)
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	700	else
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	701	begin
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	702	UpdateLandTexture(
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	703	max(0, min(LAND_WIDTH, xx)),
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	704	min(LAND_WIDTH - xx, Pred(s^.w)),
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	705	max(0, min(LAND_WIDTH, yy)),
7170 84ac6c6d2d8e Only create textures for non-empty LandPixel chunks. This should save a fair amount of memory, especially on smaller maps, and eliminate a number of draws nemo parents: 7168 diff changeset	706	min(LAND_HEIGHT - yy, Pred(s^.h)), false // could this be true without unnecessarily creating blanks?
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	707	);
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	708	end;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	709	////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS ////////////////////////////////////
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	710	end
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	711	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	712
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	713	if move then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	714	begin
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	715	if gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	716	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	717	DeleteGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	718	exit
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	719	end;
5695 f1015857deb8 Prevent flakes from drawing if they spawn in land nemo parents: 5693 diff changeset	720	Gear^.Pos:= 0;
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	721	Gear^.X:= int2hwFloat(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft);
8003 7d8bce524daf LongInt Land width/height, mouse coords nemo parents: 7992 diff changeset	722	Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1325);
5413 6786f672d30b Somehow this line got lost somewhere unc0rr parents: 5402 diff changeset	723	Gear^.State:= Gear^.State or gstInvisible;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	724	end
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	725	end;
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	726
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	727	////////////////////////////////////////////////////////////////////////////////
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	728	procedure doStepGrave(Gear: PGear);
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	729	begin
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	730	if (Gear^.Message and gmDestroy) <> 0 then
7393 3f203c62353b Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0 nemo parents: 7391 diff changeset	731	begin
3f203c62353b Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0 nemo parents: 7391 diff changeset	732	DeleteGear(Gear);
3f203c62353b Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0 nemo parents: 7391 diff changeset	733	exit
3f203c62353b Fix bug in resurrector deleting graves (exists in stable too), remove some unnecessary assignments due to the fillchar 0 nemo parents: 7391 diff changeset	734	end;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	735
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	736	AllInactive := false;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	737
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	738	if Gear^.dY.isNegative then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	739	if TestCollisionY(Gear, -1) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	740	Gear^.dY := _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	741
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	742	if not Gear^.dY.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	743	if TestCollisionY(Gear, 1) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	744	begin
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	745	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	746	if Gear^.dY > - _1div1024 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	747	begin
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	748	Gear^.Active := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	749	exit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	750	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	751	else if Gear^.dY < - _0_03 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	752	PlaySound(Gear^.ImpactSound)
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	753	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	754
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	755	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	756	CheckGearDrowning(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	757	Gear^.dY := Gear^.dY + cGravity
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	758	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	759
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	760	////////////////////////////////////////////////////////////////////////////////
3080 b7fa8ad60e3b Engine: smxx parents: 3075 diff changeset	761	procedure doStepBeeWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	762	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	763	t: hwFloat;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	764	gX,gY,i: LongInt;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	765	uw, nuw: boolean;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	766	flower: PVisualGear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	767
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	768	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	769	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	770	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	771	gY := hwRound(Gear^.Y);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	772	uw := (Gear^.Tag <> 0); // was bee underwater last tick?
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	773	nuw := (cWaterLine < gy + Gear^.Radius); // is bee underwater now?
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	774
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	775	// if water entered or left
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	776	if nuw <> uw then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	777	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	778	AddVisualGear(gX, cWaterLine, vgtSplash);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	779	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	780	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	781	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	782	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	783	StopSoundChan(Gear^.SoundChannel);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	784	if nuw then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	785	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	786	Gear^.SoundChannel := LoopSound(sndBeeWater);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	787	Gear^.Tag := 1;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	788	end
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	789	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	790	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	791	Gear^.SoundChannel := LoopSound(sndBee);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	792	Gear^.Tag := 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	793	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	794	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	795
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	796
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	797	if Gear^.Timer = 0 then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	798	Gear^.RenderTimer:= false
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	799	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	800	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	801	if (GameTicks and $F) = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	802	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	803	if (GameTicks and $30) = 0 then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	804	AddVisualGear(gX, gY, vgtBeeTrace);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	805	Gear^.dX := Gear^.Elasticity * (Gear^.dX + _0_000064 * (Gear^.Target.X - gX));
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	806	Gear^.dY := Gear^.Elasticity * (Gear^.dY + _0_000064 * (Gear^.Target.Y - gY));
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	807	// make sure new speed isn't higher than original one (which we stored in Friction variable)
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	808	t := Gear^.Friction / Distance(Gear^.dX, Gear^.dY);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	809	Gear^.dX := Gear^.dX * t;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	810	Gear^.dY := Gear^.dY * t;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	811	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	812
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	813	Gear^.X := Gear^.X + Gear^.dX;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	814	Gear^.Y := Gear^.Y + Gear^.dY;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	815
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	816	end;
3591 c447d5218f6f bee: sheepluva parents: 3588 diff changeset	817
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	818
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	819	CheckCollision(Gear);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	820	if ((Gear^.State and gstCollision) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	821	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	822	StopSoundChan(Gear^.SoundChannel);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	823	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	824	for i:= 0 to 31 do
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	825	begin
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	826	flower:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	827	if flower <> nil then
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	828	with flower^ do
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	829	begin
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	830	Scale:= 0.75;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	831	dx:= 0.001 * (random(200));
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	832	dy:= 0.001 * (random(200));
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	833	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	834	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	835	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	836	dy := -dy;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	837	FrameTicks:= random(250) + 250;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	838	State:= ord(sprTargetBee);
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	839	end;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	840	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	841	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	842	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	843
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	844	if (Gear^.Timer > 0) then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	845	dec(Gear^.Timer)
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	846	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	847	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	848	if nuw then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	849	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	850	StopSoundChan(Gear^.SoundChannel);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	851	CheckGearDrowning(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	852	end
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	853	else
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	854	doStepFallingGear(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	855	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	856	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	857
3080 b7fa8ad60e3b Engine: smxx parents: 3075 diff changeset	858	procedure doStepBee(Gear: PGear);
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	859	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	860	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	861	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	862	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	863	Gear^.dY := Gear^.dY + cGravity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	864	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	865	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	866	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	867	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	868	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	869	exit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	870	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	871	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	872	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	873	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	874	Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	875	Gear^.Hedgehog^.Gear^.State:= Gear^.Hedgehog^.Gear^.State and (not gstAttacking);
4135 5be798ecafdc This should make bee and other targetted things behave more reliably in infinite attack mode. Blocks switching of weps if a target point is active. nemo parents: 4104 diff changeset	876	AttackBar:= 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	877
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	878	Gear^.SoundChannel := LoopSound(sndBee);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	879	Gear^.Timer := 5000;
3591 c447d5218f6f bee: sheepluva parents: 3588 diff changeset	880	// save initial speed in otherwise unused Friction variable
c447d5218f6f bee: sheepluva parents: 3588 diff changeset	881	Gear^.Friction := Distance(Gear^.dX, Gear^.dY);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	882	Gear^.doStep := @doStepBeeWork
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	883	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	884	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	885
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	886	////////////////////////////////////////////////////////////////////////////////
876 d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	887	procedure doStepShotIdle(Gear: PGear);
d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	888	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	889	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	890	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	891	if Gear^.Timer > 75 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	892	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	893	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	894	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	895	end
876 d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	896	end;
d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	897
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	898	procedure doStepShotgunShot(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	899	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	900	i: LongWord;
2828 e45410eae9ea Engine: smxx parents: 2762 diff changeset	901	shell: PVisualGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	902	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	903	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	904
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	905	if ((Gear^.State and gstAnimation) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	906	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	907	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	908	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	909	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	910	PlaySound(sndShotgunFire);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	911	shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	912	if shell <> nil then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	913	begin
3593 ae50f63e4fa9 Remove hwFloat from VisualGears - they don't need the precision for syncing purposes, and it saves a whole lot of operations. nemo parents: 3591 diff changeset	914	shell^.dX := gear^.dX.QWordValue / -17179869184;
ae50f63e4fa9 Remove hwFloat from VisualGears - they don't need the precision for syncing purposes, and it saves a whole lot of operations. nemo parents: 3591 diff changeset	915	shell^.dY := gear^.dY.QWordValue / -17179869184;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	916	shell^.Frame := 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	917	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	918	Gear^.State := Gear^.State or gstAnimation
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	919	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	920	exit
7564 651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	921	end else
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	922	if(Gear^.Hedgehog^.Gear = nil) or ((Gear^.Hedgehog^.Gear^.State and gstMoving) <> 0) then
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	923	begin
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	924	DeleteGear(Gear);
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	925	AfterAttack;
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	926	exit
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	927	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	928	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	929	inc(Gear^.Timer);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	930
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	931	i := 200;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	932	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	933	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	934	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	935	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	936	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	937	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	938	Gear^.X := Gear^.X + Gear^.dX * 8;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	939	Gear^.Y := Gear^.Y + Gear^.dY * 8;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	940	ShotgunShot(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	941	Gear^.doStep := @doStepShotIdle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	942	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	943	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	944
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	945	CheckGearDrowning(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	946	if (Gear^.State and gstDrowning) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	947	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	948	Gear^.doStep := @doStepShotIdle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	949	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	950	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	951	dec(i)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	952	until i = 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	953	if (hwRound(Gear^.X) and LAND_WIDTH_MASK <> 0) or (hwRound(Gear^.Y) and LAND_HEIGHT_MASK <> 0) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	954	Gear^.doStep := @doStepShotIdle
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	955	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	956
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	957	////////////////////////////////////////////////////////////////////////////////
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	958	procedure spawnBulletTrail(Bullet: PGear);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	959	var oX, oY: hwFloat;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	960	VGear: PVisualGear;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	961	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	962	if Bullet^.PortalCounter = 0 then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	963	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	964	ox:= CurrentHedgehog^.Gear^.X + Int2hwFloat(GetLaunchX(CurrentHedgehog^.CurAmmoType, hwSign(CurrentHedgehog^.Gear^.dX), CurrentHedgehog^.Gear^.Angle));
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	965	oy:= CurrentHedgehog^.Gear^.Y + Int2hwFloat(GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle));
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	966	end
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	967	else
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	968	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	969	ox:= Bullet^.Elasticity;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	970	oy:= Bullet^.Friction;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	971	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	972
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	973	// Bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	974	VGear := AddVisualGear(hwRound(ox), hwRound(oy), vgtLineTrail);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	975
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	976	if VGear <> nil then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	977	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	978	VGear^.X:= hwFloat2Float(ox);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	979	VGear^.Y:= hwFloat2Float(oy);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	980	VGear^.dX:= hwFloat2Float(Bullet^.X);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	981	VGear^.dY:= hwFloat2Float(Bullet^.Y);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	982
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	983	// reached edge of land. assume infinite beam. Extend it way out past camera
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	984	if (hwRound(Bullet^.X) and LAND_WIDTH_MASK <> 0)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	985	or (hwRound(Bullet^.Y) and LAND_HEIGHT_MASK <> 0) then
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	986	// only extend if not under water
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	987	if hwRound(Bullet^.Y) < cWaterLine then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	988	begin
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	989	VGear^.dX := VGear^.dX + max(LAND_WIDTH,4096) * (VGear^.dX - VGear^.X);
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	990	VGear^.dY := VGear^.dY + max(LAND_WIDTH,4096) * (VGear^.dY - VGear^.Y);
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	991	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	992
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	993	VGear^.Timer := 200;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	994	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	995	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	996
2023 41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	997	procedure doStepBulletWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	998	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	999	i, x, y: LongWord;
351 29bc9c36ad5f Fixed-point arithmetics in engine. unc0rr parents: 346 diff changeset	1000	oX, oY: hwFloat;
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	1001	VGear: PVisualGear;
38 c1ec4b15d70e Better Desert Eagle and Shotgun unc0rr parents: 37 diff changeset	1002	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1003	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1004	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1005	i := 80;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1006	oX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1007	oY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1008	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1009	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1010	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1011	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1012	y := hwRound(Gear^.Y);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1013
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1014	if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1015	inc(Gear^.Damage);
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1016	// let's interrupt before a collision to give portals a chance to catch the bullet
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	1017	if (Gear^.Damage = 1) and (Gear^.Tag = 0) and not(CheckLandValue(x, y, lfLandMask)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1018	begin
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1019	Gear^.Tag := 1;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1020	Gear^.Damage := 0;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1021	Gear^.X := Gear^.X - Gear^.dX;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1022	Gear^.Y := Gear^.Y - Gear^.dY;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1023	CheckGearDrowning(Gear);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1024	break;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1025	end
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1026	else
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1027	Gear^.Tag := 0;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1028
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1029	if Gear^.Damage > 5 then
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	1030	if Gear^.AmmoType = amDEagle then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1031	AmmoShove(Gear, 7, 20)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1032	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1033	AmmoShove(Gear, Gear^.Timer, 20);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1034	CheckGearDrowning(Gear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1035	dec(i)
7204 522f165cd2e7 - Fix damage calculation in TestSniperRifle, aim a bit lower to compensate initial angle shift in sniper rifle. As a result, AI seems to never fail sniper rifle shots. unc0rr parents: 7195 diff changeset	1036	until (i = 0) or (Gear^.Damage > Gear^.Health) or ((Gear^.State and gstDrowning) <> 0);
522f165cd2e7 - Fix damage calculation in TestSniperRifle, aim a bit lower to compensate initial angle shift in sniper rifle. As a result, AI seems to never fail sniper rifle shots. unc0rr parents: 7195 diff changeset	1037
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1038	if Gear^.Damage > 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1039	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1040	DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 82 - i, 1);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1041	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1042	Gear^.Damage := 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1043	end;
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	1044	if ((Gear^.State and gstDrowning) <> 0) and (Gear^.Damage < Gear^.Health) and ((not SuddenDeathDmg and (WaterOpacity < $FF)) or (SuddenDeathDmg and (SDWaterOpacity < $FF))) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1045	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1046	for i:=(Gear^.Health - Gear^.Damage) * 4 downto 0 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1047	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1048	if Random(6) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1049	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1050	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1051	Gear^.Y := Gear^.Y + Gear^.dY;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1052	end;
2994 7ae3067546f2 Palewolf adds bubbles and splashes when firing bullets into the water nemo parents: 2989 diff changeset	1053	end;
1760 55a1edd97911 Fix nemo's large land patch unc0rr parents: 1753 diff changeset	1054
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1055	if (Gear^.Health <= 0)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1056	or (hwRound(Gear^.X) and LAND_WIDTH_MASK <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1057	or (hwRound(Gear^.Y) and LAND_HEIGHT_MASK <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1058	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1059	if (Gear^.Kind = gtSniperRifleShot) and ((GameFlags and gfLaserSight) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1060	cLaserSighting := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1061	if (Ammoz[Gear^.AmmoType].Ammo.NumPerTurn <= CurrentHedgehog^.MultiShootAttacks) and ((GameFlags and gfArtillery) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1062	cArtillery := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1063
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	1064	// Bullet Hit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1065	if (hwRound(Gear^.X) and LAND_WIDTH_MASK = 0) and (hwRound(Gear^.Y) and LAND_HEIGHT_MASK = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1066	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1067	VGear := AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBulletHit);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1068	if VGear <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1069	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1070	VGear^.Angle := DxDy2Angle(-Gear^.dX, Gear^.dY);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1071	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1072	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1073
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1074	spawnBulletTrail(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1075	Gear^.doStep := @doStepShotIdle
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	1076	end;
37 2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1077	end;
2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1078
559 6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1079	procedure doStepDEagleShot(Gear: PGear);
6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1080	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1081	PlaySound(sndGun);
5926 09bbc7b88714 2 extra steps was still occasionally causing problems w/ edge cases. hopefully 3 should do the trick nemo parents: 5924 diff changeset	1082	// add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just plain old weird angles
09bbc7b88714 2 extra steps was still occasionally causing problems w/ edge cases. hopefully 3 should do the trick nemo parents: 5924 diff changeset	1083	Gear^.X := Gear^.X + Gear^.dX * 3;
09bbc7b88714 2 extra steps was still occasionally causing problems w/ edge cases. hopefully 3 should do the trick nemo parents: 5924 diff changeset	1084	Gear^.Y := Gear^.Y + Gear^.dY * 3;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1085	Gear^.doStep := @doStepBulletWork
2023 41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1086	end;
41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1087
41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1088	procedure doStepSniperRifleShot(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1089	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1090	HHGear: PGear;
2828 e45410eae9ea Engine: smxx parents: 2762 diff changeset	1091	shell: PVisualGear;
2023 41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1092	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1093	cArtillery := true;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1094	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1095	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1096	HedgehogChAngle(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1097	if not cLaserSighting then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1098	// game does not have default laser sight. turn it on and give them a chance to aim
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1099	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1100	cLaserSighting := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1101	HHGear^.Message := 0;
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	1102	if (HHGear^.Angle >= 32) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1103	dec(HHGear^.Angle,32)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1104	end;
2031 b6f3e56fb100 david_ac's game scheme options for mine delay/quantity, tweaks to sniper rifle nemo parents: 2029 diff changeset	1105
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1106	if (HHGear^.Message and gmAttack) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1107	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1108	shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1109	if shell <> nil then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1110	begin
3593 ae50f63e4fa9 Remove hwFloat from VisualGears - they don't need the precision for syncing purposes, and it saves a whole lot of operations. nemo parents: 3591 diff changeset	1111	shell^.dX := gear^.dX.QWordValue / -8589934592;
ae50f63e4fa9 Remove hwFloat from VisualGears - they don't need the precision for syncing purposes, and it saves a whole lot of operations. nemo parents: 3591 diff changeset	1112	shell^.dY := gear^.dY.QWordValue / -8589934592;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1113	shell^.Frame := 1
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1114	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1115	Gear^.State := Gear^.State or gstAnimation;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1116	Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1117	Gear^.dY := -AngleCos(HHGear^.Angle) * _0_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1118	PlaySound(sndGun);
5926 09bbc7b88714 2 extra steps was still occasionally causing problems w/ edge cases. hopefully 3 should do the trick nemo parents: 5924 diff changeset	1119	// add 3 initial steps to avoid problem with ammoshove related to calculation of radius + 1 radius as gear widths, and also just weird angles
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1120	Gear^.X := Gear^.X + Gear^.dX * 3;
5926 09bbc7b88714 2 extra steps was still occasionally causing problems w/ edge cases. hopefully 3 should do the trick nemo parents: 5924 diff changeset	1121	Gear^.Y := Gear^.Y + Gear^.dY * 3;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1122	Gear^.doStep := @doStepBulletWork;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1123	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1124	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1125	if (GameTicks mod 32) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1126	if (GameTicks mod 4096) < 2048 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1127	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1128	if (HHGear^.Angle + 1 <= cMaxAngle) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1129	inc(HHGear^.Angle)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1130	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1131	else
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	1132	if (HHGear^.Angle >= 1) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1133	dec(HHGear^.Angle);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1134
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1135	if (TurnTimeLeft > 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1136	dec(TurnTimeLeft)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1137	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1138	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1139	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1140	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1141	end;
559 6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1142	end;
6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1143
37 2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1144	////////////////////////////////////////////////////////////////////////////////
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1145	procedure doStepActionTimer(Gear: PGear);
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1146	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1147	dec(Gear^.Timer);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1148	case Gear^.Kind of
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1149	gtATStartGame:
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1150	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1151	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1152	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1153	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1154	AddCaption(trmsg[sidStartFight], cWhiteColor, capgrpGameState);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1155	end
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1156	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1157	gtATFinishGame:
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1158	begin
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1159	AllInactive := false;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1160	if Gear^.Timer = 1000 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1161	begin
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1162	ScreenFade := sfToBlack;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1163	ScreenFadeValue := 0;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1164	ScreenFadeSpeed := 1;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1165	end;
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1166	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1167	begin
7068 b1b7eb9c8cc9 Get rid of cripple SendIPCc unc0rr parents: 7066 diff changeset	1168	SendIPC(_S'N');
b1b7eb9c8cc9 Get rid of cripple SendIPCc unc0rr parents: 7066 diff changeset	1169	SendIPC(_S'q');
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1170	GameState := gsExit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1171	end
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1172	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1173	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1174	if Gear^.Timer = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1175	DeleteGear(Gear)
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1176	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1177
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1178	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1179	procedure doStepPickHammerWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1180	var
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1181	i, ei, x, y: LongInt;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1182	HHGear: PGear;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1183	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1184	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1185	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1186	dec(Gear^.Timer);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1187	if ((GameFlags and gfInfAttack) <> 0) and (TurnTimeLeft > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1188	dec(TurnTimeLeft);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1189	if (TurnTimeLeft = 0) or (Gear^.Timer = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1190	or((Gear^.Message and gmDestroy) <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1191	or((HHGear^.State and gstHHDriven) =0) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1192	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	1193	StopSoundChan(Gear^.SoundChannel);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1194	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1195	AfterAttack;
3954 ae3583ad6ea9 Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too. nemo parents: 3953 diff changeset	1196	doStepHedgehogMoving(HHGear); // for gfInfAttack
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1197	exit
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1198	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1199
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1200	x:= hwRound(Gear^.X);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1201	y:= hwRound(Gear^.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1202	if (Gear^.Timer mod 33) = 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1203	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1204	HHGear^.State := HHGear^.State or gstNoDamage;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1205	doMakeExplosion(x, y + 7, 6, Gear^.Hedgehog, EXPLDontDraw);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1206	HHGear^.State := HHGear^.State and (not gstNoDamage)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1207	end;
422 12295a8b8b2f Tune pickhammer unc0rr parents: 415 diff changeset	1208
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1209	if (Gear^.Timer mod 47) = 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1210	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1211	// ok. this was an attempt to turn off dust if not actually drilling land. I have no idea why it isn't working as expected
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	1212	if (( (y + 12) and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y + 12, x] > 255) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1213	for i:= 0 to 1 do
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1214	AddVisualGear(x - 5 + Random(10), y + 12, vgtDust);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1215
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1216	i := x - Gear^.Radius - LongInt(GetRandom(2));
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1217	ei := x + Gear^.Radius + LongInt(GetRandom(2));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1218	while i <= ei do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1219	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1220	DrawExplosion(i, y + 3, 3);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1221	inc(i, 1)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1222	end;
2331 e4941a7986d6 Another try at keeping blowtorch/firepunch/jackhammer from going through indestructible stuff. Shame these routines don't use hedgehog movement nemo parents: 2329 diff changeset	1223
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1224	if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9), lfIndestructible) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1225	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1226	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1227	Gear^.Y := Gear^.Y + _1_9;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1228	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1229	SetAllHHToActive;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1230	end;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	1231	if TestCollisionYwithGear(Gear, 1) <> 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1232	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1233	Gear^.dY := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1234	SetLittle(HHGear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1235	HHGear^.dY := _0;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1236	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1237	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1238	begin
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	1239	if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), lfLandMask) then
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1240	begin
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1241	Gear^.dY := Gear^.dY + cGravity;
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1242	Gear^.Y := Gear^.Y + Gear^.dY
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1243	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1244	if hwRound(Gear^.Y) > cWaterLine then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1245	Gear^.Timer := 1
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1246	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1247
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1248	Gear^.X := Gear^.X + HHGear^.dX;
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	1249	if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, lfLandMask) then
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1250	begin
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1251	HHGear^.X := Gear^.X;
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1252	HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius)
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1253	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1254
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1255	if (Gear^.Message and gmAttack) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1256	if (Gear^.State and gsttmpFlag) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1257	Gear^.Timer := 1
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1258	else //there would be a mistake.
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1259	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1260	if (Gear^.State and gsttmpFlag) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1261	Gear^.State := Gear^.State or gsttmpFlag;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1262	if ((Gear^.Message and gmLeft) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1263	Gear^.dX := - _0_3
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1264	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1265	if ((Gear^.Message and gmRight) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1266	Gear^.dX := _0_3
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1267	else Gear^.dX := _0;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1268	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1269
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1270	procedure doStepPickHammer(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1271	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1272	i, y: LongInt;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1273	ar: TRangeArray;
911 b709fe13ed69 Fix issue with hedgehog on top of the hedgehog with pickhammer unc0rr parents: 883 diff changeset	1274	HHGear: PGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1275	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1276	i := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1277	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1278
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1279	y := hwRound(Gear^.Y) - cHHRadius * 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1280	while y < hwRound(Gear^.Y) do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1281	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1282	ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1283	ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1284	inc(y, 2);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1285	inc(i)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1286	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1287
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1288	DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1289	Gear^.dY := HHGear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1290	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1291
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1292	Gear^.SoundChannel := LoopSound(sndPickhammer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1293	doStepPickHammerWork(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1294	Gear^.doStep := @doStepPickHammerWork
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1295	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1296
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1297	////////////////////////////////////////////////////////////////////////////////
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1298	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1299	BTPrevAngle, BTSteps: LongInt;
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1300
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1301	procedure doStepBlowTorchWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1302	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1303	HHGear: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1304	b: boolean;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1305	prevX: LongInt;
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1306	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1307	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1308	dec(Gear^.Timer);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1309	if ((GameFlags and gfInfAttack) <> 0) and (TurnTimeLeft > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1310	dec(TurnTimeLeft);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1311
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1312	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1313
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1314	HedgehogChAngle(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1315
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1316	b := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1317
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1318	if abs(LongInt(HHGear^.Angle) - BTPrevAngle) > 7 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1319	begin
5722 3b7f2bfc8632 Keep blowtorch direction (doesn't actually fix the bug with hedgehog turning opposite direction) unc0rr parents: 5716 diff changeset	1320	Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1321	Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1322	BTPrevAngle := HHGear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1323	b := true
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1324	end;
1528 3fee15104c1d More stable blowtorch: unc0rr parents: 1507 diff changeset	1325
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1326	if ((HHGear^.State and gstMoving) <> 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1327	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1328	doStepHedgehogMoving(HHGear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1329	if (HHGear^.State and gstHHDriven) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1330	Gear^.Timer := 0
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1331	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1332
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1333	if Gear^.Timer mod cHHStepTicks = 0 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1334	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1335	b := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1336	if Gear^.dX.isNegative then
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1337	HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmLeft
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1338	else
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1339	HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmRight;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1340
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1341	if ((HHGear^.State and gstMoving) = 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1342	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1343	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1344	prevX := hwRound(HHGear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1345
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1346	// why the call to HedgehogStep then a further increment of X?
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1347	if (prevX = hwRound(HHGear^.X)) and
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1348	CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y),
3519 56cbc035b74b rename flags nemo parents: 3509 diff changeset	1349	lfIndestructible) then HedgehogStep(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1350
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1351	if (prevX = hwRound(HHGear^.X)) and
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1352	CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y),
3519 56cbc035b74b rename flags nemo parents: 3509 diff changeset	1353	lfIndestructible) then HHGear^.X := HHGear^.X + SignAs(_1, HHGear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1354	HHGear^.State := HHGear^.State or gstAttacking
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1355	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1356
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1357	inc(BTSteps);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1358	if BTSteps = 7 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1359	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1360	BTSteps := 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1361	if CheckLandValue(hwRound(HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC) + SignAs(_6,Gear^.dX)), hwRound(HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC)),lfIndestructible) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1362	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1363	Gear^.X := HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1364	Gear^.Y := HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1365	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1366	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1367	AmmoShove(Gear, 2, 15);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1368	HHGear^.State := HHGear^.State and (not gstNoDamage)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1369	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1370	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1371
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1372	if b then
6278 654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1373	begin
654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1374	DrawTunnel(HHGear^.X + Gear^.dX * cHHRadius,
654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1375	HHGear^.Y + Gear^.dY * cHHRadius - _1 -
654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1376	((hwAbs(Gear^.dX) / (hwAbs(Gear^.dX) + hwAbs(Gear^.dY))) * _0_5 * 7),
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1377	Gear^.dX, Gear^.dY,
6278 654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1378	cHHStepTicks, cHHRadius * 2 + 7);
654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1379	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1380
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1381	if (TurnTimeLeft = 0) or (Gear^.Timer = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1382	or ((HHGear^.Message and gmAttack) <> 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1383	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1384	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1385	HHGear^.State := HHGear^.State and (not gstNotKickable);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1386	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1387	AfterAttack
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1388	end
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1389	end;
7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1390
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1391	procedure doStepBlowTorch(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1392	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1393	HHGear: PGear;
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1394	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1395	BTPrevAngle := High(LongInt);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1396	BTSteps := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1397	HHGear := Gear^.Hedgehog^.Gear;
8617 e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1398	HedgehogChAngle(HHGear);
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1399	Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX);
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1400	Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5);
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1401	DrawTunnel(HHGear^.X,
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1402	HHGear^.Y + Gear^.dY * cHHRadius - _1 -
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1403	((hwAbs(Gear^.dX) / (hwAbs(Gear^.dX) + hwAbs(Gear^.dY))) * _0_5 * 7),
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1404	Gear^.dX, Gear^.dY,
e7bea88096d2 So. A while ago, while trying to prevent hogs blowtorching getting turned around, unc0rr altered the old range of blowtorch from 1/8th of 180° up or down, to a 4° gain in upwards and a -4° loss in downwards. He also made it so that starting tunnels could fail to erase sufficient terrain, trapping hogs. Here are a couple of workarounds to more closely approximate old behaviour (do some initial erasure, adjust min/max angles) nemo parents: 8612 diff changeset	1405	cHHStepTicks, cHHRadius * 2 + 7);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1406	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1407	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1408	Gear^.doStep := @doStepBlowTorchWork
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1409	end;
1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1410
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1411	////////////////////////////////////////////////////////////////////////////////
10 edf56dca1587 - Mine weapon unc0rr parents: 9 diff changeset	1412	procedure doStepMine(Gear: PGear);
5690 f6e0c5bd8020 Allow vgtSmoke to scale. Scale it down 50% for mines, so smoke doesn't seem so oversized nemo parents: 5688 diff changeset	1413	var vg: PVisualGear;
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1414	dxdy: hwFloat;
10 edf56dca1587 - Mine weapon unc0rr parents: 9 diff changeset	1415	begin
9043 f9d53af63f04 fix dud mine explosion nemo parents: 9041 diff changeset	1416	if Gear^.Health = 0 then dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1417	if (Gear^.State and gstMoving) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1418	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1419	DeleteCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1420	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1421	if (Gear^.State and gstMoving) = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1422	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1423	AddGearCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1424	Gear^.dX := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1425	Gear^.dY := _0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1426	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1427	CalcRotationDirAngle(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1428	AllInactive := false
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1429	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1430	else if (GameTicks and $3F) = 25 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1431	doStepFallingGear(Gear);
4966 fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1432	if (Gear^.Health = 0) then
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1433	begin
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1434	if (dxdy > _0_4) and (Gear^.State and gstCollision <> 0) then
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1435	inc(Gear^.Damage, hwRound(dxdy * _50));
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1436
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	1437	if ((GameTicks and $FF) = 0) and (Gear^.Damage > random(30)) then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1438	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1439	vg:= AddVisualGear(hwRound(Gear^.X) - 4 + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke);
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1440	if vg <> nil then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1441	vg^.Scale:= 0.5
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1442	end;
4966 fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1443
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1444	if (Gear^.Damage > 35) then
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1445	begin
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1446	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1447	DeleteGear(Gear);
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1448	exit
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1449	end
fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1450	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1451
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1452	if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Health <> 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1453	if ((Gear^.State and gstAttacking) = 0) then
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1454	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1455	if ((GameTicks and $1F) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1456	if CheckGearNear(Gear, gtHedgehog, 46, 32) <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1457	Gear^.State := Gear^.State or gstAttacking
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1458	end
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1459	else // gstAttacking <> 0
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1460	begin
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1461	AllInactive := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1462	if (Gear^.Timer and $FF) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1463	PlaySound(sndMineTick);
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1464	if Gear^.Timer = 0 then
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1465	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1466	if ((Gear^.State and gstWait) <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1467	or (cMineDudPercent = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1468	or (getRandom(100) > cMineDudPercent) then
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1469	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1470	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1471	DeleteGear(Gear)
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1472	end
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1473	else
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1474	begin
5690 f6e0c5bd8020 Allow vgtSmoke to scale. Scale it down 50% for mines, so smoke doesn't seem so oversized nemo parents: 5688 diff changeset	1475	vg:= AddVisualGear(hwRound(Gear^.X) - 4 + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1476	if vg <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1477	vg^.Scale:= 0.5;
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1478	PlaySound(sndVaporize);
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1479	Gear^.Health := 0;
4966 fa612a614317 make defective mines explode if they take enough damage, add missing interface line for koda's new uSound fade nemo parents: 4956 diff changeset	1480	Gear^.Damage := 0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1481	Gear^.State := Gear^.State and (not gstAttacking)
4224 99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1482	end;
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1483	exit
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1484	end;
99c6d87df131 No point in leaving hogs at 0, since shotgun triggers death anyway. Also, add some audio cues to extra damage / time nemo parents: 4187 diff changeset	1485	dec(Gear^.Timer);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1486	end
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1487	else // gsttmpFlag = 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1488	if (TurnTimeLeft = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1489	or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1490	or (Gear^.Hedgehog^.Gear = nil) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1491	Gear^.State := Gear^.State or gsttmpFlag;
10 edf56dca1587 - Mine weapon unc0rr parents: 9 diff changeset	1492	end;
57 e1a77ae57065 - Fixed compiling .) unc0rr parents: 53 diff changeset	1493
39 b78e7185ed13 - Increased FPS unc0rr parents: 38 diff changeset	1494	////////////////////////////////////////////////////////////////////////////////
3714 c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1495	procedure doStepSMine(Gear: PGear);
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1496	begin
3714 c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1497	// TODO: do real calculation?
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1498	if TestCollisionXwithGear(Gear, 2)
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1499	or (TestCollisionYwithGear(Gear, -2) <> 0)
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1500	or TestCollisionXwithGear(Gear, -2)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1501	or (TestCollisionYwithGear(Gear, 2) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1502	begin
7623 addc5b262617 isZero appears to be never used. Use it in a few obvious cases and add web variant. nemo parents: 7621 diff changeset	1503	if (not isZero(Gear^.dX)) or (not isZero(Gear^.dY)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1504	begin
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	1505	PlaySound(sndRopeAttach);
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1506	Gear^.dX:= _0;
07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1507	Gear^.dY:= _0;
07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1508	AddGearCI(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1509	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1510	end
3714 c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1511	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1512	begin
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1513	DeleteCI(Gear);
3714 c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1514	doStepFallingGear(Gear);
c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1515	AllInactive := false;
c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1516	CalcRotationDirAngle(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1517	end;
3714 c407f00d2851 Engine: smaxx parents: 3713 diff changeset	1518
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1519	if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Health <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1520	begin
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1521	if ((Gear^.State and gstAttacking) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1522	begin
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1523	if ((GameTicks and $1F) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1524	if CheckGearNear(Gear, gtHedgehog, 46, 32) <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1525	Gear^.State := Gear^.State or gstAttacking
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1526	end
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1527	else // gstAttacking <> 0
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1528	begin
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1529	AllInactive := false;
07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1530	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1531	begin
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1532	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1533	DeleteGear(Gear);
07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1534	exit
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	1535	end else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1536	if (Gear^.Timer and $FF) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1537	PlaySound(sndMineTick);
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	1538
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1539	dec(Gear^.Timer);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1540	end
4880 07e9849c6a70 bugfix: fixing sticky mines calling AddGearCI when they shouldn't (allows jumping on them in midair) sheepluva parents: 4874 diff changeset	1541	end
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1542	else // gsttmpFlag = 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1543	if (TurnTimeLeft = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1544	or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1545	or (Gear^.Hedgehog^.Gear = nil) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1546	Gear^.State := Gear^.State or gsttmpFlag;
3710 411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1547	end;
411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1548
411f5c2b5292 Engine: smaxx parents: 3706 diff changeset	1549	////////////////////////////////////////////////////////////////////////////////
39 b78e7185ed13 - Increased FPS unc0rr parents: 38 diff changeset	1550	procedure doStepDynamite(Gear: PGear);
b78e7185ed13 - Increased FPS unc0rr parents: 38 diff changeset	1551	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1552	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1553	AllInactive := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1554	if Gear^.Timer mod 166 = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1555	inc(Gear^.Tag);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1556	if Gear^.Timer = 1000 then // might need better timing
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1557	makeHogsWorry(Gear^.X, Gear^.Y, 75);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1558	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1559	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1560	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 75, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1561	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1562	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1563	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1564	dec(Gear^.Timer);
39 b78e7185ed13 - Increased FPS unc0rr parents: 38 diff changeset	1565	end;
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1566
351 29bc9c36ad5f Fixed-point arithmetics in engine. unc0rr parents: 346 diff changeset	1567	///////////////////////////////////////////////////////////////////////////////
2941 566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1568
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1569	procedure doStepRollingBarrel(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1570	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1571	i: LongInt;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1572	particle: PVisualGear;
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1573	dxdy: hwFloat;
2941 566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1574	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1575	if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1576	SetLittle(Gear^.dY);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1577	Gear^.State := Gear^.State or gstAnimation;
9045 6561c42399d3 sheepluva suggestion for frozen barrel behaviour. untested. nemo parents: 9043 diff changeset	1578	if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and not gstFrozen;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1579
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1580	if ((Gear^.dX.QWordValue <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1581	or (Gear^.dY.QWordValue <> 0)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1582	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1583	DeleteCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1584	AllInactive := false;
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1585	dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1586	doStepFallingGear(Gear);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1587	if (Gear^.State and gstCollision <> 0) and(dxdy > _0_4) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1588	begin
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1589	if (TestCollisionYwithGear(Gear, 1) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1590	begin
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1591	Gear^.State := Gear^.State or gsttmpFlag;
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1592	for i:= min(12, hwRound(dxdy*_10)) downto 0 do
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1593	begin
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1594	particle := AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12,vgtDust);
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1595	if particle <> nil then
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1596	particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1597	end
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1598	end;
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1599	inc(Gear^.Damage, hwRound(dxdy * _50))
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1600	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1601	CalcRotationDirAngle(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1602	//CheckGearDrowning(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1603	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1604	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1605	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1606	Gear^.State := Gear^.State or gsttmpFlag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1607	AddGearCI(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1608	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1609
2944 e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1610	(*
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1611	Attempt to make a barrel knock itself over an edge. Would need more checks to avoid issues like burn damage
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1612	begin
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1613	x:= hwRound(Gear^.X);
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1614	y:= hwRound(Gear^.Y);
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1615	if (((y+1) and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) then
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1616	if (Land[y+1, x] = 0) then
2944 e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1617	begin
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1618	if (((y+1) and LAND_HEIGHT_MASK) = 0) and (((x+Gear^.Radius-2) and LAND_WIDTH_MASK) = 0) and (Land[y+1, x+Gear^.Radius-2] = 0) then
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1619	Gear^.dX:= -_0_08
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1620	else if (((y+1 and LAND_HEIGHT_MASK)) = 0) and (((x-(Gear^.Radius-2)) and LAND_WIDTH_MASK) = 0) and (Land[y+1, x-(Gear^.Radius-2)] = 0) then
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1621	Gear^.dX:= _0_08;
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1622	end;
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1623	if Gear^.dX.QWordValue = 0 then AddGearCI(Gear)
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1624	end; *)
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1625
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1626	if not Gear^.dY.isNegative and (Gear^.dY < _0_001) and (TestCollisionYwithGear(Gear, 1) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1627	Gear^.dY := _0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1628	if hwAbs(Gear^.dX) < _0_001 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1629	Gear^.dX := _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1630
5128 3c65326bb713 Check for 0 health to avoid div by 0. spotted by mikade. nemo parents: 5121 diff changeset	1631	if (Gear^.Health > 0) and ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1632	if (cBarrelHealth div Gear^.Health) > 2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1633	AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke)
2941 566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1634	else
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1635	AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1636	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1637	Gear^.Damage := 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1638	if Gear^.Health <= 0 then
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1639	doStepCase(Gear);
2941 566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1640	end;
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1641
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1642	procedure doStepCase(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1643	var
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1644	i, x, y: LongInt;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1645	k: TGearType;
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1646	dX, dY: HWFloat;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1647	hog: PHedgehog;
7168 8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1648	sparkles: PVisualGear;
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1649	gi: PGear;
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1650	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1651	k := Gear^.Kind;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1652
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1653	if (Gear^.Message and gmDestroy) > 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1654	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1655	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1656	FreeActionsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1657	SetAllToActive;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1658	// something (hh, mine, etc...) could be on top of the case
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1659	with CurrentHedgehog^ do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1660	if Gear <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1661	Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1662	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1663	end;
9045 6561c42399d3 sheepluva suggestion for frozen barrel behaviour. untested. nemo parents: 9043 diff changeset	1664	if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and not gstFrozen;
15 6200cca92480 - Minor code simplifying unc0rr parents: 14 diff changeset	1665
8973 7bcb77379a4b cases have no health nemo parents: 8971 diff changeset	1666	if ((k <> gtExplosives) and (Gear^.Damage > 0)) or ((k = gtExplosives) and (Gear^.Health<=0)) then
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1667	begin
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1668	x := hwRound(Gear^.X);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1669	y := hwRound(Gear^.Y);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1670	hog:= Gear^.Hedgehog;
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1671
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1672	DeleteGear(Gear);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1673	// <-- delete gear!
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1674
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1675	if k = gtCase then
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1676	begin
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1677	doMakeExplosion(x, y, 25, hog, EXPLAutoSound);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1678	for i:= 0 to 63 do
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1679	AddGear(x, y, gtFlame, 0, _0, _0, 0);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1680	end
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1681	else if k = gtExplosives then
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1682	begin
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1683	doMakeExplosion(x, y, 75, hog, EXPLAutoSound);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1684	for i:= 0 to 31 do
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1685	begin
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1686	dX := AngleCos(i * 64) * _0_5 * (getrandomf + _1);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1687	dY := AngleSin(i * 64) * _0_5 * (getrandomf + _1);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1688	AddGear(x, y, gtFlame, 0, dX, dY, 0);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1689	AddGear(x, y, gtFlame, gstTmpFlag, -dX, -dY, 0);
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1690	end
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1691	end;
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1692	exit
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1693	end;
15 6200cca92480 - Minor code simplifying unc0rr parents: 14 diff changeset	1694
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1695	if k = gtExplosives then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1696	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1697	//if V > _0_03 then Gear^.State:= Gear^.State or gstAnimation;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1698	if (hwAbs(Gear^.dX) > _0_15) or ((hwAbs(Gear^.dY) > _0_15) and (hwAbs(Gear^.dX) > _0_02)) then
8962 9780e79619ed So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks nemo parents: 8958 diff changeset	1699	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1700	Gear^.doStep := @doStepRollingBarrel;
8962 9780e79619ed So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks nemo parents: 8958 diff changeset	1701	exit;
9780e79619ed So. This at least should make the math more accurate, even if it still doesn't appear to resolve prob w/ AI attacks nemo parents: 8958 diff changeset	1702	end
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1703	else Gear^.dX:= _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1704
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1705	if ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1706	if (cBarrelHealth div Gear^.Health) > 2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1707	AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke)
8971 fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1708	else
fcb29a13b1b1 Adjust barrel damage so AI can actually bat to explode them. Fix state flag check. Remove unneeded dmgMod var. Cancel dX for low dX barrel tracing. nemo parents: 8962 diff changeset	1709	AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1710	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1711	Gear^.Damage := 0;
7168 8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1712	end
8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1713	else
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1714	begin
8030 165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	1715	if (Gear^.Pos <> posCaseHealth) and (GameTicks and $1FFF = 0) then // stir 'em up periodically
7396 7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1716	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1717	gi := GearsList;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1718	while gi <> nil do
7396 7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1719	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1720	if gi^.Kind = gtGenericFaller then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1721	begin
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1722	gi^.Active:= true;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1723	gi^.X:= int2hwFloat(GetRandom(rightX-leftX)+leftX);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1724	gi^.Y:= int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1725	gi^.dX:= _90-(GetRandomf*_360);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1726	gi^.dY:= _90-(GetRandomf*_360)
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1727	end;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1728	gi := gi^.NextGear
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1729	end
7396 7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1730	end;
7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1731
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1732	if Gear^.Timer = 500 then
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1733	begin
7168 8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1734	(* Can't make sparkles team coloured without working out what the next team is going to be. This should be solved, really, since it also screws up
8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1735	voices. Reinforcements voices is heard for active team, not team-to-be. Either that or change crate spawn from end of turn to start, although that
8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1736	has its own complexities. *)
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1737	// Abuse a couple of gear values to track origin
7339 5984b749ad9b free up power for use by script nemo parents: 7335 diff changeset	1738	Gear^.Angle:= hwRound(Gear^.Y);
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1739	Gear^.Tag:= random(2);
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1740	inc(Gear^.Timer)
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1741	end;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1742	if Gear^.Timer < 1833 then inc(Gear^.Timer);
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1743	if Gear^.Timer = 1000 then
7168 8defaabce92e warp sound when AI survival hog respawns. attempt at a bit of a crate spawn animation (moar sparkles and a quick fadein) nemo parents: 7128 diff changeset	1744	begin
7339 5984b749ad9b free up power for use by script nemo parents: 7335 diff changeset	1745	sparkles:= AddVisualGear(hwRound(Gear^.X), Gear^.Angle, vgtDust, 1);
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1746	if sparkles <> nil then
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1747	begin
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1748	sparkles^.dX:= 0;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1749	sparkles^.dY:= 0;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1750	sparkles^.Angle:= 270;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1751	if Gear^.Tag = 1 then
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1752	sparkles^.Tint:= $3744D7FF
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1753	else sparkles^.Tint:= $FAB22CFF
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1754	end;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1755	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1756	if Gear^.Timer < 1000 then
7283 322ff9418461 oops nemo parents: 7281 diff changeset	1757	begin
322ff9418461 oops nemo parents: 7281 diff changeset	1758	AllInactive:= false;
322ff9418461 oops nemo parents: 7281 diff changeset	1759	exit
322ff9418461 oops nemo parents: 7281 diff changeset	1760	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1761	end;
2911 cd355befa683 Engine: smxx parents: 2887 diff changeset	1762
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1763
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1764	if (Gear^.dY.QWordValue <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1765	or (TestCollisionYwithGear(Gear, 1) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1766	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1767	AllInactive := false;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1768
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1769	Gear^.dY := Gear^.dY + cGravity;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1770
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1771	if (Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1772	Gear^.dY := _0;
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1773
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1774	Gear^.Y := Gear^.Y + Gear^.dY;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1775
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1776	if (not Gear^.dY.isNegative) and (Gear^.dY > _0_001) then
8579 d18bc19d780a graphics tweak. flag a couple more overeager setall HH nemo parents: 8578 diff changeset	1777	SetAllHHToActive(false);
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1778
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	1779	if (not Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, 1) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1780	begin
3473 f80431269806 Increase minimum threshold for barrel damage to reduce likelihood of blowing one up on jumping out, increase damage to compensate (may need tweaking). Only apply dX for collision w/ kick if barrel is rolling. nemo parents: 3471 diff changeset	1781	if (Gear^.dY > _0_2) and (k = gtExplosives) then
f80431269806 Increase minimum threshold for barrel damage to reduce likelihood of blowing one up on jumping out, increase damage to compensate (may need tweaking). Only apply dX for collision w/ kick if barrel is rolling. nemo parents: 3471 diff changeset	1782	inc(Gear^.Damage, hwRound(Gear^.dY * _70));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1783
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1784	if Gear^.dY > _0_2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1785	for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1786	AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1787
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1788	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1789	if Gear^.dY > - _0_001 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1790	Gear^.dY := _0
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1791	else if Gear^.dY < - _0_03 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1792	PlaySound(Gear^.ImpactSound);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1793	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1794	//if Gear^.dY > - _0_001 then Gear^.dY:= _0
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1795	CheckGearDrowning(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1796	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1797
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1798	if (Gear^.dY.QWordValue = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1799	AddGearCI(Gear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1800	else if (Gear^.dY.QWordValue <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1801	DeleteCI(Gear)
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1802	end;
49 3afe33c1cf06 - Teams health bars sorting unc0rr parents: 46 diff changeset	1803
3afe33c1cf06 - Teams health bars sorting unc0rr parents: 46 diff changeset	1804	////////////////////////////////////////////////////////////////////////////////
2460 ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1805
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1806	procedure doStepTarget(Gear: PGear);
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1807	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1808	if (Gear^.Timer = 0) and (Gear^.Tag = 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1809	PlaySound(sndWarp);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1810
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1811	if (Gear^.Tag = 0) and (Gear^.Timer < 1000) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1812	inc(Gear^.Timer)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1813	else if Gear^.Tag = 1 then
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	1814	Gear^.Tag := 2
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1815	else if Gear^.Tag = 2 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1816	if Gear^.Timer > 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1817	dec(Gear^.Timer)
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1818	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1819	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1820	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1821	exit;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1822	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1823
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1824	doStepCase(Gear)
2460 ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1825	end;
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1826
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1827	////////////////////////////////////////////////////////////////////////////////
854 fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1828	procedure doStepIdle(Gear: PGear);
fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1829	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1830	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1831	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1832	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1833	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1834	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1835	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1836	end
854 fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1837	end;
fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1838
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	1839	////////////////////////////////////////////////////////////////////////////////
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1840	procedure doStepShover(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1841	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1842	HHGear: PGear;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1843	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1844	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1845	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1846	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1847
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1848	AmmoShove(Gear, 30, 115);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1849
4182 5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1850	HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1851	Gear^.Timer := 250;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1852	Gear^.doStep := @doStepIdle
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1853	end;
29b477319854 - New test map unc0rr parents: 78 diff changeset	1854
29b477319854 - New test map unc0rr parents: 78 diff changeset	1855	////////////////////////////////////////////////////////////////////////////////
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1856	procedure doStepWhip(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1857	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1858	HHGear: PGear;
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1859	i: LongInt;
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1860	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1861	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1862	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1863	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1864
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1865	for i:= 0 to 3 do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1866	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1867	AmmoShove(Gear, 30, 25);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1868	Gear^.X := Gear^.X + Gear^.dX * 5
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1869	end;
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1870
4182 5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1871	HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1872
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1873	Gear^.Timer := 250;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1874	Gear^.doStep := @doStepIdle
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1875	end;
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1876
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1877	////////////////////////////////////////////////////////////////////////////////
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1878	procedure doStepFlame(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1879	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1880	gX,gY,i: LongInt;
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1881	sticky: Boolean;
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1882	vgt: PVisualGear;
5415 94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1883	tdX,tdY: HWFloat;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1884	begin
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1885	sticky:= (Gear^.State and gsttmpFlag) <> 0;
bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1886	if not sticky then AllInactive := false;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1887
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	1888	if TestCollisionYwithGear(Gear, 1) = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1889	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1890	AllInactive := false;
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1891
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1892	if ((GameTicks mod 100) = 0) then
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1893	begin
4443 d393b9ccd328 Add an extra pass in FindPlace for AI resurrection mode to try to make it unwinnable, add DeleteGear, DeleteVisualGear, AddVisualGear, GetVisualGearValues, SetVisualGearValues to Lua nemo parents: 4405 diff changeset	1894	vgt:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFire, gstTmpFlag);
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1895	if vgt <> nil then
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1896	begin
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1897	vgt^.dx:= 0;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1898	vgt^.dy:= 0;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1899	vgt^.FrameTicks:= 1800 div (Gear^.Tag mod 3 + 2);
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1900	end;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1901	end;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1902
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1903
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1904	if Gear^.dX.QWordValue > _0_01.QWordValue then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1905	Gear^.dX := Gear^.dX * _0_995;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1906
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1907	Gear^.dY := Gear^.dY + cGravity;
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1908	// if sticky then Gear^.dY := Gear^.dY + cGravity;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1909
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1910	if Gear^.dY.QWordValue > _0_2.QWordValue then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1911	Gear^.dY := Gear^.dY * _0_995;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1912
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1913	//if sticky then Gear^.X := Gear^.X + Gear^.dX else
bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1914	Gear^.X := Gear^.X + Gear^.dX + cWindSpeed * 640;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1915	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1916
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1917	if (hwRound(Gear^.Y) > cWaterLine) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1918	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1919	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1920	for i:= 0 to 3 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1921	AddVisualGear(gX - 16 + Random(32), cWaterLine - 16 + Random(16), vgtSteam);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1922	PlaySound(sndVaporize);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1923	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1924	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1925	end
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1926	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1927	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1928	begin
9277 ad1ec7212ac7 reduce shove frequency (perf). reduce dX so that less time is spent sliding. nemo parents: 9251 diff changeset	1929	if sticky and (GameTicks and $F = 0) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1930	begin
3603 b6b1989744ef Grid the landscape, and shortcircuit checks on the collision array if there are no nearby checked in collisions to be collided with. This is a big win for fire's ammoshove in particular. Also add a +2 that seemed missing in the check, and update fire accordingly. nemo parents: 3594 diff changeset	1931	Gear^.Radius := 7;
5415 94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1932	tdX:= Gear^.dX;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1933	tdY:= Gear^.dY;
9277 ad1ec7212ac7 reduce shove frequency (perf). reduce dX so that less time is spent sliding. nemo parents: 9251 diff changeset	1934	Gear^.dX.QWordValue:= 120000000;
5415 94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1935	Gear^.dY.QWordValue:= 429496730;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1936	Gear^.dX.isNegative:= getrandom(2)<>1;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1937	Gear^.dY.isNegative:= true;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1938	AmmoShove(Gear, 2, 125);
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1939	Gear^.dX:= tdX;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1940	Gear^.dY:= tdY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1941	Gear^.Radius := 1
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1942	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1943	if Gear^.Timer > 0 then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1944	begin
2475 e0646a529a38 Fire tweaks nemo parents: 2470 diff changeset	1945	dec(Gear^.Timer);
e0646a529a38 Fire tweaks nemo parents: 2470 diff changeset	1946	inc(Gear^.Damage)
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1947	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1948	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1949	begin
3462 4b36933dce1d fix multi-round fire sheepluva parents: 3461 diff changeset	1950	gX := hwRound(Gear^.X);
4b36933dce1d fix multi-round fire sheepluva parents: 3461 diff changeset	1951	gY := hwRound(Gear^.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1952	// Standard fire
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1953	if not sticky then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1954	begin
3640 54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1955	if ((GameTicks and $1) = 0) then
54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1956	begin
54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1957	Gear^.Radius := 7;
5415 94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1958	tdX:= Gear^.dX;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1959	tdY:= Gear^.dY;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1960	Gear^.dX.QWordValue:= 214748365;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1961	Gear^.dY.QWordValue:= 429496730;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1962	Gear^.dX.isNegative:= getrandom(2)<>1;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1963	Gear^.dY.isNegative:= true;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1964	AmmoShove(Gear, 6, 100);
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1965	Gear^.dX:= tdX;
94e26612e2ec Adjust "sticky" fire (molotov) so it makes better fire pits, by making the kicks more regular, yet of random left/right. Tweak napalm slightly along same lines. Probably needs more balancing. nemo parents: 5413 diff changeset	1966	Gear^.dY:= tdY;
3640 54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1967	Gear^.Radius := 1;
54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1968	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1969	else if ((GameTicks and $3) = 3) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1970	doMakeExplosion(gX, gY, 8, Gear^.Hedgehog, 0);//, EXPLNoDamage);
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1971	//DrawExplosion(gX, gY, 4);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1972
3096 9330eead14fa Remove Distance from flake kick, reduce calls to Random() in flame replacing w/ checks on game tick and a little randomness. nemo parents: 3094 diff changeset	1973	if ((GameTicks and $7) = 0) and (Random(2) = 0) then
7426 55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots. nemo parents: 7416 diff changeset	1974	for i:= Random(2) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1975	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1976
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1977	if Gear^.Health > 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1978	dec(Gear^.Health);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1979	Gear^.Timer := 450 - Gear^.Tag * 8
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1980	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1981	else
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1982	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1983	// Modified fire
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1984	if ((GameTicks and $7FF) = 0) and ((GameFlags and gfSolidLand) = 0) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1985	begin
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	1986	DrawExplosion(gX, gY, 4);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1987
7426 55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots. nemo parents: 7416 diff changeset	1988	for i:= Random(3) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1989	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1990	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1991
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1992	// This one is interesting. I think I understand the purpose, but I wonder if a bit more fuzzy of kicking could be done with getrandom.
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1993	Gear^.Timer := 100 - Gear^.Tag * 3;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1994	if (Gear^.Damage > 3000+Gear^.Tag*1500) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1995	Gear^.Health := 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1996	end
2424 b52344de23ae In progress, trying to make a fire for molotov cocktail. Normal fire should still work fairly normally. nemo parents: 2376 diff changeset	1997	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1998	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1999	if Gear^.Health = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2000	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2001	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2002	gY := hwRound(Gear^.Y);
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	2003	if not sticky then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2004	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2005	if ((GameTicks and $3) = 0) and (Random(1) = 0) then
7426 55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots. nemo parents: 7416 diff changeset	2006	for i:= Random(2) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2007	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2008	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2009	else
7426 55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots. nemo parents: 7416 diff changeset	2010	for i:= Random(3) downto 0 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2011	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2012
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2013	DeleteGear(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2014	end;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	2015	end;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2016
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2017	////////////////////////////////////////////////////////////////////////////////
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2018	procedure doStepFirePunchWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2019	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2020	HHGear: PGear;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2021	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2022	AllInactive := false;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2023	if ((Gear^.Message and gmDestroy) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2024	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2025	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2026	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2027	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2028	end;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2029
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2030	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2031	if hwRound(HHGear^.Y) <= Gear^.Tag - 2 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2032	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2033	Gear^.Tag := hwRound(HHGear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2034	DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y - _1, _0_5, _0, cHHRadius * 4, 2);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2035	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2036	Gear^.Y := HHGear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2037	AmmoShove(Gear, 30, 40);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2038	HHGear^.State := HHGear^.State and (not gstNoDamage)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2039	end;
351 29bc9c36ad5f Fixed-point arithmetics in engine. unc0rr parents: 346 diff changeset	2040
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2041	HHGear^.dY := HHGear^.dY + cGravity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2042	if not (HHGear^.dY.isNegative) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2043	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2044	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2045	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2046	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2047	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2048	end;
2089 a08758aed76a Prevent unc0rr's sneaky escape nemo parents: 2087 diff changeset	2049
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2050	if CheckLandValue(hwRound(HHGear^.X), hwRound(HHGear^.Y + HHGear^.dY + SignAs(_6,Gear^.dY)),
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2051	lfIndestructible) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2052	HHGear^.Y := HHGear^.Y + HHGear^.dY
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2053	end;
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2054
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2055	procedure doStepFirePunch(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2056	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2057	HHGear: PGear;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2058	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2059	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2060	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2061	DeleteCI(HHGear);
6156 baf30b1a7a75 lolwut nemo parents: 6155 diff changeset	2062	//HHGear^.X := int2hwFloat(hwRound(HHGear^.X)) - _0_5; WTF?
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2063	HHGear^.dX := SignAs(cLittle, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2064
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2065	HHGear^.dY := - _0_3;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2066
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2067	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2068	Gear^.dX := SignAs(_0_45, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2069	Gear^.dY := - _0_9;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2070	Gear^.doStep := @doStepFirePunchWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2071	DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y + _1, _0_5, _0, cHHRadius * 4, 5);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2072
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2073	PlaySoundV(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack)
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2074	end;
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2075
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2076	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2077
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2078	procedure doStepParachuteWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2079	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2080	HHGear: PGear;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2081	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2082	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2083
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2084	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2085
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	2086	if (TestCollisionYwithGear(HHGear, 1) <> 0)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2087	or ((HHGear^.State and gstHHDriven) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2088	or CheckGearDrowning(HHGear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2089	or ((Gear^.Message and gmAttack) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2090	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2091	with HHGear^ do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2092	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2093	Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2094	SetLittle(dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2095	dY := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2096	State := State or gstMoving;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2097	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2098	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2099	isCursorVisible := false;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	2100	ApplyAmmoChanges(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2101	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2102	end;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2103
4774 d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2104	HHGear^.X := HHGear^.X + cWindSpeed * 200;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2105
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2106	if (Gear^.Message and gmLeft) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2107	HHGear^.X := HHGear^.X - cMaxWindSpeed * 80
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2108
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2109	else if (Gear^.Message and gmRight) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2110	HHGear^.X := HHGear^.X + cMaxWindSpeed * 80;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2111
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2112	if (Gear^.Message and gmUp) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2113	HHGear^.Y := HHGear^.Y - cGravity * 40
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2114
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2115	else if (Gear^.Message and gmDown) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2116	HHGear^.Y := HHGear^.Y + cGravity * 40;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2117
4774 d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2118	// don't drift into obstacles
d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2119	if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2120	HHGear^.X := HHGear^.X - int2hwFloat(hwSign(HHGear^.dX));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2121	HHGear^.Y := HHGear^.Y + cGravity * 100;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2122	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2123	Gear^.Y := HHGear^.Y
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2124	end;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2125
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2126	procedure doStepParachute(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2127	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2128	HHGear: PGear;
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2129	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2130	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2131
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2132	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2133
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2134	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2135
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2136	HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked or gstMoving));
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2137	HHGear^.Message := HHGear^.Message and (not gmAttack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2138
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2139	Gear^.doStep := @doStepParachuteWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2140
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2141	Gear^.Message := HHGear^.Message;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2142	doStepParachuteWork(Gear)
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2143	end;
9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2144
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2145	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2146	procedure doStepAirAttackWork(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2147	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2148	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2149	Gear^.X := Gear^.X + cAirPlaneSpeed * Gear^.Tag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2150
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2151	if (Gear^.Health > 0)and(not (Gear^.X < Gear^.dX))and(Gear^.X < Gear^.dX + cAirPlaneSpeed) then
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2152	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2153	dec(Gear^.Health);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2154	case Gear^.State of
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2155	0: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2156	1: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtMine, 0, cBombsSpeed * Gear^.Tag, _0, 0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2157	2: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtNapalmBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2158	3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed * Gear^.Tag, _0, Gear^.Timer + 1);
4246 e5cb885492df drillstrike! might require the drill patch to improve behavior koda parents: 4233 diff changeset	2159	//4: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtWaterMelon, 0, cBombsSpeed *
e5cb885492df drillstrike! might require the drill patch to improve behavior koda parents: 4233 diff changeset	2160	// Gear^.Tag, _0, 5000);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2161	end;
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2162	Gear^.dX := Gear^.dX + int2hwFloat(30 * Gear^.Tag);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2163	StopSoundChan(Gear^.SoundChannel, 4000);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2164	end;
1124 1636a3c7c061 - Airplane is higher unc0rr parents: 1123 diff changeset	2165
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2166	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2167	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2168
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	2169	if (hwRound(Gear^.X) > (max(LAND_WIDTH,4096)+2048)) or (hwRound(Gear^.X) < -2048) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2170	begin
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2171	// avoid to play forever (is this necessary?)
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2172	StopSoundChan(Gear^.SoundChannel);
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2173	DeleteGear(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2174	end;
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2175	end;
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2176
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2177	procedure doStepAirAttack(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2178	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2179	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2180
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2181	if Gear^.X.QWordValue = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2182	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2183	Gear^.Tag := 1;
5067 57101536cf86 fix for Issue 207: To far left for Napalm (and other weapons) sheepluva parents: 5063 diff changeset	2184	Gear^.X := -_2048;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2185	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2186	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2187	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2188	Gear^.Tag := -1;
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	2189	Gear^.X := int2hwFloat(max(LAND_WIDTH,4096) + 2048);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2190	end;
1507 d18c67b7ad4c Quick and dirty napalm implementation unc0rr parents: 1505 diff changeset	2191
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2192	Gear^.Y := int2hwFloat(topY-300);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2193	Gear^.dX := int2hwFloat(Gear^.Target.X - 5 * Gear^.Tag * 15);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2194
4778 1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2195	// calcs for Napalm Strike, so that it will hit the target (without wind at least :P)
1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2196	if (Gear^.State = 2) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2197	Gear^.dX := Gear^.dX - cBombsSpeed * Gear^.Tag * 900
4778 1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2198	// calcs for regular falling gears
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2199	else if (int2hwFloat(Gear^.Target.Y) - Gear^.Y > _0) then
2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2200	Gear^.dX := Gear^.dX - cBombsSpeed * hwSqrt((int2hwFloat(Gear^.Target.Y) - Gear^.Y) * 2 /
4778 1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2201	cGravity) * Gear^.Tag;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2202
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2203	Gear^.Health := 6;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2204	Gear^.doStep := @doStepAirAttackWork;
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2205	Gear^.SoundChannel := LoopSound(sndPlane, 4000);
48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2206
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2207	end;
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2208
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2209	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2210
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2211	procedure doStepAirBomb(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2212	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2213	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2214	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2215	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2216	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2217	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2218	DeleteGear(Gear);
8204 9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2219	with mobileRecord do
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2220	if (performRumble <> nil) and (not fastUntilLag) then
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2221	performRumble(kSystemSoundID_Vibrate);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2222	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2223	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2224	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2225	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2226	end;
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2227
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2228	////////////////////////////////////////////////////////////////////////////////
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2229
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2230	procedure doStepGirder(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2231	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2232	HHGear: PGear;
1915 c357f5b55320 patch by nemo: unc0rr parents: 1914 diff changeset	2233	x, y, tx, ty: hwFloat;
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2234	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2235	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2236
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2237	HHGear := Gear^.Hedgehog^.Gear;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2238	tx := int2hwFloat(Gear^.Target.X);
2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2239	ty := int2hwFloat(Gear^.Target.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2240	x := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2241	y := HHGear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2242
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2243	if (Distance(tx - x, ty - y) > _256)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2244	or (not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprAmGirder].Width div 2, Gear^.Target.Y - SpritesData[sprAmGirder].Height div 2, sprAmGirder, Gear^.State, true, false)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2245	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2246	PlaySound(sndDenied);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2247	HHGear^.Message := HHGear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2248	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2249	HHGear^.State := HHGear^.State or gstHHChooseTarget;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2250	isCursorVisible := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2251	DeleteGear(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2252	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2253	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2254	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2255	PlaySound(sndPlaced);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2256	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2257	AfterAttack;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2258	end;
1914 aab686a4e0c5 Add sounds to girder unc0rr parents: 1909 diff changeset	2259
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2260	HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked));
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2261	HHGear^.Message := HHGear^.Message and (not gmAttack);
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2262	end;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2263
e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2264	////////////////////////////////////////////////////////////////////////////////
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2265	procedure doStepTeleportAfter(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2266	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2267	HHGear: PGear;
912 acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2268	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2269	HHGear := Gear^.Hedgehog^.Gear;
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2270	doStepHedgehogMoving(HHGear);
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2271	// if not infattack mode wait for hedgehog finish falling to collect cases
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2272	if ((GameFlags and gfInfAttack) <> 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2273	or ((HHGear^.State and gstMoving) = 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2274	or (Gear^.Hedgehog^.Gear^.Damage > 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2275	or ((HHGear^.State and gstDrowning) = 1) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2276	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2277	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2278	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2279	end
912 acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2280	end;
acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2281
acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2282	procedure doStepTeleportAnim(Gear: PGear);
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2283	begin
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2284	if (Gear^.Hedgehog^.Gear^.Damage > 0) then
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2285	begin
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2286	DeleteGear(Gear);
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2287	AfterAttack;
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2288	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2289	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2290	if Gear^.Timer = 65 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2291	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2292	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2293	inc(Gear^.Pos);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2294	if Gear^.Pos = 11 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2295	Gear^.doStep := @doStepTeleportAfter
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2296	end;
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2297	end;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2298
e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2299	procedure doStepTeleport(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2300	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2301	HHGear: PGear;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2302	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2303	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2304
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2305	HHGear := Gear^.Hedgehog^.Gear;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2306	if not TryPlaceOnLand(Gear^.Target.X - SpritesData[sprHHTelepMask].Width div 2,
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2307	Gear^.Target.Y - SpritesData[sprHHTelepMask].Height div 2,
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2308	sprHHTelepMask, 0, false, false) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2309	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2310	HHGear^.Message := HHGear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2311	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2312	HHGear^.State := HHGear^.State or gstHHChooseTarget;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2313	DeleteGear(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2314	isCursorVisible := true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2315	PlaySound(sndDenied)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2316	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2317	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2318	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2319	DeleteCI(HHGear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2320	SetAllHHToActive;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2321	Gear^.doStep := @doStepTeleportAnim;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2322
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2323	// copy old HH position and direction to Gear (because we need them for drawing the vanishing hog)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2324	Gear^.dX := HHGear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2325	// retrieve the cursor direction (it was previously copied to X so it doesn't get lost)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2326	HHGear^.dX.isNegative := (Gear^.X.QWordValue <> 0);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2327	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2328	Gear^.Y := HHGear^.Y;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2329	HHGear^.X := int2hwFloat(Gear^.Target.X);
2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2330	HHGear^.Y := int2hwFloat(Gear^.Target.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2331	HHGear^.State := HHGear^.State or gstMoving;
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2332	Gear^.Hedgehog^.Unplaced := false;
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2333	isCursorVisible := false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2334	playSound(sndWarp)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2335	end;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2336	Gear^.Target.X:= NoPointX
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2337	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2338
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2339	////////////////////////////////////////////////////////////////////////////////
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2340	procedure doStepSwitcherWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2341	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2342	HHGear: PGear;
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2343	hedgehog: PHedgehog;
6992 b8f3d8991e92 marked a couple of functions as inline koda parents: 6982 diff changeset	2344	State: Longword;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2345	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2346	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2347
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2348	if ((Gear^.Message and (not gmSwitch)) <> 0) or (TurnTimeLeft = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2349	begin
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2350	hedgehog := Gear^.Hedgehog;
6535 51a7e71ad317 It seems there's no need to copy gear's msg. Fixes bots getting stuck after hog switch. unc0rr parents: 6532 diff changeset	2351	//Msg := Gear^.Message and (not gmSwitch);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2352	DeleteGear(Gear);
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2353	ApplyAmmoChanges(hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2354
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2355	HHGear := CurrentHedgehog^.Gear;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	2356	ApplyAmmoChanges(HHGear^.Hedgehog^);
6535 51a7e71ad317 It seems there's no need to copy gear's msg. Fixes bots getting stuck after hog switch. unc0rr parents: 6532 diff changeset	2357	//HHGear^.Message := Msg;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2358	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2359	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2360
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2361	if (Gear^.Message and gmSwitch) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2362	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2363	HHGear := CurrentHedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2364	HHGear^.Message := HHGear^.Message and (not gmSwitch);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2365	Gear^.Message := Gear^.Message and (not gmSwitch);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2366	State := HHGear^.State;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2367	HHGear^.State := 0;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2368	HHGear^.Z := cHHZ;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2369	HHGear^.Active := false;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2370	HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2371
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2372	PlaySound(sndSwitchHog);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2373
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2374	repeat
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2375	CurrentTeam^.CurrHedgehog := Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.HedgehogsNumber);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2376	until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2377	(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Damage = 0) and
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	2378	(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen]=0);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2379
7270 93e92e82d5c8 Step 1. Add current hedgehog as top bit of bottom byte. nemo parents: 7268 diff changeset	2380	SwitchCurrentHedgehog(@CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog]);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2381	AmmoMenuInvalidated:= true;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2382
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2383	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2384	HHGear^.State := State;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2385	HHGear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2386	FollowGear := HHGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2387	HHGear^.Z := cCurrHHZ;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2388	HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2389	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2390	Gear^.Y := HHGear^.Y
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2391	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2392	end;
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2393
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2394	procedure doStepSwitcher(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2395	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2396	HHGear: PGear;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2397	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2398	Gear^.doStep := @doStepSwitcherWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2399
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2400	HHGear := Gear^.Hedgehog^.Gear;
5358 e2201f71beac call onusedammo earlier for switcher nemo parents: 5355 diff changeset	2401	OnUsedAmmo(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2402	with HHGear^ do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2403	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2404	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2405	Message := Message and (not gmAttack)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2406	end
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2407	end;
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2408
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2409	////////////////////////////////////////////////////////////////////////////////
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2410	procedure doStepMortar(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2411	var
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	2412	dX, dY, gdX, gdY: hwFloat;
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2413	i: LongInt;
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2414	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2415	AllInactive := false;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2416	gdX := Gear^.dX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2417	gdY := Gear^.dY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2418
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2419	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2420	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2421	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2422	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLAutoSound);
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2423	gdX.isNegative := not gdX.isNegative;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2424	gdY.isNegative := not gdY.isNegative;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2425	gdX:= gdX*_0_2;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2426	gdY:= gdY*_0_2;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2427
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2428	for i:= 0 to 4 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2429	begin
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2430	dX := gdX + rndSign(GetRandomf) * _0_03;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2431	dY := gdY + rndSign(GetRandomf) * _0_03;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2432	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtCluster, 0, dX, dY, 25);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2433	end;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	2434
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2435	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2436	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2437	end;
963 5f8bb3470563 Fix mortar clusters spread direction unc0rr parents: 945 diff changeset	2438
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2439	if (GameTicks and $3F) = 0 then
8993 839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2440	begin
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2441	if hwRound(Gear^.Y) > cWaterLine then
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2442	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2443	else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2444	end
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2445	end;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2446
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2447	////////////////////////////////////////////////////////////////////////////////
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2448	procedure doStepKamikazeWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2449	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2450	i: LongWord;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2451	HHGear: PGear;
5866 9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2452	sparkles: PVisualGear;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2453	hasWishes: boolean;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2454	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2455	AllInactive := false;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2456	hasWishes:= ((Gear^.Message and (gmPrecise or gmSwitch)) = (gmPrecise or gmSwitch));
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2457	if hasWishes then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2458	Gear^.AdvBounce:= 1;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2459
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2460	HHGear := Gear^.Hedgehog^.Gear;
7958 c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2461	if HHGear = nil then
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2462	begin
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2463	DeleteGear(Gear);
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2464	exit
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2465	end;
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2466
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2467	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2468	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2469
3852 37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2470	Gear^.X := HHGear^.X;
37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2471	Gear^.Y := HHGear^.Y;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2472	if (GameTicks mod 2 = 0) and hasWishes then
5866 9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2473	begin
9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2474	sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	2475	if sparkles <> nil then
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2476	begin
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2477	sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	2478	sparkles^.Angle:= random(360);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2479	end
5866 9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2480	end;
3852 37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2481
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2482	i := 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2483	repeat
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2484
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2485	Gear^.X := Gear^.X + HHGear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2486	Gear^.Y := Gear^.Y + HHGear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2487	HHGear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2488	HHGear^.Y := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2489
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2490	inc(Gear^.Damage, 2);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2491
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2492	// if TestCollisionXwithGear(HHGear, hwSign(Gear^.dX))
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2493	// or TestCollisionYwithGear(HHGear, hwSign(Gear^.dY)) then inc(Gear^.Damage, 3);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2494
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2495	dec(i)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2496	until (i = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2497	or (Gear^.Damage > Gear^.Health);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2498
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2499	inc(upd);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2500	if upd > 3 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2501	begin
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2502	if Gear^.Health < 1500 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2503	begin
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2504	if Gear^.AdvBounce <> 0 then
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2505	Gear^.Pos := 3
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2506	else
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2507	Gear^.Pos := 2;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2508	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2509
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2510	AmmoShove(Gear, 30, 40);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2511
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2512	DrawTunnel(HHGear^.X - HHGear^.dX * 10,
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2513	HHGear^.Y - _2 - HHGear^.dY * 10 + hwAbs(HHGear^.dY) * 2,
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2514	HHGear^.dX,
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2515	HHGear^.dY,
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2516	20 + cHHRadius * 2,
6130 026fd01a5e2c Blend the outter side too nemo parents: 6126 diff changeset	2517	cHHRadius * 2 + 7);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2518
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2519	upd := 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2520	end;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2521
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2522	if Gear^.Health < Gear^.Damage then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2523	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2524	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
6112 7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2525	if hasWishes then
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2526	for i:= 0 to 31 do
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2527	begin
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2528	sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2529	if sparkles <> nil then
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2530	with sparkles^ do
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2531	begin
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2532	Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	2533	Angle:= random(360);
6112 7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2534	dx:= 0.001 * (random(200));
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2535	dy:= 0.001 * (random(200));
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2536	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2537	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2538	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2539	dy := -dy;
6112 7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2540	FrameTicks:= random(400) + 250
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2541	end
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2542	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2543	AfterAttack;
7395 d0d38cd0d27c - Check for harmful gear deletions unc0rr parents: 7394 diff changeset	2544	HHGear^.Message:= HHGear^.Message or gmDestroy;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2545	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2546	end
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2547	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2548	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2549	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2550	Gear^.Damage := 0
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2551	end
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2552	end;
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2553
987 0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2554	procedure doStepKamikazeIdle(Gear: PGear);
0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2555	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2556	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2557	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2558	if Gear^.Timer = 0 then
5922 7e7774e7be8c moar sparkles :3 sheepluva parents: 5913 diff changeset	2559	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2560	Gear^.Pos := 1;
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2561	PlaySoundV(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2562	Gear^.doStep := @doStepKamikazeWork
5922 7e7774e7be8c moar sparkles :3 sheepluva parents: 5913 diff changeset	2563	end
987 0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2564	end;
0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2565
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2566	procedure doStepKamikaze(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2567	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2568	HHGear: PGear;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2569	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2570	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2571
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2572	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2573
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2574	HHGear^.dX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2575	HHGear^.dY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2576
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2577	Gear^.dX := SignAs(_0_45, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2578	Gear^.dY := - _0_9;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2579
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2580	Gear^.Timer := 550;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2581
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2582	Gear^.doStep := @doStepKamikazeIdle
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2583	end;
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2584
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2585	////////////////////////////////////////////////////////////////////////////////
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2586
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2587	const cakeh = 27;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2588	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2589	CakePoints: array[0..Pred(cakeh)] of record
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2590	x, y: hwFloat;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2591	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2592	CakeI: Longword;
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2593
1110 3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2594	procedure doStepCakeExpl(Gear: PGear);
3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2595	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2596	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2597
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2598	inc(Gear^.Tag);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2599	if Gear^.Tag < 2250 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2600	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2601
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2602	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), cakeDmg, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2603	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2604	DeleteGear(Gear)
1110 3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2605	end;
3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2606
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2607	procedure doStepCakeDown(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2608	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2609	gi: PGear;
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2610	dmg, dmgBase: LongInt;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2611	fX, fY, tdX, tdY: hwFloat;
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2612	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2613	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2614
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2615	inc(Gear^.Tag);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2616	if Gear^.Tag < 100 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2617	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2618	Gear^.Tag := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2619
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2620	if Gear^.Pos = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2621	begin
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2622	///////////// adapted from doMakeExplosion ///////////////////////////
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2623	//fX:= Gear^.X;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2624	//fY:= Gear^.Y;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2625	//fX.QWordValue:= fX.QWordValue and $FFFFFFFF00000000;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2626	//fY.QWordValue:= fY.QWordValue and $FFFFFFFF00000000;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2627	fX:= int2hwFloat(hwRound(Gear^.X));
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2628	fY:= int2hwFloat(hwRound(Gear^.Y));
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2629	dmgBase:= cakeDmg shl 1 + cHHRadius div 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2630	gi := GearsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2631	while gi <> nil do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2632	begin
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2633	if gi^.Kind = gtHedgehog then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2634	begin
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2635	dmg:= 0;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2636	tdX:= gi^.X-fX;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2637	tdY:= gi^.Y-fY;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2638	if hwRound(hwAbs(tdX)+hwAbs(tdY)) < dmgBase then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2639	dmg:= dmgBase - max(hwRound(Distance(tdX, tdY)),gi^.Radius);
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2640	if (dmg > 1) then dmg:= ModifyDamage(min(dmg div 2, cakeDmg), gi);
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2641	if (dmg > 1) then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2642	if (CurrentHedgehog^.Gear = gi) and (not gi^.Invulnerable) then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2643	gi^.State := gi^.State or gstLoser
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2644	else
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2645	gi^.State := gi^.State or gstWinner;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2646	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2647	gi := gi^.NextGear
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2648	end;
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2649	//////////////////////////////////////////////////////////////////////
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2650	Gear^.doStep := @doStepCakeExpl;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2651	PlaySound(sndCake)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2652	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2653	else dec(Gear^.Pos)
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2654	end;
87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2655
87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2656
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2657	procedure doStepCakeWork(Gear: PGear);
7370 d50b874e7ee8 Introduce uGearsHandlers.pas, for now only part of cake handlers is moved there unc0rr parents: 7341 diff changeset	2658	var
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2659	tdx, tdy: hwFloat;
1088 9702e17146e6 Stubs for spider weapon unc0rr parents: 1066 diff changeset	2660	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2661	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2662
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2663	inc(Gear^.Tag);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2664	if Gear^.Tag < 7 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2665	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2666
7416 2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2667	dec(Gear^.Health);
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2668	Gear^.Timer := Gear^.Health*10;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2669	if Gear^.Health mod 100 = 0 then
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2670	Gear^.PortalCounter:= 0;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2671	// This is not seconds, but at least it is some feedback
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2672	if (Gear^.Health = 0) or ((Gear^.Message and gmAttack) <> 0) then
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2673	begin
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2674	FollowGear := Gear;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2675	Gear^.RenderTimer := false;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2676	Gear^.doStep := @doStepCakeDown;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2677	exit
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2678	end;
2f2f78fc65a3 AI uses cake! Known issues: AI could damage itself for no reason, could let cake go looping in a hole with exit closed by AI hog. unc0rr parents: 7408 diff changeset	2679
7370 d50b874e7ee8 Introduce uGearsHandlers.pas, for now only part of cake handlers is moved there unc0rr parents: 7341 diff changeset	2680	cakeStep(Gear);
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2681
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2682	if Gear^.Tag = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2683	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2684	CakeI := (CakeI + 1) mod cakeh;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2685	tdx := CakePoints[CakeI].x - Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2686	tdy := - CakePoints[CakeI].y + Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2687	CakePoints[CakeI].x := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2688	CakePoints[CakeI].y := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2689	Gear^.DirAngle := DxDy2Angle(tdx, tdy);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2690	end;
1088 9702e17146e6 Stubs for spider weapon unc0rr parents: 1066 diff changeset	2691	end;
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2692
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2693	procedure doStepCakeUp(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2694	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2695	i: Longword;
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2696	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2697	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2698
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2699	inc(Gear^.Tag);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2700	if Gear^.Tag < 100 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2701	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2702	Gear^.Tag := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2703
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2704	if Gear^.Pos = 6 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2705	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2706	for i:= 0 to Pred(cakeh) do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2707	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2708	CakePoints[i].x := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2709	CakePoints[i].y := Gear^.Y
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2710	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2711	CakeI := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2712	Gear^.doStep := @doStepCakeWork
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2713	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2714	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2715	inc(Gear^.Pos)
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2716	end;
1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2717
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2718	procedure doStepCakeFall(Gear: PGear);
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2719	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2720	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2721
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2722	Gear^.dY := Gear^.dY + cGravity;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2723	if TestCollisionYwithGear(Gear, 1) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2724	Gear^.doStep := @doStepCakeUp
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2725	else
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	2726	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2727	Gear^.Y := Gear^.Y + Gear^.dY;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2728	if CheckGearDrowning(Gear) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2729	AfterAttack
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	2730	end
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2731	end;
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2732
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2733	procedure doStepCake(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2734	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2735	HHGear: PGear;
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2736	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2737	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2738
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2739	HHGear := Gear^.Hedgehog^.Gear;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2740	HHGear^.Message := HHGear^.Message and (not gmAttack);
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	2741	Gear^.CollisionMask:= lfNotCurrentMask;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2742
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2743	FollowGear := Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2744
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2745	Gear^.doStep := @doStepCakeFall
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2746	end;
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2747
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2748	////////////////////////////////////////////////////////////////////////////////
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2749	procedure doStepSeductionWork(Gear: PGear);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	2750	var i: LongInt;
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2751	hogs: PGearArrayS;
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2752	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2753	AllInactive := false;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2754	hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Radius);
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2755	if hogs.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2756	begin
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2757	for i:= 0 to hogs.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2758	with hogs.ar^[i]^ do
5533 cf32b5928cbe exclude current hedgehog nemo parents: 5531 diff changeset	2759	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2760	if hogs.ar^[i] <> CurrentHedgehog^.Gear then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2761	begin
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2762	dX:= _50 * cGravity * (Gear^.X - X) / _25;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2763	dY:= -_450 * cGravity;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2764	Active:= true;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2765	end
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2766	end;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2767	end ;
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2768	AfterAttack;
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2769	DeleteGear(Gear);
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2770	(*
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2771	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2772	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2773	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2774	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2775
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2776	if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2777	if (Land[y, x] <> 0) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2778	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2779	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2780	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2781	Gear^.dX := Gear^.dX * _1_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2782	Gear^.dY := Gear^.dY * _1_5 - _0_3;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2783	AmmoShove(Gear, 0, 40);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2784	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2785	DeleteGear(Gear)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2786	end
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2787	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2788	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2789	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2790	AfterAttack;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2791	DeleteGear(Gear)
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2792	end*)
1286 a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2793	end;
a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2794
a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2795	procedure doStepSeductionWear(Gear: PGear);
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2796	var heart: PVisualGear;
1286 a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2797	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2798	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2799	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2800	if Gear^.Timer > 250 then
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2801	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2802	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2803	inc(Gear^.Pos);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2804	if Gear^.Pos = 5 then
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2805	PlaySoundV(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2806	end;
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2807
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	2808	if (Gear^.Pos = 14) and (RealTicks and $3 = 0) then
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2809	begin
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2810	heart:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	2811	if heart <> nil then
5564 4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2812	with heart^ do
4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2813	begin
4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2814	dx:= 0.001 * (random(200));
4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2815	dy:= 0.001 * (random(200));
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2816	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2817	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2818	if random(2) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2819	dy := -dy;
5564 4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2820	FrameTicks:= random(750) + 1000;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	2821	State:= ord(sprSeduction)
5564 4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2822	end;
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2823	end;
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2824
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2825	if Gear^.Pos = 15 then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2826	Gear^.doStep := @doStepSeductionWork
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2827	end;
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2828
21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2829	procedure doStepSeduction(Gear: PGear);
21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2830	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2831	AllInactive := false;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2832	//DeleteCI(Gear^.Hedgehog^.Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2833	Gear^.doStep := @doStepSeductionWear
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2834	end;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2835
18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2836	////////////////////////////////////////////////////////////////////////////////
18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2837	procedure doStepWaterUp(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2838	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2839	i: LongWord;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2840	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2841	if (Gear^.Tag = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2842	or (cWaterLine = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2843	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2844	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2845	exit
4153 6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2846	end;
6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2847
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2848	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2849
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2850	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2851	if Gear^.Timer = 17 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2852	Gear^.Timer := 0
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2853	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2854	exit;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2855
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2856	if cWaterLine > 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2857	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2858	dec(cWaterLine);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2859	for i:= 0 to LAND_WIDTH - 1 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2860	Land[cWaterLine, i] := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2861	SetAllToActive
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2862	end;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2863
4153 6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2864	dec(Gear^.Tag);
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2865	end;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2866
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2867	////////////////////////////////////////////////////////////////////////////////
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2868	procedure doStepDrill(Gear: PGear);
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2869	forward;
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2870
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2871	procedure doStepDrillDrilling(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2872	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2873	t: PGearArray;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2874	tempColl: Word;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2875	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2876	AllInactive := false;
8822 fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2877	if (Gear^.Timer > 0) and (Gear^.Timer mod 10 <> 0) then
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2878	begin
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2879	dec(Gear^.Timer);
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2880	exit;
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2881	end;
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2882
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2883	DrawTunnel(Gear^.X, Gear^.Y, Gear^.dX, Gear^.dY, 2, 6);
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2884	Gear^.X := Gear^.X + Gear^.dX;
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2885	Gear^.Y := Gear^.Y + Gear^.dY;
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2886	if (Gear^.Timer mod 30) = 0 then
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2887	AddVisualGear(hwRound(Gear^.X + _20 * Gear^.dX), hwRound(Gear^.Y + _20 * Gear^.dY), vgtDust);
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2888	if (CheckGearDrowning(Gear)) then
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2889	begin
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2890	StopSoundChan(Gear^.SoundChannel);
fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2891	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2892	end;
8822 fc9877ff7f1a Don't reward digging close w/ drill rocket. Doesn't offer much benefit. Reduce final bonus slightly to avoid using drill like bazooka. Better would be AI doing this for all weps based on count. Make main drill loop a little more efficient. nemo parents: 8814 diff changeset	2893
8564 dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2894	tempColl:= Gear^.CollisionMask;
dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2895	Gear^.CollisionMask:= $007F;
dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2896	if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) <> 0) or TestCollisionXWithGear(Gear, hwSign(Gear^.dX)) or (GameTicks > Gear^.FlightTime) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2897	t := CheckGearsCollision(Gear)
6532 76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2898	else t := nil;
8564 dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2899	Gear^.CollisionMask:= tempColl;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2900	//fixes drill not exploding when touching HH bug
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2901
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2902	if (Gear^.Timer = 0) or ((t <> nil) and (t^.Count <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2903	or ( ((Gear^.State and gsttmpFlag) = 0) and (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))))
3509 d72c2219595d Make land types flagged (to allow stacking future attributes such as indestructible ice, but also for a damaged flag) nemo parents: 3505 diff changeset	2904	// CheckLandValue returns true if the type isn't matched
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2905	or (not CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y), lfIndestructible)) then
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2906	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2907	//out of time or exited ground
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2908	StopSoundChan(Gear^.SoundChannel);
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2909	if (Gear^.State and gsttmpFlag) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2910	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound)
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2911	else
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2912	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2913	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2914	exit
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2915	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2916
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2917	else if (TestCollisionYWithGear(Gear, hwSign(Gear^.dY)) = 0) and (not TestCollisionXWithGear(Gear, hwSign(Gear^.dX))) then
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2918	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2919	StopSoundChan(Gear^.SoundChannel);
4867 e604ee83e34f let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact sheepluva parents: 4837 diff changeset	2920	Gear^.Tag := 1;
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2921	Gear^.doStep := @doStepDrill
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2922	end;
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2923
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2924	dec(Gear^.Timer);
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2925	end;
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2926
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2927	procedure doStepDrill(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2928	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2929	t: PGearArray;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2930	oldDx, oldDy: hwFloat;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2931	t2: hwFloat;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2932	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2933	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2934
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2935	if (Gear^.State and gsttmpFlag) = 0 then
d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2936	Gear^.dX := Gear^.dX + cWindSpeed;
d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2937
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2938	oldDx := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2939	oldDy := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2940
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2941	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2942
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2943	if (GameTicks and $3F) = 0 then
8993 839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2944	begin
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2945	if hwRound(Gear^.Y) > cWaterLine then
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2946	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2947	else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
839ce342474a use bubbles underwater nemo parents: 8992 diff changeset	2948	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2949
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2950	if ((Gear^.State and gstCollision) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2951	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2952	//hit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2953	Gear^.dX := oldDx;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2954	Gear^.dY := oldDy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2955
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2956	if GameTicks > Gear^.FlightTime then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2957	t := CheckGearsCollision(Gear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2958	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2959	t := nil;
6532 76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2960	if (t = nil) or (t^.Count = 0) then
76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2961	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2962	//hit the ground not the HH
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2963	t2 := _0_5 / Distance(Gear^.dX, Gear^.dY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2964	Gear^.dX := Gear^.dX * t2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2965	Gear^.dY := Gear^.dY * t2;
6532 76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2966	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2967
6532 76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2968	else if (t <> nil) then
76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2969	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2970	//explode right on contact with HH
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2971	if (Gear^.State and gsttmpFlag) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2972	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound)
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2973	else
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2974	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2975	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2976	exit;
6532 76d63e00002f Little tweak to reduce noob fail. Delay drill rocket explosion by 250ms after spawn in Attack. Unless you drop it straight down w/ no power, it should not explode immediately in your face. nemo parents: 6507 diff changeset	2977	end;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	2978
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2979	Gear^.SoundChannel := LoopSound(sndDrillRocket);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2980	Gear^.doStep := @doStepDrillDrilling;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2981
4867 e604ee83e34f let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact sheepluva parents: 4837 diff changeset	2982	if (Gear^.State and gsttmpFlag) <> 0 then
e604ee83e34f let players set timer of drill strike. yes. drill strike :3 the timer starts to tick on first impact sheepluva parents: 4837 diff changeset	2983	gear^.RenderTimer:= true;
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2984	if Gear^.Timer > 0 then dec(Gear^.Timer)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2985	end
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2986	else if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Tag <> 0) then
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2987	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2988	if Gear^.Timer > 0 then
7325 a68eca3ad1fe Tiny optimization + formatting fix unc0rr parents: 7310 diff changeset	2989	dec(Gear^.Timer)
a68eca3ad1fe Tiny optimization + formatting fix unc0rr parents: 7310 diff changeset	2990	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2991	begin
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2992	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2993	DeleteGear(Gear);
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2994	end
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2995	end;
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2996	end;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	2997
1633 c1de4078b0fd Drill rocket patch unc0rr parents: 1631 diff changeset	2998	////////////////////////////////////////////////////////////////////////////////
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	2999	procedure doStepBallgunWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3000	var
7296 fb5b7cb58a67 er. this one too nemo parents: 7293 diff changeset	3001	HHGear, ball: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3002	rx, ry: hwFloat;
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	3003	gX, gY: LongInt;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3004	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3005	AllInactive := false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3006	dec(Gear^.Timer);
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3007	HHGear := Gear^.Hedgehog^.Gear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3008	HedgehogChAngle(HHGear);
3484 3c65b1d979cd Engine: smxx parents: 3483 diff changeset	3009	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
3c65b1d979cd Engine: smxx parents: 3483 diff changeset	3010	gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3011	if (Gear^.Timer mod 100) = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3012	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3013	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3014	ry := rndSign(getRandomf * _0_1);
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	3015
7296 fb5b7cb58a67 er. this one too nemo parents: 7293 diff changeset	3016	ball:= AddGear(gx, gy, gtBall, 0, SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx, AngleCos(HHGear^.Angle) * ( - _0_8) + ry, 0);
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	3017	ball^.CollisionMask:= lfNotCurrentMask;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	3018
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3019	PlaySound(sndGun);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3020	end;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3021
7195 9e6e8e5a4c2e Check for gstHHDriven instead of damage check, so ballgun stops when turn ends in multiattack mode unc0rr parents: 7170 diff changeset	3022	if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3023	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3024	DeleteGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3025	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3026	end
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3027	end;
0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3028
0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3029	procedure doStepBallgun(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3030	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3031	HHGear: PGear;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3032	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3033	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3034	HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3035	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3036	Gear^.doStep := @doStepBallgunWork
1633 c1de4078b0fd Drill rocket patch unc0rr parents: 1631 diff changeset	3037	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3038
1696 bb1e305320a1 rc plane falls down when looses control unc0rr parents: 1689 diff changeset	3039	////////////////////////////////////////////////////////////////////////////////
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3040	procedure doStepRCPlaneWork(Gear: PGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3041
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3042	const cAngleSpeed = 3;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3043	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3044	HHGear: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3045	i: LongInt;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3046	dX, dY: hwFloat;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3047	fChanged: boolean;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3048	trueAngle: Longword;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3049	t: PGear;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3050	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3051	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3052
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3053	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3054	FollowGear := Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3055
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3056	if Gear^.Timer > 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3057	dec(Gear^.Timer);
4886 e3e5362a308e fixed unlimeted fuel bug for rcplane Henek parents: 4881 diff changeset	3058
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3059	fChanged := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3060	if ((HHGear^.State and gstHHDriven) = 0) or (Gear^.Timer = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3061	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3062	fChanged := true;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3063	if Gear^.Angle > 2048 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3064	dec(Gear^.Angle)
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3065	else if Gear^.Angle < 2048 then
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3066	inc(Gear^.Angle)
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3067	else fChanged := false
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3068	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3069	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3070	begin
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3071	if ((Gear^.Message and gmLeft) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3072	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3073	fChanged := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3074	Gear^.Angle := (Gear^.Angle + (4096 - cAngleSpeed)) mod 4096
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3075	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3076
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3077	if ((Gear^.Message and gmRight) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3078	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3079	fChanged := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3080	Gear^.Angle := (Gear^.Angle + cAngleSpeed) mod 4096
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3081	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3082	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3083
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3084	if fChanged then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3085	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3086	Gear^.dX.isNegative := (Gear^.Angle > 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3087	if Gear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3088	trueAngle := 4096 - Gear^.Angle
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3089	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3090	trueAngle := Gear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3091
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3092	Gear^.dX := SignAs(AngleSin(trueAngle), Gear^.dX) * _0_25;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3093	Gear^.dY := AngleCos(trueAngle) * -_0_25;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3094	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3095
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3096	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3097	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3098
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3099	if (GameTicks and $FF) = 0 then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3100	if Gear^.Timer < 3500 then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3101	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace)
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3102	else
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3103	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3104
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3105	if ((HHGear^.Message and gmAttack) <> 0) and (Gear^.Health <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3106	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3107	HHGear^.Message := HHGear^.Message and (not gmAttack);
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3108	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, Gear^.dX * _0_5, Gear^.dY *
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3109	_0_5, 0);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3110	dec(Gear^.Health)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3111	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3112
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3113	if ((HHGear^.Message and gmLJump) <> 0) and ((Gear^.State and gsttmpFlag) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3114	begin
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3115	Gear^.State := Gear^.State or gsttmpFlag;
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3116	PauseMusic;
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3117	playSound(sndRideOfTheValkyries);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3118	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3119
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3120	// pickup bonuses
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3121	t := CheckGearNear(Gear, gtCase, 36, 36);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3122	if t <> nil then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3123	PickUp(HHGear, t);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3124
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3125	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3126
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3127	if ((Gear^.State and gstCollision) <> 0) or CheckGearDrowning(Gear) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3128	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	3129	StopSoundChan(Gear^.SoundChannel);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3130	StopSound(sndRideOfTheValkyries);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3131	ResumeMusic;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3132
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3133	if ((Gear^.State and gstCollision) <> 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3134	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	3135	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 25, Gear^.Hedgehog, EXPLAutoSound);
5228 b018f6117fc1 Nerf RC a bit nemo parents: 5221 diff changeset	3136	for i:= 0 to 15 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3137	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3138	dX := AngleCos(i * 64) * _0_5 * (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3139	dY := AngleSin(i * 64) * _0_5 * (GetRandomf + _1);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3140	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, dY, 0);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3141	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtFlame, 0, dX, -dY, 0);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3142	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3143	DeleteGear(Gear)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3144	end;
1713 194ed95f9e8d Hedgehog is also sad when rcplane is drawning unc0rr parents: 1712 diff changeset	3145
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3146	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3147	CurAmmoGear := nil;
5016 9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3148	if (GameFlags and gfInfAttack) = 0 then
9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3149	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3150	if TagTurnTimeLeft = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3151	TagTurnTimeLeft:= TurnTimeLeft;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3152
5016 9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3153	TurnTimeLeft:= 14 * 125;
9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3154	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3155
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3156	HHGear^.Message := 0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3157	ParseCommand('/taunt ' + #1, true)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3158	end
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3159	end;
3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3160
3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3161	procedure doStepRCPlane(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3162	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3163	HHGear: PGear;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3164	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3165	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3166	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3167	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3168	Gear^.Angle := HHGear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3169	Gear^.Tag := hwSign(HHGear^.dX);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3170
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3171	if HHGear^.dX.isNegative then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3172	Gear^.Angle := 4096 - Gear^.Angle;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3173	Gear^.doStep := @doStepRCPlaneWork
1712 f5b916de40f0 Patch by nemo (polished by me) unc0rr parents: 1708 diff changeset	3174	end;
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3175
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	3176	////////////////////////////////////////////////////////////////////////////////
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3177	procedure doStepJetpackWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3178	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3179	HHGear: PGear;
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3180	fuel, i: LongInt;
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3181	move: hwFloat;
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3182	isUnderwater: Boolean;
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3183	bubble: PVisualGear;
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3184	begin
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3185	isUnderwater:= cWaterLine < hwRound(Gear^.Y) + Gear^.Radius;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3186	if Gear^.Pos > 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3187	dec(Gear^.Pos);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3188	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3189	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3190	//dec(Gear^.Timer);
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3191	move := _0_2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3192	fuel := 50;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3193	(*if (HHGear^.Message and gmPrecise) <> 0 then
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3194	begin
c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3195	move:= _0_02;
c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3196	fuel:= 5;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3197	end;*)
8987 47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3198	if HHGear^.Message and gmPrecise <> 0 then
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3199	HedgehogChAngle(HHGear)
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3200	else if Gear^.Health > 0 then
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3201	begin
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3202	if HHGear^.Message and gmUp <> 0 then
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3203	begin
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3204	if (not HHGear^.dY.isNegative) or (HHGear^.Y > -_256) then
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3205	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3206	if isUnderwater then
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3207	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3208	HHGear^.dY := HHGear^.dY - (move * _0_7);
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3209	for i:= random(10)+10 downto 0 do
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3210	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3211	bubble := AddVisualGear(hwRound(HHGear^.X) - 8 + random(16), hwRound(HHGear^.Y) + 16 + random(8), vgtBubble);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3212	if bubble <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3213	bubble^.dY:= random(20)/10+0.1;
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3214	end
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3215	end
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3216	else HHGear^.dY := HHGear^.dY - move;
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3217	end;
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3218	dec(Gear^.Health, fuel);
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3219	Gear^.MsgParam := Gear^.MsgParam or gmUp;
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3220	Gear^.Timer := GameTicks
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3221	end;
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3222	move.isNegative := (HHGear^.Message and gmLeft) <> 0;
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3223	if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3224	begin
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3225	HHGear^.dX := HHGear^.dX + (move * _0_1);
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3226	if isUnderwater then
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3227	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3228	for i:= random(5)+5 downto 0 do
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3229	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3230	bubble := AddVisualGear(hwRound(HHGear^.X)+random(8), hwRound(HHGear^.Y) - 8 + random(16), vgtBubble);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	3231	if bubble <> nil then
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3232	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3233	bubble^.dX:= (random(10)/10 + 0.02) * -1;
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3234	if (move.isNegative) then
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3235	begin
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3236	bubble^.X := bubble^.X + 28;
4187 adb144a907aa remove last warnings from xcodeproj koda parents: 4184 diff changeset	3237	bubble^.dX:= bubble^.dX * (-1)
3909 4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3238	end
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3239	else bubble^.X := bubble^.X - 28;
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3240	end;
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3241	end
4ba25a3d15af remove windspeed from bubbles, remove initial dY from bubbles, apply dY/dX to bubbles, correct offsets on flying saucer flame graphics, add bubbles when flying saucer thrusts underwater, make flying saucer sink more slowly underwater nemo parents: 3907 diff changeset	3242	end;
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3243	dec(Gear^.Health, fuel div 5);
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3244	Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight));
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3245	Gear^.Timer := GameTicks
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3246	end
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3247	end;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3248
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3249	// erases them all at once :-/
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3250	if (Gear^.Timer <> 0) and (GameTicks - Gear^.Timer > 250) then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3251	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3252	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3253	Gear^.MsgParam := 0
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3254	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3255
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3256	if Gear^.Health < 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3257	Gear^.Health := 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3258
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3259	i:= Gear^.Health div 20;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3260
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3261	if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3262	begin
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3263	Gear^.Damage:= i;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3264	//AddCaption('Fuel: '+inttostr(round(Gear^.Health/20))+'%', cWhiteColor, capgrpAmmostate);
6380 1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check. nemo parents: 6368 diff changeset	3265	FreeTexture(Gear^.Tex);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3266	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) + '%', cWhiteColor, fntSmall)
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3267	end;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3268
8987 47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3269	if (HHGear^.Message and (gmAttack or gmUp or gmLeft or gmRight) <> 0) and
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3270	(HHGear^.Message and gmPrecise = 0) then
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3271	Gear^.State := Gear^.State and (not gsttmpFlag);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3272
8987 47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3273	if HHGear^.Message and gmPrecise = 0 then
47cf32305d99 some saucer thing for firing weps underwater and aiming and such. bit drunk and sleepy so testing I guess nemo parents: 8973 diff changeset	3274	HHGear^.Message := HHGear^.Message and (not (gmUp or gmLeft or gmRight));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3275	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3276
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3277	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3278	Gear^.Y := HHGear^.Y;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3279
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3280	if not isUnderWater and hasBorder and ((HHGear^.X < _0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3281	or (hwRound(HHGear^.X) > LAND_WIDTH)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3282	HHGear^.dY.isNegative:= false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3283
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3284	if ((Gear^.State and gsttmpFlag) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3285	or (HHGear^.dY < _0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3286	doStepHedgehogMoving(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3287
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3288	if // (Gear^.Health = 0)
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3289	(HHGear^.Damage <> 0)
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3290	//or CheckGearDrowning(HHGear)
8990 e64a1a851b69 more drowning fixes nemo parents: 8987 diff changeset	3291	or (cWaterLine + cVisibleWater * 4 < hwRound(HHGear^.Y))
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3292	or (TurnTimeLeft = 0)
5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3293	// allow brief ground touches - to be fair on this, might need another counter
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	3294	or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3295	or ((Gear^.Message and gmAttack) <> 0) then
4233 b4ad20bfe310 make weapons on rope/parachute/UFO inherit momentum of the hog. needs testing of course nemo parents: 4224 diff changeset	3296	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3297	with HHGear^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3298	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3299	Message := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3300	Active := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3301	State := State or gstMoving
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3302	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3303	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3304	isCursorVisible := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3305	ApplyAmmoChanges(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3306	// if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3307
2619 bc2786a00fb8 fix wrong ttf blending in ppc koda parents: 2608 diff changeset	3308	// Gear^.Tex:= RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(round(Gear^.Health / 20)) + '%', cWhiteColor, fntSmall)
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3309
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3310	//AddCaption(trmsg[sidFuel]+': '+inttostr(round(Gear^.Health/20))+'%', cWhiteColor, capgrpAmmostate);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3311	end
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3312	end;
c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3313
c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3314	procedure doStepJetpack(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3315	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3316	HHGear: PGear;
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3317	begin
3907 5b516f0d9957 Allow UFO to go underwater. Keep UFO active if it runs out of fuel in the air/water, just disable controls. nemo parents: 3894 diff changeset	3318	Gear^.Pos:= 0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3319	Gear^.doStep := @doStepJetpackWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3320
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3321	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3322	FollowGear := HHGear;
3965 09eea558ba83 Call OnUsedAmmo after doing the normal CurAmmoType stuff so CurAmmoType actually points to the right bloody weapon nemo parents: 3963 diff changeset	3323	AfterAttack;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3324	with HHGear^ do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3325	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3326	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3327	Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight));
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3328
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3329	if (dY < _0_1) and (dY > -_0_1) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3330	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3331	Gear^.State := Gear^.State or gsttmpFlag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3332	dY := dY - _0_2
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3333	end
2301 7a4ad0772c88 minor saucer change Tiy had requested once. nemo parents: 2283 diff changeset	3334	end
2177 c045698e044f Initial attempt at jetpack. Pluses, more like lunar lander (takes fall damage). Minuses, can't seem to cancel it or use alt weapon nemo parents: 2143 diff changeset	3335	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3336
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3337	////////////////////////////////////////////////////////////////////////////////
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3338	procedure doStepBirdyDisappear(Gear: PGear);
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3339	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3340	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3341	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3342	if Gear^.Timer < 2000 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3343	inc(Gear^.Timer, 1)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3344	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3345	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3346	DeleteGear(Gear);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3347	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3348	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3349
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3350	procedure doStepBirdyFly(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3351	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3352	HHGear: PGear;
3161 cb5f04cc9d76 - Add HH dX/dY to Birdy disappearing animation palewolf parents: 3151 diff changeset	3353	fuel, i: LongInt;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3354	move: hwFloat;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3355	begin
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3356	HHGear := Gear^.Hedgehog^.Gear;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3357	if HHGear = nil then
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3358	begin
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3359	DeleteGear(Gear);
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3360	exit
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3361	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3362
3915 c05855146440 Correct bug in flight ceiling for birdy as well, increase clip on velocity to 1.9 (shouldn't cause problems with most collision checks still), apply clip to both + and - nemo parents: 3909 diff changeset	3363	move := _0_2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3364	fuel := 50;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3365
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3366	if Gear^.Pos > 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3367	dec(Gear^.Pos, 1)
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3368	else if (HHGear^.Message and (gmLeft or gmRight or gmUp)) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3369	Gear^.Pos := 500;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3370
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3371	if HHGear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3372	Gear^.Tag := -1
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3373	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3374	Gear^.Tag := 1;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3375
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3376	if (HHGear^.Message and gmUp) <> 0 then
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3377	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3378	if (not HHGear^.dY.isNegative)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3379	or (HHGear^.Y > -_256) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3380	HHGear^.dY := HHGear^.dY - move;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3381
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3382	dec(Gear^.Health, fuel);
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3383	Gear^.MsgParam := Gear^.MsgParam or gmUp;
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3384	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3385
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3386	if (HHGear^.Message and gmLeft) <> 0 then move.isNegative := true;
9abce5468583 Engine: smaxx parents: 3852 diff changeset	3387	if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3388	begin
3915 c05855146440 Correct bug in flight ceiling for birdy as well, increase clip on velocity to 1.9 (shouldn't cause problems with most collision checks still), apply clip to both + and - nemo parents: 3909 diff changeset	3389	HHGear^.dX := HHGear^.dX + (move * _0_1);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3390	dec(Gear^.Health, fuel div 5);
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3391	Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight));
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3392	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3393
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3394	if Gear^.Health < 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3395	Gear^.Health := 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3396
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3397	if ((GameTicks and $FF) = 0) and (Gear^.Health < 500) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3398	for i:= ((500-Gear^.Health) div 250) downto 0 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3399	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFeather);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3400
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3401	if (HHGear^.Message and gmAttack <> 0) then
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3402	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3403	HHGear^.Message := HHGear^.Message and (not gmAttack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3404	if Gear^.FlightTime > 0 then
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3405	begin
cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3406	AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + 32, gtEgg, 0, Gear^.dX * _0_5, Gear^.dY, 0);
3123 b0a02930a1dc Engine: smxx parents: 3119 diff changeset	3407	PlaySound(sndBirdyLay);
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3408	dec(Gear^.FlightTime)
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3409	end;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3410	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3411
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	3412	if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3413	Gear^.State := Gear^.State and (not gsttmpFlag);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3414
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3415	HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3416	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3417
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3418	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3419	Gear^.Y := HHGear^.Y - int2hwFloat(32);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3420	// For some reason I need to reapply followgear here, something else grabs it otherwise.
6325 cdd3d8c723ec Update changelog, comment on possibly redundant lines in GSHandlers nemo parents: 6314 diff changeset	3421	// this is probably not needed anymore
cdd3d8c723ec Update changelog, comment on possibly redundant lines in GSHandlers nemo parents: 6314 diff changeset	3422	if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3423
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3424	if ((Gear^.State and gsttmpFlag) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3425	or (HHGear^.dY < _0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3426	doStepHedgehogMoving(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3427
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3428	if (Gear^.Health = 0)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3429	or (HHGear^.Damage <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3430	or CheckGearDrowning(HHGear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3431	or (TurnTimeLeft = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3432	// allow brief ground touches - to be fair on this, might need another counter
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3433	or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3434	or ((Gear^.Message and gmAttack) <> 0) then
4272 cf18de7ea3d4 engine side of a more wind patch. no frontend hook. just want to check it in to pull it from another machine nemo parents: 4265 diff changeset	3435	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3436	with HHGear^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3437	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3438	Message := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3439	Active := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3440	State := State or gstMoving
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3441	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3442	Gear^.State := Gear^.State or gstAnimation or gstTmpFlag;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3443	if HHGear^.dY < _0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3444	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3445	Gear^.dX := HHGear^.dX;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3446	Gear^.dY := HHGear^.dY;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3447	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3448	Gear^.Timer := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3449	Gear^.doStep := @doStepBirdyDisappear;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3450	CurAmmoGear := nil;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3451	isCursorVisible := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3452	AfterAttack;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3453	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3454	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3455
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3456	procedure doStepBirdyDescend(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3457	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3458	HHGear: PGear;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3459	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3460	if Gear^.Timer > 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3461	dec(Gear^.Timer, 1)
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3462	else if Gear^.Hedgehog^.Gear = nil then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3463	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3464	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3465	AfterAttack;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3466	exit
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3467	end;
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3468	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3469	HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3470	if abs(hwRound(HHGear^.Y - Gear^.Y)) > 32 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3471	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3472	if Gear^.Timer = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3473	Gear^.Y := Gear^.Y + _0_1
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3474	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3475	else if Gear^.Timer = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3476	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3477	Gear^.doStep := @doStepBirdyFly;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3478	HHGear^.dY := -_0_2
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3479	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3480	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3481
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3482	procedure doStepBirdyAppear(Gear: PGear);
08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3483	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3484	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3485	if Gear^.Timer < 2000 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3486	inc(Gear^.Timer, 1)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3487	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3488	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3489	Gear^.Timer := 500;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3490	Gear^.dX := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3491	Gear^.dY := _0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3492	Gear^.State := Gear^.State and (not gstAnimation);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3493	Gear^.doStep := @doStepBirdyDescend;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3494	end
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3495	end;
08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3496
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3497	procedure doStepBirdy(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3498	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3499	HHGear: PGear;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3500	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3501	gear^.State := gear^.State or gstAnimation and (not gstTmpFlag);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3502	Gear^.doStep := @doStepBirdyAppear;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3503
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3504	if CurrentHedgehog = nil then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3505	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3506	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3507	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3508	end;
2995 b90745d87332 Engine: smxx parents: 2994 diff changeset	3509
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3510	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3511
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3512	if HHGear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3513	Gear^.Tag := -1
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3514	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3515	Gear^.Tag := 1;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3516	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3517	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3518	FollowGear := HHGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3519	with HHGear^ do
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	3520	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3521	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3522	Message := Message and (not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight))
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	3523	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3524	end;
3032 9c190d3c165b Insert commit message here palewolf parents: 3020 diff changeset	3525
9c190d3c165b Insert commit message here palewolf parents: 3020 diff changeset	3526	////////////////////////////////////////////////////////////////////////////////
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3527	procedure doStepEggWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3528	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3529	vg: PVisualGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3530	i: LongInt;
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3531	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3532	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3533	Gear^.dX := Gear^.dX;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3534	doStepFallingGear(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3535	// CheckGearDrowning(Gear); // already checked for in doStepFallingGear
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3536	CalcRotationDirAngle(Gear);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3537
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3538	if (Gear^.State and gstCollision) <> 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3539	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	3540	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLPoisoned, $C0E0FFE0);
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3541	PlaySound(sndEggBreak);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3542	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3543	vg := AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3544	if vg <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3545	vg^.Frame := 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3546
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3547	for i:= 10 downto 0 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3548	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3549	vg := AddVisualGear(hwRound(Gear^.X) - 3 + Random(6), hwRound(Gear^.Y) - 3 + Random(6),
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3550	vgtDust);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3551	if vg <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3552	vg^.dX := vg^.dX + (Gear^.dX.QWordValue / 21474836480);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3553	end;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3554
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3555	DeleteGear(Gear);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3556	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3557	end;
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3558	end;
3342 b4f01613dcd7 Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here. nemo parents: 3320 diff changeset	3559
3401 d5d31d16eccc add a part of my landslide vector collision and use if for the portal gun DirAngle, not flawless yet sheepluva parents: 3399 diff changeset	3560	////////////////////////////////////////////////////////////////////////////////
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3561	procedure doPortalColorSwitch();
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3562	var CurWeapon: PAmmo;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3563	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3564	if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3565	with CurrentHedgehog^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3566	if (CurAmmoType = amPortalGun) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3567	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3568	CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSwitch);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3569
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	3570	CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3571	if CurWeapon^.Pos <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3572	CurWeapon^.Pos := 0
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3573
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3574	else
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3575	CurWeapon^.Pos := 1;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3576	end;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3577	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3578
3342 b4f01613dcd7 Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here. nemo parents: 3320 diff changeset	3579	procedure doStepPortal(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3580	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3581	iterator, conPortal: PGear;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3582	s, r, nx, ny, ox, oy, poffs, noffs, pspeed, nspeed,
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3583	resetx, resety, resetdx, resetdy: hwFloat;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3584	sx, sy, rh, resetr: LongInt;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3585	hasdxy, isbullet, iscake, isCollision: Boolean;
3342 b4f01613dcd7 Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here. nemo parents: 3320 diff changeset	3586	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3587	doPortalColorSwitch();
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3588
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3589	// destroy portal if ground it was attached too is gone
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	3590	if (Land[hwRound(Gear^.Y), hwRound(Gear^.X)] <= lfAllObjMask)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3591	or (Gear^.Timer < 1)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3592	or (Gear^.Hedgehog^.Team <> CurrentHedgehog^.Team)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3593	or (hwRound(Gear^.Y) > cWaterLine) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3594	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3595	deleteGear(Gear);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3596	EXIT;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3597	end;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3598
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3599	if (TurnTimeLeft < 1)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3600	or (Gear^.Health < 1) then
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3601	dec(Gear^.Timer);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3602
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3603	if Gear^.Timer < 10000 then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3604	gear^.RenderTimer := true;
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3605
41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3606	// abort if there is no other portal connected to this one
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3607	if (Gear^.LinkedGear = nil) then
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3608	exit;
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3609	if ((Gear^.LinkedGear^.Tag and 1) = 0) then // or if it's still moving;
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3610	exit;
41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3611
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3612	conPortal := Gear^.LinkedGear;
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3613
41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3614	// check all gears for stuff to port through
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3615	iterator := nil;
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3616	while true do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3617	begin
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3618
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3619	// iterate through GearsList
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3620	if iterator = nil then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3621	iterator := GearsList
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3622	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3623	iterator := iterator^.NextGear;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3624
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3625	// end of list?
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3626	if iterator = nil then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3627	break;
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3628
41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3629	// don't port portals or other gear that wouldn't make sense
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	3630	if (iterator^.Kind in [gtPortal, gtRope, gtAirAttack, gtIceGun])
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3631	or (iterator^.PortalCounter > 32) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3632	continue;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3633
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3634	// don't port hogs on rope
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3635	// TODO: this will also prevent hogs while falling after rope use from
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3636	// falling through portals... fix that!
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3637
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3638	// check if gear fits through portal
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3639	if (iterator^.Radius > Gear^.Radius) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3640	continue;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3641
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3642	// this is the max range we accept incoming gears in
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3643	r := Int2hwFloat(iterator^.Radius+Gear^.Radius);
3422 41ae3c48faa0 * some changes/cleanups to portal, still much to do :/ * reverted nemo's temporary loop fix * notice: small loops possible again, so take care :P, bigger onces should be interrupted sheepluva parents: 3419 diff changeset	3644
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3645	// too far away?
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3646	if (iterator^.X < Gear^.X - r)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3647	or (iterator^.X > Gear^.X + r)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3648	or (iterator^.Y < Gear^.Y - r)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3649	or (iterator^.Y > Gear^.Y + r) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3650	continue;
5044 6e8da75e5f5e I changed r. Still not a perfect fix. Colin Rice (clr_) parents: 5042 diff changeset	3651
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3652	hasdxy := (((iterator^.dX.QWordValue <> 0) or (iterator^.dY.QWordValue <> 0)) or ((iterator^.State or gstMoving) = 0));
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3653
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3654	// in case the object is not moving, let's asume it's falling towards the portal
4038 8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3655	if not hasdxy then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3656	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3657	if Gear^.Y < iterator^.Y then
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3658	continue;
4038 8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3659	ox:= Gear^.X - iterator^.X;
8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3660	oy:= Gear^.Y - iterator^.Y;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3661	end
4038 8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3662	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3663	begin
4038 8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3664	ox:= iterator^.dX;
8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3665	oy:= iterator^.dY;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3666	end;
4038 8972dd38bbad potential fix for Issue #86: 'Objects behind a portal will sometimes go through the portal.' please test sheepluva parents: 4036 diff changeset	3667
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3668	// cake will need extra treatment... it's so delicious and moist!
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3669	iscake:= (iterator^.Kind = gtCake);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3670
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3671	// won't port stuff that does not move towards the front/portal entrance
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3672	if iscake then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3673	begin
6452 7c6f9b6672dc More work on the parser unc0rr parents: 6450 diff changeset	3674	if not (((iterator^.X - Gear^.X)ox + (iterator^.Y - Gear^.Y)oy).isNegative) then
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3675	continue;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3676	end
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3677	else
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	3678	if not ((Gear^.dXox + Gear^.dYoy).isNegative) then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3679	continue;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3680
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3681	isbullet:= (iterator^.Kind in [gtShotgunShot, gtDEagleShot, gtSniperRifleShot, gtSineGunShot]);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3682
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3683	r:= int2hwFloat(iterator^.Radius);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3684
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3685	if not (isbullet or iscake) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3686	begin
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3687	// wow! good candidate there, let's see if the distance and direction is okay!
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3688	if hasdxy then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3689	begin
8900 b77fd3c2eec5 whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error? sheepluva parents: 8898 diff changeset	3690	s := Distance(iterator^.dX, iterator^.dY);
8898 0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3691	// if the resulting distance is 0 skip this gear
0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3692	if s.QWordValue = 0 then
0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3693	continue;
8900 b77fd3c2eec5 whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error? sheepluva parents: 8898 diff changeset	3694	s := r / s;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3695	ox:= iterator^.X + s * iterator^.dX;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3696	oy:= iterator^.Y + s * iterator^.dY;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3697	end
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3698	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3699	begin
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3700	ox:= iterator^.X;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3701	oy:= iterator^.Y + r;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3702	end;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3703
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3704	if (hwRound(Distance(Gear^.X-ox,Gear^.Y-oy)) > Gear^.Radius + 1 ) then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3705	continue;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3706	end;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3707
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3708	// draw bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3709	if isbullet then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3710	spawnBulletTrail(iterator);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3711
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3712	// calc gear offset in portal vector direction
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3713	ox := (iterator^.X - Gear^.X);
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3714	oy := (iterator^.Y - Gear^.Y);
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3715	poffs:= (Gear^.dX * ox + Gear^.dY * oy);
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3716
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3717	if not isBullet and poffs.isNegative then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3718	continue;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3719
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3720	// only port bullets close to the portal
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3721	if isBullet and (not (hwAbs(poffs) < _3)) then
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3722	continue;
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3723
4076 7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3724	//
7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3725	// gears that make it till here will definately be ported
7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3726	//
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3727	// (but old position/movement vector might be restored in case there's
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3728	// not enough space on the other side)
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3729	//
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3730
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3731	resetr := iterator^.Radius;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3732	resetx := iterator^.X;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3733	resety := iterator^.Y;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3734	resetdx := iterator^.dX;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3735	resetdy := iterator^.dY;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3736
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3737	// create a normal of the portal vector, but ...
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3738	nx := Gear^.dY;
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3739	ny := Gear^.dX;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3740	// ... decide where the top is based on the hog's direction when firing the portal
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3741	if Gear^.Elasticity.isNegative then
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	3742	nx.isNegative := (not nx.isNegative)
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3743	else
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3744	ny.isNegative := not ny.isNegative;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3745
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3746	// calc gear offset in portal normal vector direction
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3747	noffs:= (nx * ox + ny * oy);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3748
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	3749	if isBullet and (noffs.Round >= Longword(Gear^.Radius)) then
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3750	continue;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3751
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3752	// avoid gravity related loops of not really moving gear
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3753	if not (iscake or isbullet)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3754	and (Gear^.dY.isNegative)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3755	and (conPortal^.dY.isNegative)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3756	and ((iterator^.dX.QWordValue + iterator^.dY.QWordValue) < _0_08.QWordValue)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3757	and (iterator^.PortalCounter > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3758	continue;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3759
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3760	// calc gear speed along to the vector and the normal vector of the portal
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3761	if hasdxy then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3762	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3763	pspeed:= (Gear^.dX * iterator^.dX + Gear^.dY * iterator^.dY);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3764	nspeed:= (nx * iterator^.dX + ny * iterator^.dY);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3765	end
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3766	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3767	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3768	pspeed:= hwAbs(cGravity * oy);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3769	nspeed:= _0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3770	end;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3771
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3772	// creating normal vector of connected (exit) portal
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3773	nx := conPortal^.dY;
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3774	ny := conPortal^.dX;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3775	if conPortal^.Elasticity.isNegative then
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	3776	nx.isNegative := (not nx.isNegative)
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3777	else
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3778	ny.isNegative := not ny.isNegative;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3779
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3780	// inverse cake's normal movement direction,
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3781	// as if it just walked through a hole
5750 6bbf7aee2cdf Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place. nemo parents: 5748 diff changeset	3782	//if iscake then nspeed.isNegative:= not nspeed.isNegative;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3783
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3784	//AddFileLog('poffs:'+cstr(poffs)+' noffs:'+cstr(noffs)+' pspeed:'+cstr(pspeed)+' nspeed:'+cstr(nspeed));
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3785	iterator^.dX := -pspeed * conPortal^.dX + nspeed * nx;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3786	iterator^.dY := -pspeed * conPortal^.dY + nspeed * ny;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3787
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3788	// make the gear's exit position close to the portal while
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3789	// still respecting the movement direction
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3790
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3791	// determine the distance (in exit vector direction)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3792	// that we want the gear at
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3793	if iscake then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3794	ox:= (r - _0_7)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3795	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3796	ox:= (r * _1_5);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3797	s:= ox / poffs;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3798	poffs:= ox;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3799	if (nspeed.QWordValue <> 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3800	and (pspeed > _0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3801	noffs:= noffs * s * (nspeed / pspeed);
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3802
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3803	// move stuff with high normal offset closer to the portal's center
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3804	if not isbullet then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3805	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3806	s := hwAbs(noffs) + r - int2hwFloat(Gear^.Radius);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3807	if s > _0 then
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3808	noffs:= noffs - SignAs(s,noffs)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3809	end;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3810
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3811	iterator^.X := conPortal^.X + poffs * conPortal^.dX + noffs * nx;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3812	iterator^.Y := conPortal^.Y + poffs * conPortal^.dY + noffs * ny;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3813
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3814	if not hasdxy and (not (conPortal^.dY.isNegative)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3815	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3816	iterator^.dY:= iterator^.dY + hwAbs(cGravity * (iterator^.Y - conPortal^.Y))
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3817	end;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3818
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3819	// see if the space on the exit side actually is enough
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3820
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3821	if not (isBullet or isCake) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3822	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3823	// TestCollisionXwithXYShift requires a hwFloat for xShift
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3824	ox.QWordValue := _1.QWordValue;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3825	ox.isNegative := not iterator^.dX.isNegative;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3826
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3827	sx := hwSign(iterator^.dX);
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3828	sy := hwSign(iterator^.dY);
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3829
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3830	if iterator^.Radius > 1 then
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3831	iterator^.Radius := iterator^.Radius - 1;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3832
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3833	// check front
5750 6bbf7aee2cdf Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place. nemo parents: 5748 diff changeset	3834	isCollision := TestCollisionY(iterator, sy)
6bbf7aee2cdf Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place. nemo parents: 5748 diff changeset	3835	or TestCollisionX(iterator, sx);
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3836
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3837	if not isCollision then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3838	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3839	// check center area (with half the radius so that the
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3840	// the square check won't check more pixels than we want to)
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3841	iterator^.Radius := 1 + resetr div 2;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3842	rh := resetr div 4;
5750 6bbf7aee2cdf Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place. nemo parents: 5748 diff changeset	3843	isCollision := TestCollisionYwithXYShift(iterator, 0, -sy * rh, sy, false)
6bbf7aee2cdf Reenable a bunch of old portal play stuff, like dropping grenade into portal on hog, jumping through portal w/ hog on other end, collecting crate w/ portal etc. Also add cooldown to cake/portal interaction. It may still not do what you expect, but it probably shouldn't spin in place. nemo parents: 5748 diff changeset	3844	or TestCollisionXwithXYShift(iterator, ox * rh, 0, sx, false);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3845	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3846
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3847	iterator^.Radius := resetr;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3848
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3849	if isCollision then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3850	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3851	// collision! oh crap! go back!
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3852	iterator^.X := resetx;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3853	iterator^.Y := resety;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3854	iterator^.dX := resetdx;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3855	iterator^.dY := resetdy;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3856	continue;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3857	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3858	end;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3859
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3860	//
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3861	// You're now officially portaled!
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3862	//
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3863
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3864	// Until loops are reliably broken
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3865	if iscake then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3866	iterator^.PortalCounter:= 33
5940 c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3867	else
c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3868	begin
c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3869	inc(iterator^.PortalCounter);
7658 70a874a26414 adjust velocity when entering/exiting the 4x routine nemo parents: 7649 diff changeset	3870	iterator^.Active:= true;
7992 0b7dc27b2baf add gstMoving to avoid sticking nemo parents: 7874 diff changeset	3871	iterator^.State:= iterator^.State and (not gstHHHJump) or gstMoving;
5940 c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3872	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3873
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3874	// is it worth adding an arcsin table? Just how often would we end up doing something like this?
6787 8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3875	// SYNCED ANGLE UPDATE
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3876	if iterator^.Kind = gtRCPlane then
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3877	begin
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3878	// recycling as temp vars
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3879	resety.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3880	resety.QWordValue:= 4294967296 * 112;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3881	resetx.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3882	resetx.QWordValue:= 4294967296 * 35;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3883	resetdx.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3884	resetdx.QWordValue:= 4294967296 * 1152;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3885
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3886	resetdy:=hwAbs(iterator^.dX*4);
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3887	resetdy:= resetdy + hwPow(resetdy,3)/_6 + _3 * hwPow(resetdy,5) / _40 + _5 * hwPow(resetdy,7) / resety + resetx * hwPow(resetdy,9) / resetdx;
6786 f631b8350b53 oh yeah, dY... nemo parents: 6785 diff changeset	3888	iterator^.Angle:= hwRound(resetdy*_2048 / _PI);
7101 d8fb38141950 Ok. I think this should flip it correctly... nemo parents: 7098 diff changeset	3889	if not iterator^.dY.isNegative then iterator^.Angle:= 2048-iterator^.Angle;
d8fb38141950 Ok. I think this should flip it correctly... nemo parents: 7098 diff changeset	3890	if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
6787 8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3891	end
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3892	// VISUAL USE OF ANGLE ONLY
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3893	else if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtKamikaze) and (CurAmmoGear^.Hedgehog = iterator^.Hedgehog) then
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3894	begin
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3895	iterator^.Angle:= DxDy2AttackAngle(iterator^.dX, iterator^.dY);
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3896	iterator^.Angle:= 2048-iterator^.Angle;
6786 f631b8350b53 oh yeah, dY... nemo parents: 6785 diff changeset	3897	if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3898	end;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3899
6555 11f82e49d276 allow roping into a portal (still detaches rope) nemo parents: 6535 diff changeset	3900	if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3901	and (iterator = CurrentHedgehog^.Gear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3902	and (CurAmmoGear <> nil)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3903	and (CurAmmoGear^.Kind =gtRope) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3904	CurAmmoGear^.PortalCounter:= 1;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3905
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3906	if not isbullet and (iterator^.State and gstInvisible = 0)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3907	and (iterator^.Kind <> gtFlake) then
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3908	FollowGear := iterator;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3909
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3910	// store X/Y values of exit for net bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3911	if isbullet then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3912	begin
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3913	iterator^.Elasticity:= iterator^.X;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3914	iterator^.Friction := iterator^.Y;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3915	end;
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3916
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3917	if Gear^.Health > 1 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3918	dec(Gear^.Health);
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3919	end;
3342 b4f01613dcd7 Some initial stubs for portal just so Tiy will quit nagging. Also let folks know what approximation of physics I plan to try, here. nemo parents: 3320 diff changeset	3920	end;
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	3921
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3922
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3923
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3924	procedure loadNewPortalBall(oldPortal: PGear; destroyGear: Boolean);
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3925	var
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	3926	CurWeapon: PAmmo;
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	3927	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3928	if CurrentHedgehog <> nil then
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	3929	with CurrentHedgehog^ do
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3930	begin
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	3931	CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	3932	if (CurAmmoType = amPortalGun) then
833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	3933	begin
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3934	if not destroyGear then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3935	begin
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3936	// switch color of ball to opposite of oldPortal
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3937	if (oldPortal^.Tag and 2) = 0 then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3938	CurWeapon^.Pos:= 1
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3939	else
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3940	CurWeapon^.Pos:= 0;
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3941	end;
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3942
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3943	// make the ball visible
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3944	CurWeapon^.Timer := 0;
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	3945	end
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3946	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3947	if destroyGear then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3948	oldPortal^.Timer:= 0;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3949	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3950
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3951	procedure doStepMovingPortal_real(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3952	var
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3953	x, y, tx, ty: LongInt;
531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3954	s: hwFloat;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3955	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3956	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3957	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3958	tx := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3959	ty := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3960	// avoid compiler hints
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3961
7309 5bb4bd846c87 oops nemo parents: 7305 diff changeset	3962	if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] > 255) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3963	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	3964	Gear^.State := Gear^.State or gstCollision;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3965	Gear^.State := Gear^.State and (not gstMoving);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3966
7310 7f8d62b869bd More efficient nemo parents: 7309 diff changeset	3967	if (Land[y, x] and lfBouncy <> 0)
7426 55b49cc1f33a Changes for the benefit of pas2c. Use downto in for loops to avoid repeated calls of Random/GetRandom. Wrap nots. nemo parents: 7416 diff changeset	3968	or (not CalcSlopeTangent(Gear, x, y, tx, ty, 255))
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3969	or (DistanceI(tx,ty) < _12) then // reject shots at too irregular terrain
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3970	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3971	loadNewPortalBall(Gear, true);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3972	EXIT;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3973	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3974
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3975	// making a normalized normal vector
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3976	s := _1/DistanceI(tx,ty);
3562 c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3977	Gear^.dX := s * ty;
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3978	Gear^.dY := -s * tx;
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3979
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3980	Gear^.DirAngle := DxDy2Angle(-Gear^.dY,Gear^.dX);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3981	if not Gear^.dX.isNegative then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3982	Gear^.DirAngle := 180-Gear^.DirAngle;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3983
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3984	if ((Gear^.LinkedGear = nil)
71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3985	or (hwRound(Distance(Gear^.X - Gear^.LinkedGear^.X,Gear^.Y-Gear^.LinkedGear^.Y)) >=Gear^.Radius*2)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3986	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3987	loadNewPortalBall(Gear, false);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3988	inc(Gear^.Tag);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3989	Gear^.doStep := @doStepPortal;
3396 e5b3e5f2818e More portal changes. Allows for a multishoot utility. Hopefully not breaking anything. nemo parents: 3391 diff changeset	3990	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3991	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3992	loadNewPortalBall(Gear, true);
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	3993	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3994
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3995	else if (y > cWaterLine)
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	3996	or (y < -max(LAND_WIDTH,4096))
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	3997	or (x > 2*max(LAND_WIDTH,4096))
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	3998	or (x < -max(LAND_WIDTH,4096)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3999	loadNewPortalBall(Gear, true);
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	4000	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	4001
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4002	procedure doStepMovingPortal(Gear: PGear);
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4003	begin
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4004	doPortalColorSwitch();
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4005	doStepPerPixel(Gear, @doStepMovingPortal_real, true);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4006	if (Gear^.Timer < 1)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4007	or (Gear^.Hedgehog^.Team <> CurrentHedgehog^.Team) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4008	deleteGear(Gear);
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4009	end;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4010
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	4011	procedure doStepPortalShot(newPortal: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4012	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4013	iterator: PGear;
3560 3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4014	s: hwFloat;
3836 833c0f32e326 Change all use of curslot/idx to CurAmmoType to try and avoid some bugs with use of last weapon. nemo parents: 3821 diff changeset	4015	CurWeapon: PAmmo;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	4016	begin
3560 3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4017	s:= Distance (newPortal^.dX, newPortal^.dY);
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4018
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4019	// Adds the hog speed (only that part in/directly against shot direction)
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4020	// to the shot speed (which we triple previously btw)
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4021	// (This is done my projecting the hog movement vector onto the shot movement vector and then adding the resulting length
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4022	// to the scaler)
3562 c601630a12d5 portal: sheepluva parents: 3560 diff changeset	4023	s := (_2 * s + (newPortal^.dX * CurrentHedgehog^.Gear^.dX + newPortal^.dY * CurrentHedgehog^.Gear^.dY ) / s) / s;
3560 3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4024	newPortal^.dX := newPortal^.dX * s;
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4025	newPortal^.dY := newPortal^.dY * s;
3e51dad04026 portal: make shot 2 times faster, add hog movement speed to shot speed (only the part in shot direction, so that aiming is not messed up) sheepluva parents: 3552 diff changeset	4026
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4027	newPortal^.LinkedGear := nil;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4028
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4029	if CurrentHedgehog <> nil then
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	4030	with CurrentHedgehog^ do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4031	begin
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	4032	CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4033	// let's save the HH's dX's direction so we can decide where the "top" of the portal hole
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4034	newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4035	// when doing a backjump the dx is the opposite of the facing direction
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4036	if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4037	newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4038
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4039	// make portal gun look unloaded
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	4040	if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	4041	CurWeapon^.Timer := CurWeapon^.Timer or 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4042
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4043	iterator := GearsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4044	while iterator <> nil do
7581 ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4045	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4046	if (iterator^.Kind = gtPortal) then
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4047	if (iterator <> newPortal) and (iterator^.Timer > 0) and (iterator^.Hedgehog = CurrentHedgehog) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4048	begin
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4049	if ((iterator^.Tag and 2) = (newPortal^.Tag and 2)) then
faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4050	begin
3468 c7b80bdbc384 * make portals delete each other only indirectly (by setting timer to 0) sheepluva parents: 3462 diff changeset	4051	iterator^.Timer:= 0;
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4052	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4053	else
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4054	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4055	// link portals with each other
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4056	newPortal^.LinkedGear := iterator;
71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4057	iterator^.LinkedGear := newPortal;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4058	iterator^.Health := newPortal^.Health;
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4059	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4060	end;
3480 c4c3f3512404 Prevent all portal loops the guaranteed way, at least until sheepluva's tests yield something reliable. nemo parents: 3476 diff changeset	4061	iterator^.PortalCounter:= 0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4062	iterator := iterator^.NextGear
7581 ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4063	end;
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4064
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4065	if newPortal^.LinkedGear <> nil then
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4066	begin
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4067	// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4068	iterator:= GearsList;
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4069	while iterator <> nil do
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4070	begin
7784 cf6261f7fdb5 Disable jiggling of cleavers 'cause it just looks odd. Adding a constraint based on proximity to portal is an option too, this was just easier. nemo parents: 7777 diff changeset	4071	if not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife]) and ((iterator^.Hedgehog <> CurrentHedgehog)
7581 ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4072	or ((iterator^.Message and gmAllStoppable) = 0)) then
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4073	begin
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4074	iterator^.Active:= true;
7992 0b7dc27b2baf add gstMoving to avoid sticking nemo parents: 7874 diff changeset	4075	if iterator^.dY.QWordValue = 0 then
7581 ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4076	iterator^.dY.isNegative:= false;
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4077	iterator^.State:= iterator^.State or gstMoving;
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4078	DeleteCI(iterator);
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4079	//inc(iterator^.dY.QWordValue,10);
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4080	end;
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4081	iterator:= iterator^.NextGear
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4082	end
ea509b70e03d move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case nemo parents: 7564 diff changeset	4083	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4084	end;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4085	newPortal^.State := newPortal^.State and (not gstCollision);
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4086	newPortal^.State := newPortal^.State or gstMoving;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4087	newPortal^.doStep := @doStepMovingPortal;
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	4088	end;
ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	4089
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4090	////////////////////////////////////////////////////////////////////////////////
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	4091	procedure doStepPiano(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4092	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4093	r0, r1: LongInt;
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4094	odY: hwFloat;
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	4095	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4096	AllInactive := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4097	if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4098	((CurrentHedgehog^.Gear^.Message and gmSlot) <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4099	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4100	case CurrentHedgehog^.Gear^.MsgParam of
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4101	0: PlaySound(sndPiano0);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4102	1: PlaySound(sndPiano1);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4103	2: PlaySound(sndPiano2);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4104	3: PlaySound(sndPiano3);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4105	4: PlaySound(sndPiano4);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4106	5: PlaySound(sndPiano5);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4107	6: PlaySound(sndPiano6);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4108	7: PlaySound(sndPiano7);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4109	else PlaySound(sndPiano8);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4110	end;
3704 ed2b9c7fb260 Engine: smaxx parents: 3682 diff changeset	4111	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4112	CurrentHedgehog^.Gear^.MsgParam := 0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4113	CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSlot);
6304 3036c242b19d Set CurrentAmmoGear on piano (should fix notes again). Also disable focus on current hog if unplaced. nemo parents: 6278 diff changeset	4114	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4115
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4116	if (((Gear^.Pos = 3) and ((GameFlags and gfSolidLand) <> 0)) or) (Gear^.Pos = 5) then
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4117	begin
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4118	Gear^.dY := Gear^.dY + cGravity * 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4119	Gear^.Y := Gear^.Y + Gear^.dY;
6803 0e70f3ea3bf8 bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff. nemo parents: 6792 diff changeset	4120	if CheckGearDrowning(Gear) then
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4121	begin
6803 0e70f3ea3bf8 bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff. nemo parents: 6792 diff changeset	4122	Gear^.Y:= Gear^.Y + _50;
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4123	OnUsedAmmo(CurrentHedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4124	if CurrentHedgehog^.Gear <> nil then
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4125	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4126	// Drown the hedgehog. Could also just delete it, but hey, this gets a caption
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4127	CurrentHedgehog^.Gear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4128	CurrentHedgehog^.Gear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4129	CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128;
3954 ae3583ad6ea9 Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too. nemo parents: 3953 diff changeset	4130	CurrentHedgehog^.Unplaced := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4131	if TagTurnTimeLeft = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4132	TagTurnTimeLeft:= TurnTimeLeft;
3954 ae3583ad6ea9 Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too. nemo parents: 3953 diff changeset	4133	TurnTimeLeft:= 0
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4134	end;
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4135	ResumeMusic
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4136	end;
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4137	exit
3351 3fd3f116f2fc Engine: smxx parents: 3350 diff changeset	4138	end;
3fd3f116f2fc Engine: smxx parents: 3350 diff changeset	4139
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4140	odY:= Gear^.dY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4141	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4142
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4143	if (Gear^.State and gstDrowning) <> 0 then
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4144	begin
6803 0e70f3ea3bf8 bit of an experiment in variable splash sizes based on object/speed. not sure if it looks good yet. need to drown more stuff. nemo parents: 6792 diff changeset	4145	Gear^.Y:= Gear^.Y + _50;
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4146	OnUsedAmmo(CurrentHedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4147	if CurrentHedgehog^.Gear <> nil then
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4148	begin
3419 b66a1b597f88 Add drown-the-playing-hog check for case of piano falling off the landscape. nemo parents: 3417 diff changeset	4149	// Drown the hedgehog. Could also just delete it, but hey, this gets a caption
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4150	CurrentHedgehog^.Gear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4151	CurrentHedgehog^.Gear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4152	CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128;
3954 ae3583ad6ea9 Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too. nemo parents: 3953 diff changeset	4153	CurrentHedgehog^.Unplaced := false;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4154	if TagTurnTimeLeft = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4155	TagTurnTimeLeft:= TurnTimeLeft;
3954 ae3583ad6ea9 Hopefully fix the last of the more obvious weapon bugs w/ infinite attack mode, add a depixeling sweep every 5s too. nemo parents: 3953 diff changeset	4156	TurnTimeLeft:= 0
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4157	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4158	ResumeMusic
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4159	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4160	else if (Gear^.State and gstCollision) <> 0 then
3399 885304636abf Drown the hog using the piano nemo parents: 3398 diff changeset	4161	begin
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4162	r0 := GetRandom(21);
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4163	r1 := GetRandom(21);
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4164	doMakeExplosion(hwRound(Gear^.X) - 30 - r0, hwRound(Gear^.Y) + 40, 40 + r1, Gear^.Hedgehog, 0);
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4165	doMakeExplosion(hwRound(Gear^.X) + 30 + r1, hwRound(Gear^.Y) + 40, 40 + r0, Gear^.Hedgehog, 0);
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4166	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 80 + r0, Gear^.Hedgehog, EXPLAutoSound);
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4167	for r0:= 0 to 4 do
5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4168	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	4169	Gear^.dY := cGravity * 2 - odY;
6305 5f7480c2a08d Set default water colours in greyscale mode in case the theme does not define them, decrement piano weapon on use nemo parents: 6304 diff changeset	4170	Gear^.Pos := Gear^.Pos + 1;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4171	end
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4172	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4173	Gear^.dY := Gear^.dY + cGravity * 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4174	// let it fall faster so itdoesn't take too long for the whole attack
3382 633046fa040c Gas grenade: mbait parents: 3378 diff changeset	4175	end;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4176
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4177
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4178	////////////////////////////////////////////////////////////////////////////////
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4179	procedure doStepSineGunShotWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4180	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4181	x, y, rX, rY, t, tmp, initHealth: LongInt;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4182	oX, oY, ldX, ldY, sdX, sdY, sine, lx, ly, amp: hwFloat;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4183	justCollided: boolean;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4184	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4185	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4186	initHealth := Gear^.Health;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4187	lX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4188	lY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4189	ldX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4190	ldY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4191	sdy := _0_5/Distance(Gear^.dX,Gear^.dY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4192	ldX := ldX * sdy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4193	ldY := ldY * sdy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4194	sdY := hwAbs(ldX) + hwAbs(ldY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4195	sdX := _1 - hwAbs(ldX/sdY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4196	sdY := _1 - hwAbs(ldY/sdY);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4197	if (ldX.isNegative = ldY.isNegative) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4198	sdY := -sdY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4199
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4200	// initial angle depends on current GameTicks
7745 0326e1bf674d Better use random number here unc0rr parents: 7739 diff changeset	4201	t := getRandom(4096);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4202
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4203
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4204	// used for a work-around detection of area that is within land array, but outside borders
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4205	justCollided := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4206
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4207	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4208	lX := lX + ldX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4209	lY := lY + ldY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4210	oX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4211	oY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4212	rX := hwRound(oX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4213	rY := hwRound(oY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4214	tmp := t mod 4096;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4215	amp := _128 * (_1 - hwSqr(int2hwFloat(Gear^.Health)/initHealth));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4216	sine := amp * AngleSin(tmp mod 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4217	sine.isNegative := (tmp < 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4218	inc(t,Gear^.Health div 313);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4219	Gear^.X := lX + (sine * sdX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4220	Gear^.Y := ly + (sine * sdY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4221	Gear^.dX := Gear^.X - oX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4222	Gear^.dY := Gear^.Y - oY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4223
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4224	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4225	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4226
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4227	// if borders are on, stop outside land array
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4228	if hasBorder and (((x and LAND_WIDTH_MASK) <> 0) or ((y and LAND_HEIGHT_MASK) <> 0)) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4229	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4230	Gear^.Damage := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4231	Gear^.Health := 0;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4232	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4233	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4234	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4235	if (rY <= cWaterLine) or (y <= cWaterLine) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4236	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4237	if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4238	and (Land[y, x] <> 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4239	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4240	if justCollided then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4241	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4242	Gear^.Damage := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4243	Gear^.Health := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4244	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4245	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4246	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4247	inc(Gear^.Damage,3);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4248	justCollided := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4249	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4250	end
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4251	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4252	justCollided := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4253
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4254	// kick nearby hogs, dig tunnel and add some fire
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4255	// if at least 5 collisions occured
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4256	if Gear^.Damage > 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4257	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4258	DrawExplosion(rX,rY,Gear^.Radius);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4259
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4260	// kick nearby hogs
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4261	AmmoShove(Gear, 35, 50);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4262
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4263	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4264	Gear^.Damage := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4265
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4266	// add some fire to the tunnel
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4267	if getRandom(6) = 0 then
7391 588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4268	begin
588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4269	tmp:= GetRandom(2 * Gear^.Radius);
588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4270	AddGear(x - Gear^.Radius + tmp, y - GetRandom(Gear^.Radius + 1), gtFlame, gsttmpFlag, _0, _0, 0)
588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4271	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4272	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4273
7391 588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4274	if random(100) = 0 then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4275	AddVisualGear(x, y, vgtSmokeTrace);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4276	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4277	else dec(Gear^.Health, 5); // if underwater get additional damage
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4278	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4279
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4280	dec(Gear^.Health);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4281
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4282	// decrease bullet size towards the end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4283	if (Gear^.Radius > 4) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4284	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4285	if (Gear^.Health <= (initHealth div 3)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4286	dec(Gear^.Radius)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4287	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4288	else if (Gear^.Radius > 3) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4289	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4290	if (Gear^.Health <= (initHealth div 4)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4291	dec(Gear^.Radius)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4292	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4293	else if (Gear^.Radius > 2) then begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4294	if (Gear^.Health <= (initHealth div 5)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4295	dec(Gear^.Radius)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4296	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4297	else if (Gear^.Radius > 1) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4298	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4299	if (Gear^.Health <= (initHealth div 6)) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4300	dec(Gear^.Radius)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4301	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4302
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4303	until (Gear^.Health <= 0);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4304
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4305	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4306	AfterAttack;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4307	end;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4308
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4309	procedure doStepSineGunShot(Gear: PGear);
7745 0326e1bf674d Better use random number here unc0rr parents: 7739 diff changeset	4310	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4311	HHGear: PGear;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4312	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4313	PlaySound(sndSineGun);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4314
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4315	// push the shooting Hedgehog back
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4316	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4317	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4318	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4319	HHGear^.dX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4320	HHGear^.dY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4321	AmmoShove(Gear, 0, 80);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4322	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4323	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4324
4034 634a8c8682de add some phone rumbling to big explosions, airbomb and sinegun koda parents: 4026 diff changeset	4325	Gear^.doStep := @doStepSineGunShotWork;
8204 9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4326	with mobileRecord do
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4327	if (performRumble <> nil) and (not fastUntilLag) then
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4328	performRumble(kSystemSoundID_Vibrate);
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4329	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4330
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4331	////////////////////////////////////////////////////////////////////////////////
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4332	procedure doStepFlamethrowerWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4333	var
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4334	HHGear, flame: PGear;
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4335	rx, ry, speed: hwFloat;
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4336	i, gX, gY: LongInt;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4337	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4338	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4339	HHGear := Gear^.Hedgehog^.Gear;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4340	HedgehogChAngle(HHGear);
3484 3c65b1d979cd Engine: smxx parents: 3483 diff changeset	4341	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
3c65b1d979cd Engine: smxx parents: 3483 diff changeset	4342	gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4343
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4344	if (GameTicks and $FF) = 0 then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4345	begin
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	4346	if (HHGear^.Message and gmRight) <> 0 then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4347	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4348	if HHGear^.dX.isNegative and (Gear^.Tag < 20) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4349	inc(Gear^.Tag)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4350	else if Gear^.Tag > 5 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4351	dec(Gear^.Tag);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4352	end
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	4353	else if (HHGear^.Message and gmLeft) <> 0 then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4354	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4355	if HHGear^.dX.isNegative and (Gear^.Tag > 5) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4356	dec(Gear^.Tag)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4357	else if Gear^.Tag < 20 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4358	inc(Gear^.Tag);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4359	end
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4360	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4361
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4362	dec(Gear^.Timer);
ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4363	if Gear^.Timer = 0 then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4364	begin
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4365	dec(Gear^.Health);
5417 c56a6be662bf try to tweak flamethrower a bit to do more damage with fire changes. An optimal firepit test dealt 68. nemo parents: 5415 diff changeset	4366	if (Gear^.Health mod 5) = 0 then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4367	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4368	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4369	ry := rndSign(getRandomf * _0_1);
5417 c56a6be662bf try to tweak flamethrower a bit to do more damage with fire changes. An optimal firepit test dealt 68. nemo parents: 5415 diff changeset	4370	speed := _0_5 * (_10 / Gear^.Tag);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4371
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4372	flame:= AddGear(gx, gy, gtFlame, gstTmpFlag,
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	4373	SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	4374	AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	4375	flame^.CollisionMask:= lfNotCurrentMask;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4376
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4377	if (Gear^.Health mod 30) = 0 then
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4378	begin
c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4379	flame:= AddGear(gx, gy, gtFlame, 0,
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	4380	SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	4381	AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	4382	flame^.CollisionMask:= lfNotCurrentMask;
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4383	end
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4384	end;
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4385	Gear^.Timer:= Gear^.Tag
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4386	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4387
7539 c6ffbc6530e3 Check if hedgehog is still active instead unc0rr parents: 7477 diff changeset	4388	if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) then
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4389	begin
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4390	DeleteGear(Gear);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4391	AfterAttack
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4392	end
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4393	else
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4394	begin
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4395	i:= Gear^.Health div 5;
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4396	if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4397	begin
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4398	Gear^.Damage:= i;
6380 1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check. nemo parents: 6368 diff changeset	4399	FreeTexture(Gear^.Tex);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4400	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) +
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4401	'%', cWhiteColor, fntSmall)
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4402	end
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4403	end
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4404	end;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4405
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4406	procedure doStepFlamethrower(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4407	var
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4408	HHGear: PGear;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4409	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4410	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4411	HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight));
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4412	HHGear^.State := HHGear^.State or gstNotKickable;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4413	Gear^.doStep := @doStepFlamethrowerWork
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4414	end;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4415
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4416	////////////////////////////////////////////////////////////////////////////////
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4417	procedure doStepLandGunWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4418	var
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4419	HHGear, land: PGear;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4420	rx, ry, speed: hwFloat;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4421	i, gX, gY: LongInt;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4422	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4423	AllInactive := false;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4424	HHGear := Gear^.Hedgehog^.Gear;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4425	HedgehogChAngle(HHGear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4426	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4427	gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4428
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4429	if (GameTicks and $FF) = 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4430	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4431	if (HHGear^.Message and gmRight) <> 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4432	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4433	if HHGear^.dX.isNegative and (Gear^.Tag < 20) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4434	inc(Gear^.Tag)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4435	else if Gear^.Tag > 5 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4436	dec(Gear^.Tag);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4437	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4438	else if (HHGear^.Message and gmLeft) <> 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4439	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4440	if HHGear^.dX.isNegative and (Gear^.Tag > 5) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4441	dec(Gear^.Tag)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4442	else if Gear^.Tag < 20 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4443	inc(Gear^.Tag);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4444	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4445	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4446
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4447	dec(Gear^.Timer);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4448	if Gear^.Timer = 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4449	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4450	dec(Gear^.Health);
5480 37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4451
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4452	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4453	ry := rndSign(getRandomf * _0_1);
5480 37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4454	speed := (_3 / Gear^.Tag);
37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4455
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4456	land:= AddGear(gx, gy, gtFlake, gstTmpFlag,
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4457	SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
6126 61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	4458	AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	4459	land^.CollisionMask:= lfNotCurrentMask;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4460
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4461	Gear^.Timer:= Gear^.Tag
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4462	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4463
7539 c6ffbc6530e3 Check if hedgehog is still active instead unc0rr parents: 7477 diff changeset	4464	if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) or ((HHGear^.Message and gmAttack) <> 0) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4465	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4466	HHGear^.Message:= HHGear^.Message and (not gmAttack);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4467	DeleteGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4468	AfterAttack
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4469	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4470	else
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4471	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4472	i:= Gear^.Health div 10;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4473	if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4474	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4475	Gear^.Damage:= i;
6380 1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check. nemo parents: 6368 diff changeset	4476	FreeTexture(Gear^.Tex);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4477	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) +
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4478	'%', cWhiteColor, fntSmall)
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4479	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4480	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4481	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4482
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4483	procedure doStepLandGun(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4484	var
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4485	HHGear: PGear;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4486	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4487	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4488	HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight or gmAttack));
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4489	HHGear^.State := HHGear^.State or gstNotKickable;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4490	Gear^.doStep := @doStepLandGunWork
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4491	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4492
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4493	////////////////////////////////////////////////////////////////////////////////
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4494	procedure doStepPoisonCloud(Gear: PGear);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4495	begin
de2026031833 Engine: smaxx parents: 3710 diff changeset	4496	if Gear^.Timer = 0 then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4497	begin
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4498	DeleteGear(Gear);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4499	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4500	end;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4501	dec(Gear^.Timer);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4502	Gear^.X:= Gear^.X + Gear^.dX;
de2026031833 Engine: smaxx parents: 3710 diff changeset	4503	Gear^.Y:= Gear^.Y + Gear^.dY;
3713 f8778904600d Engine: smaxx parents: 3712 diff changeset	4504	Gear^.dX := Gear^.dX + cWindSpeed / 4;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4505	Gear^.dY := Gear^.dY + cGravity / 100;
5340 6963e37f2dd2 - Allow snow to drop a bit outside the map, where it already is allowed to spawn unc0rr parents: 5336 diff changeset	4506	if (GameTicks and $FF) = 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4507	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLDontDraw or EXPLNoGfx or EXPLNoDamage or EXPLDoNotTouchAny or EXPLPoisoned);
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4508	AllInactive:= false;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4509	end;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4510
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4511	////////////////////////////////////////////////////////////////////////////////
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4512	procedure doStepHammer(Gear: PGear);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4513	var HHGear, tmp, tmp2: PGear;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4514	t: PGearArray;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4515	i: LongInt;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4516	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4517	HHGear:= Gear^.Hedgehog^.Gear;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4518	HHGear^.State:= HHGear^.State or gstNoDamage;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4519	DeleteCI(HHGear);
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4520
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4521	t:= CheckGearsCollision(Gear);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4522
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4523	for i:= 5 downto 0 do
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4524	AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4525
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4526	i:= t^.Count;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4527	while i > 0 do
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4528	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4529	dec(i);
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4530	tmp:= t^.ar[i];
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4531	if (tmp^.State and gstNoDamage) = 0 then
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4532	if (tmp^.Kind = gtHedgehog) or (tmp^.Kind = gtMine) or (tmp^.Kind = gtExplosives) then
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4533	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4534	//tmp^.State:= tmp^.State or gstFlatened;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4535	if not tmp^.Invulnerable then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4536	ApplyDamage(tmp, CurrentHedgehog, tmp^.Health div 3, dsUnknown);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4537	//DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4538	tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0);
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4539	tmp2^.LinkedGear:= tmp;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4540	SetAllToActive
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4541	end
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4542	else
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4543	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4544	end
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4545	end;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4546
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4547	HHGear^.State:= HHGear^.State and (not gstNoDamage);
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4548	Gear^.Timer:= 250;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4549	Gear^.doStep:= @doStepIdle
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4550	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4551
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4552	procedure doStepHammerHitWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4553	var
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4554	i, j, ei: LongInt;
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4555	HitGear: PGear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4556	begin
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4557	AllInactive := false;
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4558	HitGear := Gear^.LinkedGear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4559	dec(Gear^.Timer);
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4560	if (HitGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4561	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4562	DeleteGear(Gear);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4563	exit
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4564	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4565
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4566	if (Gear^.Timer mod 5) = 0 then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4567	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4568	AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4569
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4570	i := hwRound(Gear^.X) - HitGear^.Radius + 2;
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4571	ei := hwRound(Gear^.X) + HitGear^.Radius - 2;
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4572	for j := 1 to 4 do DrawExplosion(i - GetRandom(5), hwRound(Gear^.Y) + 6*j, 3);
6011 519f8a58c021 Fix a bunch of warnings (also improves speed a bit in 32 bit code) unC0Rr parents: 6002 diff changeset	4573	for j := 1 to 4 do DrawExplosion(ei + LongInt(GetRandom(5)), hwRound(Gear^.Y) + 6*j, 3);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4574	while i <= ei do
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4575	begin
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4576	for j := 1 to 11 do DrawExplosion(i, hwRound(Gear^.Y) + 3*j, 3);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4577	inc(i, 1)
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4578	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4579
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4580	if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9)
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4581	, lfIndestructible) then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4582	begin
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4583	//Gear^.X := Gear^.X + Gear^.dX;
5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4584	Gear^.Y := Gear^.Y + _1_9
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4585	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4586	end;
6081 537bbd5c1a62 Basic test implementation of an ice flag. Allows for slick parts of terrain. Intended for ice gun, or "ice" mask on portions of land objects. nemo parents: 6011 diff changeset	4587	if TestCollisionYwithGear(Gear, 1) <> 0 then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4588	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4589	Gear^.dY := _0;
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4590	SetLittle(HitGear^.dX);
b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4591	HitGear^.dY := _0;
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4592	end
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4593	else
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4594	begin
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4595	//Gear^.dY := Gear^.dY + cGravity;
5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4596	//Gear^.Y := Gear^.Y + Gear^.dY;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4597	if hwRound(Gear^.Y) > cWaterLine then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4598	Gear^.Timer := 1
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4599	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4600
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4601	//Gear^.X := Gear^.X + HitGear^.dX;
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4602	HitGear^.X := Gear^.X;
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4603	HitGear^.Y := Gear^.Y;
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4604	SetLittle(HitGear^.dY);
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4605	HitGear^.Active:= true;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4606	end;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4607
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4608	procedure doStepHammerHit(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4609	var
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4610	i, y: LongInt;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4611	ar: TRangeArray;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4612	HHGear: PGear;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4613	begin
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4614	i := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4615	HHGear := Gear^.Hedgehog^.Gear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4616
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4617	y := hwRound(Gear^.Y) - cHHRadius * 2;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4618	while y < hwRound(Gear^.Y) do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4619	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4620	ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4621	ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4622	inc(y, 2);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4623	inc(i)
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4624	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4625
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4626	DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4627	Gear^.dY := HHGear^.dY;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4628	DeleteCI(HHGear);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4629
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4630	doStepHammerHitWork(Gear);
3821 03b1af3a1c8f Engine: smaxx parents: 3802 diff changeset	4631	Gear^.doStep := @doStepHammerHitWork
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4632	end;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4633
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	4634	////////////////////////////////////////////////////////////////////////////////
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4635	procedure doStepResurrectorWork(Gear: PGear);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4636	var
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4637	graves: PGearArrayS;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4638	resgear: PGear;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4639	hh: PHedgehog;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4640	i: LongInt;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4641	begin
4184 bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4642	if (TurnTimeLeft > 0) then
bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4643	dec(TurnTimeLeft);
bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4644
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4645	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4646	hh := Gear^.Hedgehog;
4387 3698361802ed no way unc0rr parents: 4372 diff changeset	4647
3698361802ed no way unc0rr parents: 4372 diff changeset	4648	// no, you can't do that here
3698361802ed no way unc0rr parents: 4372 diff changeset	4649	{DrawCentered(hwRound(hh^.Gear^.X) + WorldDx, hwRound(hh^.Gear^.Y) + WorldDy -
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4650	cHHRadius - 14 - hh^.HealthTagTex^.h, hh^.HealthTagTex);
4387 3698361802ed no way unc0rr parents: 4372 diff changeset	4651	}
4018 7f2c71638466 burp can always remove this if he doesn't like it. just making it a bit more interesting. nemo parents: 4017 diff changeset	4652	(*DrawCircle(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Radius, 1.5, 0, 0, $FF,
7f2c71638466 burp can always remove this if he doesn't like it. just making it a bit more interesting. nemo parents: 4017 diff changeset	4653	$FF);*)
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4654
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4655	if ((Gear^.Message and gmUp) <> 0) then
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4656	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4657	if (GameTicks and $F) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4658	exit;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4659	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4660	else if (GameTicks and $1FF) <> 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4661	exit;
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4662
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4663	if Gear^.Power < 45 then
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4664	begin
4023 8de77872ef21 Resurrector: Levitate hog + show cross Tobias Neumann <mail@tobias-neumann.eu> parents: 4021 diff changeset	4665	inc(Gear^.Power);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4666	if TestCollisionYwithGear(hh^.Gear, -1) = 0 then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4667	hh^.Gear^.Y := hh^.Gear^.Y - _1;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4668	end;
de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4669
4184 bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4670	graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
4024 1ffb84b3823d Resurrector: respect modified Gear position for resurrection range circle Tobias Neumann <mail@tobias-neumann.eu> parents: 4023 diff changeset	4671
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4672	if graves.size = 0 then
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4673	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4674	StopSoundChan(Gear^.SoundChannel);
3975 3f605cca9215 Resurrector weapon: do not make it end turn, add description, Tobias Neumann <mail@tobias-neumann.eu> parents: 3971 diff changeset	4675	Gear^.Timer := 250;
3f605cca9215 Resurrector weapon: do not make it end turn, add description, Tobias Neumann <mail@tobias-neumann.eu> parents: 3971 diff changeset	4676	Gear^.doStep := @doStepIdle;
3f605cca9215 Resurrector weapon: do not make it end turn, add description, Tobias Neumann <mail@tobias-neumann.eu> parents: 3971 diff changeset	4677	exit;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4678	end;
de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4679
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4680	if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4681	begin
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	4682	if LongInt(graves.size) <= Gear^.Tag then Gear^.Tag:= 0;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4683	dec(hh^.Gear^.Health);
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4684	if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then
048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4685	hh^.Gear^.Damage:= 1;
048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4686	RenderHealth(hh^);
7399 e7ce559d8c94 Update team health nemo parents: 7396 diff changeset	4687	RecountTeamHealth(hh^.Team);
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4688	inc(graves.ar^[Gear^.Tag]^.Health);
4253 160f987a5d9f improve behaviour of resurrection. pull in 4254 and 4259 which replace random with index nemo parents: 4251 diff changeset	4689	inc(Gear^.Tag)
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4690	{-for i:= 0 to High(graves) do begin
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4691	if hh^.Gear^.Health > 0 then begin
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4692	dec(hh^.Gear^.Health);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4693	inc(graves[i]^.Health);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4694	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4695	end; -}
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4696	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4697	else
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4698	begin
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4699	// now really resurrect the hogs with the hp saved in the graves
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4700	for i:= 0 to graves.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4701	if graves.ar^[i]^.Health > 0 then
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4702	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4703	resgear := AddGear(hwRound(graves.ar^[i]^.X), hwRound(graves.ar^[i]^.Y), gtHedgehog, gstWait, _0, _0, 0);
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4704	resgear^.Hedgehog := graves.ar^[i]^.Hedgehog;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4705	resgear^.Health := graves.ar^[i]^.Health;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4706	PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := resgear;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	4707	graves.ar^[i]^.Message:= graves.ar^[i]^.Message or gmDestroy;
7399 e7ce559d8c94 Update team health nemo parents: 7396 diff changeset	4708	graves.ar^[i]^.Active:= true;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4709	RenderHealth(resgear^.Hedgehog^);
3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4710	RecountTeamHealth(resgear^.Hedgehog^.Team);
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: 7007 diff changeset	4711	resgear^.Hedgehog^.Effects[heResurrected]:= 1;
4874 f508adb769b8 procedure for loading hats sheepluva parents: 4867 diff changeset	4712	// only make hat-less hedgehogs look like zombies, preserve existing hats
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	4713
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4714	if resgear^.Hedgehog^.Hat = 'NoHat' then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	4715	LoadHedgehogHat(resgear^.Hedgehog^, 'Reserved/Zombie');
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4716	end;
de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4717
4045 e3a2a39a8277 Cancel out dX/dY to handle the invulnerability case nemo parents: 4044 diff changeset	4718	hh^.Gear^.dY := _0;
e3a2a39a8277 Cancel out dX/dY to handle the invulnerability case nemo parents: 4044 diff changeset	4719	hh^.Gear^.dX := _0;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4720	doStepHedgehogMoving(hh^.Gear);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4721	StopSoundChan(Gear^.SoundChannel);
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4722	Gear^.Timer := 250;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4723	Gear^.doStep := @doStepIdle;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4724	end
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4725	//if hh^.Gear^.Health = 0 then doStepHedgehogFree(hh^.Gear);
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4726	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4727
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4728	procedure doStepResurrector(Gear: PGear);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4729	var
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4730	graves: PGearArrayS;
8730 b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4731	hh: PHedgehog;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4732	i: LongInt;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4733	begin
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4734	AllInactive := false;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4735	graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4736
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4737	if graves.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4738	begin
8730 b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4739	hh := Gear^.Hedgehog;
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4740	for i:= 0 to graves.size - 1 do
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4741	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4742	PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := nil;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4743	graves.ar^[i]^.Health := 0;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4744	end;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4745	Gear^.doStep := @doStepResurrectorWork;
8730 b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4746	if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4747	begin
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4748	if LongInt(graves.size) <= Gear^.Tag then Gear^.Tag:= 0;
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4749	dec(hh^.Gear^.Health);
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4750	if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4751	hh^.Gear^.Damage:= 1;
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4752	RenderHealth(hh^);
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4753	RecountTeamHealth(hh^.Team);
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4754	inc(graves.ar^[Gear^.Tag]^.Health);
b39f433f8ab4 at vatten's request. make resurrection always resurrect at least 1 hp out of kindness to noobs who can't be bothered to read tooltips nemo parents: 8727 diff changeset	4755	inc(Gear^.Tag)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4756	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4757	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4758	else
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4759	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4760	StopSoundChan(Gear^.SoundChannel);
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4761	Gear^.Timer := 250;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4762	Gear^.doStep := @doStepIdle;
4044 de7170e51cc6 Check for collision with surfaces above when levitating hog, use more typical drawing syntax for the resurrector wep, restore typical indentation nemo parents: 4038 diff changeset	4763	end
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4764	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4765
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	4766	////////////////////////////////////////////////////////////////////////////////
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4767	procedure doStepNapalmBomb(Gear: PGear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4768	var
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4769	i, gX, gY: LongInt;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4770	dX, dY: hwFloat;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4771	begin
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4772	AllInactive := false;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4773	doStepFallingGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4774	if (Gear^.Timer > 0) and ((Gear^.State and gstCollision) <> 0) then
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4775	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4776	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLAutoSound);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4777	gX := hwRound(Gear^.X);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4778	gY := hwRound(Gear^.Y);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4779	for i:= 0 to 10 do
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4780	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4781	dX := AngleCos(i * 2) * ((_0_1(i div 5))) (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4782	dY := AngleSin(i * 8) * _0_5 * (GetRandomf + _1);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4783	AddGear(gX, gY, gtFlame, 0, dX, dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4784	AddGear(gX, gY, gtFlame, 0, dX, -dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4785	AddGear(gX, gY, gtFlame, 0, -dX, dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4786	AddGear(gX, gY, gtFlame, 0, -dX, -dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4787	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4788	DeleteGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4789	exit
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4790	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4791	if (Gear^.Timer = 0) then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4792	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4793	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLAutoSound);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4794	for i:= -19 to 19 do
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4795	FollowGear := AddGear(hwRound(Gear^.X) + i div 3, hwRound(Gear^.Y), gtFlame, 0, _0_001 * i, _0, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4796	DeleteGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4797	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4798	end;
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4799	if (GameTicks and $3F) = 0 then
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4800	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4801	dec(Gear^.Timer)
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4802	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4803
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4804	////////////////////////////////////////////////////////////////////////////////
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4805	procedure doStepStructure(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4806	var
6491 736479f3d348 Some cleanup here and there unc0rr parents: 6490 diff changeset	4807	x, y: LongInt;
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4808	HH: PHedgehog;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4809	t: PGear;
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4810	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4811	HH:= Gear^.Hedgehog;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4812
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4813	if (Gear^.State and gstMoving) <> 0 then
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4814	begin
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4815	AddGearCI(Gear);
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4816	Gear^.dX:= _0;
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4817	Gear^.dY:= _0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4818	Gear^.State:= Gear^.State and (not gstMoving);
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4819	end;
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4820
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4821	dec(Gear^.Health, Gear^.Damage);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4822	Gear^.Damage:= 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4823
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4824	if Gear^.Pos = 1 then
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4825	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4826	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4827	AfterAttack;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4828	if Gear = CurAmmoGear then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4829	CurAmmoGear:= nil;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4830	if HH^.Gear <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4831	HideHog(HH);
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4832	Gear^.Pos:= 2
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4833	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4834
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4835	if Gear^.Pos = 2 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4836	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4837	if ((GameTicks mod 100) = 0) and (Gear^.Timer < 1000) then
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4838	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4839	if (Gear^.Timer mod 10) = 0 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4840	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4841	DeleteCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4842	Gear^.Y:= Gear^.Y - _0_5;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4843	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4844	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4845	inc(Gear^.Timer);
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4846	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4847	if Gear^.Tag <= TotalRounds then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4848	Gear^.Pos:= 3;
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4849	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4850
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4851	if Gear^.Pos = 3 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4852	if Gear^.Timer < 1000 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4853	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4854	if (Gear^.Timer mod 10) = 0 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4855	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4856	DeleteCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4857	Gear^.Y:= Gear^.Y - _0_5;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4858	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4859	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4860	inc(Gear^.Timer);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4861	end
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4862	else
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4863	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4864	if HH^.GearHidden <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4865	RestoreHog(HH);
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4866	Gear^.Pos:= 4;
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4867	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4868
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4869	if Gear^.Pos = 4 then
6473 2bed5ba1a7ea Why 'And'? (help parser) unc0rr parents: 6472 diff changeset	4870	if ((GameTicks mod 1000) = 0) and ((GameFlags and gfInvulnerable) = 0) then
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4871	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4872	t:= GearsList;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4873	while t <> nil do
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4874	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4875	if (t^.Kind = gtHedgehog) and (t^.Hedgehog^.Team^.Clan = HH^.Team^.Clan) then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4876	t^.Invulnerable:= true;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4877	t:= t^.NextGear;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4878	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4879	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4880
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4881	if Gear^.Health <= 0 then
66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4882	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4883	if HH^.GearHidden <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4884	RestoreHog(HH);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4885
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4886	x := hwRound(Gear^.X);
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4887	y := hwRound(Gear^.Y);
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4888
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4889	DeleteCI(Gear);
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4890	DeleteGear(Gear);
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4891
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4892	doMakeExplosion(x, y, 50, CurrentHedgehog, EXPLAutoSound);
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4893	end;
5013 04789ba3f200 added GetCurAmmoType to lua Henek parents: 4977 diff changeset	4894	end;
04789ba3f200 added GetCurAmmoType to lua Henek parents: 4977 diff changeset	4895
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	4896	////////////////////////////////////////////////////////////////////////////////
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4897	(*
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4898	TARDIS needs
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4899	Warp in. Pos = 1
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4900	Pause. Pos = 2
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4901	Hide gear (TARDIS hedgehog was nil)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4902	Warp out. Pos = 3
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4903	... idle active for some time period ... Pos = 4
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4904	Warp in. Pos = 1
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4905	Pause. Pos = 2
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4906	Restore gear (TARDIS hedgehog was not nil)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4907	Warp out. Pos = 3
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4908	*)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4909
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4910	procedure doStepTardisWarp(Gear: PGear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4911	var HH: PHedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4912	i,j,cnt: LongWord;
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4913	begin
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4914	HH:= Gear^.Hedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4915	if Gear^.Pos = 2 then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4916	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4917	StopSoundChan(Gear^.SoundChannel);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4918	if (Gear^.Timer = 0) then
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4919	begin
5715 59a8dd33f274 Restore gear ASAP, add denied sound for illegal activation without wasting ammo. nemo parents: 5710 diff changeset	4920	if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4921	begin
5935 c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4922	AfterAttack;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4923	if Gear = CurAmmoGear then CurAmmoGear := nil;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4924	if (HH^.Gear^.Damage = 0) and (HH^.Gear^.Health > 0) and
5977 0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	4925	((Gear^.State and (gstMoving or gstHHDeath or gstHHGone)) = 0) then
0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	4926	HideHog(HH)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4927	end
5738 a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4928	//else if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible <> 0) then
a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4929	else if (HH^.GearHidden <> nil) then// and (HH^.Gear^.State and gstInvisible <> 0) then
5807 5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	4930	RestoreHog(HH)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4931	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4932
5971 44b063166bb2 revert prev - that was dumb. wrong gear. nemo parents: 5970 diff changeset	4933	inc(Gear^.Timer);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4934	if (Gear^.Timer > 2000) and ((GameTicks mod 2000) = 1000) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4935	begin
5728 aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4936	Gear^.SoundChannel := LoopSound(sndTardis);
aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4937	Gear^.Pos:= 3
aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4938	end
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4939	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4940
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4941	if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then
5935 c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4942	begin
c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4943	inc(Gear^.Power);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4944	if (Gear^.Power = 172) and (HH^.Gear <> nil) and
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4945	(HH^.Gear^.Damage = 0) and (HH^.Gear^.Health > 0) and
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4946	((HH^.Gear^.State and (gstMoving or gstHHDeath or gstHHGone)) = 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4947	with HH^.Gear^ do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4948	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4949	State:= State or gstAnimation;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4950	Tag:= 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4951	Timer:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4952	Pos:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4953	end
5935 c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4954	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4955	if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4956	dec(Gear^.Power);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4957	if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4958	Gear^.Pos:= 2;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4959	if (Gear^.Pos = 3) and (Gear^.Power = 0) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4960	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4961	StopSoundChan(Gear^.SoundChannel);
5710 0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4962	if HH^.GearHidden = nil then
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4963	begin
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4964	DeleteGear(Gear);
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4965	exit
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4966	end;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4967	Gear^.Pos:= 4;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4968	// This condition might need tweaking
8632 b5ed76d2a1f9 Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle. nemo parents: 8628 diff changeset	4969	Gear^.Timer:= GetRandom(cHedgehogTurnTime*TeamsCount)+cHedgehogTurnTime
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4970	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4971
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4972	if (Gear^.Pos = 4) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4973	begin
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4974	cnt:= 0;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4975	for j:= 0 to Pred(HH^.Team^.Clan^.TeamsNumber) do
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4976	for i:= 0 to Pred(HH^.Team^.Clan^.Teams[j]^.HedgehogsNumber) do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4977	if (HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear <> nil)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4978	and ((HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.State and gstDrowning) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4979	and (HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Health > HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4980	inc(cnt);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4981	if (cnt = 0) or SuddenDeathDmg or (Gear^.Timer = 0) then
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4982	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4983	if HH^.GearHidden <> nil then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4984	FindPlace(HH^.GearHidden, false, 0, LAND_WIDTH,true);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4985
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4986	if HH^.GearHidden <> nil then
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	4987	begin
5738 a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4988	Gear^.X:= HH^.GearHidden^.X;
a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4989	Gear^.Y:= HH^.GearHidden^.Y;
7092 c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4990	end;
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4991	Gear^.Timer:= 0;
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4992
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4993	if (HH^.GearHidden <> nil) and (cnt = 0) then // do an emergency jump back in this case. the team needs you!
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4994	begin
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4995	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtExplosion);
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4996	Gear^.Pos:= 2;
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4997	Gear^.Power:= 255;
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4998	end
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	4999	else begin
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	5000	Gear^.SoundChannel := LoopSound(sndTardis);
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	5001	Gear^.Pos:= 1;
c9ca770fd7fc Add an emergency return to the timebox in the case of death of rest of team. Also add a small visual effect to AI survival nemo parents: 7068 diff changeset	5002	Gear^.Power:= 0;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5003	end
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	5004	end
8632 b5ed76d2a1f9 Make hogs thaw only on enemy turns, make timebox counter decrement only on your turn, adjust knock for frozen hogs, increase damage on frozen hogs, make freezer fuel only reduce when not adjusting angle. nemo parents: 8628 diff changeset	5005	else if (CurrentHedgehog^.Team^.Clan = Gear^.Hedgehog^.Team^.Clan) then dec(Gear^.Timer)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5006	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5007
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5008	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5009
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5010	procedure doStepTardis(Gear: PGear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5011	var i,j,cnt: LongWord;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5012	HH: PHedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5013	begin
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5014	(*
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5015	Conditions for not activating.
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5016	1. Hog is last of his clan
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5017	2. Sudden Death is in play
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5018	3. Hog is a king
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5019	*)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5020	HH:= Gear^.Hedgehog;
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5021	if HH^.Gear <> nil then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5022	if (HH^.Gear = nil) or (HH^.King) or (SuddenDeathDmg) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5023	begin
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5024	if HH^.Gear <> nil then
5977 0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5025	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5026	HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5027	HH^.Gear^.State:= HH^.Gear^.State and (not gstAttacking);
5977 0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5028	end;
5715 59a8dd33f274 Restore gear ASAP, add denied sound for illegal activation without wasting ammo. nemo parents: 5710 diff changeset	5029	PlaySound(sndDenied);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5030	DeleteGear(gear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5031	exit
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5032	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5033	cnt:= 0;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5034	for j:= 0 to Pred(HH^.Team^.Clan^.TeamsNumber) do
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5035	for i:= 0 to Pred(HH^.Team^.Clan^.Teams[j]^.HedgehogsNumber) do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	5036	if (HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear <> nil)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	5037	and ((HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.State and gstDrowning) = 0)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	5038	and (HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Health > HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	5039	inc(cnt);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5040	if cnt < 2 then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5041	begin
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5042	if HH^.Gear <> nil then
5977 0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5043	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5044	HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5045	HH^.Gear^.State:= HH^.Gear^.State and (not gstAttacking);
5977 0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5046	end;
0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5047	PlaySound(sndDenied);
0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5048	DeleteGear(gear);
0b1bfdd95310 Disable a bit of code from revision 4 that I'm pretty sure is not hit anymore, or we'd end up with plenty of doubled graves at a minimum. Also, clear gstWinner/gstLoser along with gstWait - still need to figure out why exactly those aren't rendering anymore though. nemo parents: 5972 diff changeset	5049	exit
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5050	end;
5728 aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	5051	Gear^.SoundChannel := LoopSound(sndTardis);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5052	Gear^.doStep:= @doStepTardisWarp
5197 9fa96377a69c Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate nemo parents: 5186 diff changeset	5053	end;
5313 5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	5054
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	5055	////////////////////////////////////////////////////////////////////////////////
5e18eaef65d0 now scripts can create unique crates: dummy (empty) crates and booby traps. scripts can also set health crate values Henek parents: 5298 diff changeset	5056
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5057	(*
0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5058	WIP. The ice gun will have the following effects. It has been proposed by sheepluva that it take the appearance of a large freezer
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: 7007 diff changeset	5059	spewing ice cubes. The cubes will be visual gears only. The scatter from them and the impact snow dust should help hide imprecisions in things like the GearsNear effect.
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5060	For now we assume a "ray" like a deagle projected out from the gun.
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5061	All these effects assume the ray's angle is not changed and that the target type was unchanged over a number of ticks. This is a simplifying assumption for "gun was applying freezing effect to the same target".
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5062	* When fired at water a layer of ice textured land is added above the water.
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	5063	* When fired at non-ice land (land and lfLandMask and not lfIce) the land is overlaid with a thin layer of ice textured land around that point (say, 1 or 2px into land, 1px above). For attractiveness, a slope would probably be needed.
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5064	* When fired at a hog (land and $00FF <> 0), while the hog is targetted, the hog's state is set to frozen. As long as the gun is on the hog, a frozen hog sprite creeps up from the feet to the head. If the effect is interrupted before reaching the top, the freezing state is cleared.
0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5065	A frozen hog will animate differently. To be decided, but possibly in a similar fashion to a grave when it comes to explosions. The hog might (possibly) not be damaged by explosions. This might make freezing potentially useful for friendlies in a bad position. It might be better to allow damage though.
0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5066	A frozen hog stays frozen for a certain number of turns. Each turn the frozen overlay becomes fainter, until it fades and the hog animates normally again.
0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5067	*)
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5068
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5069
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5070	procedure updateFuel(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5071	var
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5072	t:LongInt;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5073	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5074	t:= Gear^.Health div 10;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5075	if (t <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5076	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5077	Gear^.Damage:= t;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5078	FreeTexture(Gear^.Tex);
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5079	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(t) +
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5080	'%', cWhiteColor, fntSmall)
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5081	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: 8924 diff changeset	5082	if Gear^.Message and (gmUp or gmDown) <> 0 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: 8924 diff changeset	5083	begin
9072 e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5084	StopSoundChan(Gear^.SoundChannel);
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5085	Gear^.SoundChannel:= -1;
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: 8924 diff changeset	5086	if GameTicks mod 40 = 0 then dec(Gear^.Health)
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: 8924 diff changeset	5087	end
9072 e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5088	else
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5089	begin
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5090	if Gear^.SoundChannel = -1 then
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5091	Gear^.SoundChannel := LoopSound(sndIceBeam);
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5092	if GameTicks mod 10 = 0 then dec(Gear^.Health)
e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5093	end
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5094	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5095
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5096
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5097	procedure updateTarget(Gear:PGear; newX, newY:HWFloat);
8773 7d3af949dd34 remove engine warnings sheepluva parents: 8751 diff changeset	5098	// var
7d3af949dd34 remove engine warnings sheepluva parents: 8751 diff changeset	5099	// iter:PGear;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5100	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5101	with Gear^ do
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5102	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5103	dX:= newX;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5104	dY:= newY;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5105	Pos:= 0;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5106	Target.X:= NoPointX;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5107	LastDamage:= nil;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5108	X:= Hedgehog^.Gear^.X;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5109	Y:= Hedgehog^.Gear^.Y;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5110	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5111	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5112
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5113	procedure doStepIceGun(Gear: PGear);
9145 6b51a32e48ed Fix more warnings (lol @ icegun "consts") unc0rr parents: 9137 diff changeset	5114	const iceWaitCollision = 0;
6b51a32e48ed Fix more warnings (lol @ icegun "consts") unc0rr parents: 9137 diff changeset	5115	const iceCollideWithGround = 1;
8774 39754516eee6 Try to document TGear a bit, so people know what is commonly overridden, and what stuff is used for. Remove gtIceGun-specific values from TGear and abuse a couple of commonly abused members instead. nemo parents: 8751 diff changeset	5116	//const iceWaitNextTarget:Longint = 2;
39754516eee6 Try to document TGear a bit, so people know what is commonly overridden, and what stuff is used for. Remove gtIceGun-specific values from TGear and abuse a couple of commonly abused members instead. nemo parents: 8751 diff changeset	5117	//const iceCollideWithHog:Longint = 4;
9145 6b51a32e48ed Fix more warnings (lol @ icegun "consts") unc0rr parents: 9137 diff changeset	5118	const iceCollideWithWater = 5;
8774 39754516eee6 Try to document TGear a bit, so people know what is commonly overridden, and what stuff is used for. Remove gtIceGun-specific values from TGear and abuse a couple of commonly abused members instead. nemo parents: 8751 diff changeset	5119	//const waterFreezingTime:Longint = 500;
9145 6b51a32e48ed Fix more warnings (lol @ icegun "consts") unc0rr parents: 9137 diff changeset	5120	const groundFreezingTime = 1000;
8601 7668f92734b8 Make refactoring. Remove DrawIce function Urbertar@gmail.com parents: 8599 diff changeset	5121	const iceRadius = 32;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5122	const iceHeight = 40;
7716 95117607b81a Fix some hints unc0rr parents: 7661 diff changeset	5123	var
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5124	HHGear, iter: PGear;
8783 f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5125	landRect: TSDL_Rect;
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: 7007 diff changeset	5126	ndX, ndY: hwFloat;
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5127	i, t, gX, gY: LongInt;
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5128	hogs: PGearArrayS;
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: 8924 diff changeset	5129	vg: PVisualGear;
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5130	begin
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5131	HHGear := Gear^.Hedgehog^.Gear;
9076 6ae43e121882 cancel on slide nemo parents: 9073 diff changeset	5132	if (Gear^.Message and gmAttack <> 0) or (Gear^.Health = 0) or (HHGear = nil) or (HHGear^.Damage <> 0) or (HHGear^.dX.QWordValue > 4294967) then
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5133	begin
9072 e7bcdf4f492f add ice beam sound nemo parents: 9059 diff changeset	5134	StopSoundChan(Gear^.SoundChannel);
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5135	DeleteGear(Gear);
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5136	AfterAttack;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5137	exit
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: 8924 diff changeset	5138	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: 8924 diff changeset	5139	updateFuel(Gear);
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5140
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: 7007 diff changeset	5141	with Gear^ do
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: 7007 diff changeset	5142	begin
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: 7007 diff changeset	5143	HedgehogChAngle(HHGear);
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5144	ndX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _4;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5145	ndY:= -AngleCos(HHGear^.Angle) * _4;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5146	if (ndX <> dX) or (ndY <> dY) or
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5147	((Target.X <> NoPointX) and (Target.X and LAND_WIDTH_MASK = 0) and
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5148	(Target.Y and LAND_HEIGHT_MASK = 0) and ((Land[Target.Y, Target.X] = 0))) then
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: 7007 diff changeset	5149	begin
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5150	updateTarget(Gear, ndX, ndY);
fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5151	Timer := iceWaitCollision;
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: 7007 diff changeset	5152	end
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: 7007 diff changeset	5153	else
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: 7007 diff changeset	5154	begin
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: 7007 diff changeset	5155	X:= X + dX;
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: 7007 diff changeset	5156	Y:= Y + dY;
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5157	gX:= hwRound(X);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5158	gY:= hwRound(Y);
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5159	if Target.X = NoPointX then t:= hwRound(hwSqr(X-HHGear^.X)+hwSqr(Y-HHGear^.Y));
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5160
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: 7007 diff changeset	5161	if Target.X <> NoPointX then
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5162	begin
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5163	CheckCollision(Gear);
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5164	if (State and gstCollision) <> 0 then
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5165	begin
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5166	if Timer = iceWaitCollision then
fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5167	begin
fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5168	Timer := iceCollideWithGround;
fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5169	Power := GameTicks;
fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5170	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5171	end
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5172	else if (target.y >= cWaterLine) then
f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5173	begin
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5174	if Timer = iceWaitCollision then
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5175	begin
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5176	Timer := iceCollideWithWater;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5177	Power := GameTicks;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5178	end;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5179	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5180
7098 f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5181	if (abs(gX-Target.X) < 2) and (abs(gY-Target.Y) < 2) then
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5182	begin
7098 f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5183	X:= HHGear^.X;
f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5184	Y:= HHGear^.Y
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5185	end;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5186
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5187	if (Timer = iceCollideWithGround) and ((GameTicks - Power) > groundFreezingTime) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5188	begin
8783 f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5189	FillRoundInLand(target.x, target.y, iceRadius, icePixel);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5190	landRect.x := min(max(target.x - iceRadius, 0), LAND_WIDTH - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5191	landRect.y := min(max(target.y - iceRadius, 0), LAND_HEIGHT - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5192	landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5193	landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5194	UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5195
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5196	// Freeze nearby mines/explosives/cases too
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5197	iter := GearsList;
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5198	while iter <> nil do
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5199	begin
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5200	if (iter^.State and gstFrozen = 0) and
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5201	((iter^.Kind = gtExplosives) or (iter^.Kind = gtCase) or (iter^.Kind = gtMine)) and
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5202	(abs(iter^.X.Round-target.x)+abs(iter^.Y.Round-target.y)+2<2iceRadius) and (Distance(iter^.X-int2hwFloat(target.x),iter^.Y-int2hwFloat(target.y))<int2hwFloat(iceRadius2)) then
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5203	begin
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5204	for t:= 0 to 5 do
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5205	begin
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5206	vg:= AddVisualGear(hwRound(iter^.X)+random(4)-8, hwRound(iter^.Y)+random(8), vgtDust, 1);
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5207	if vg <> nil then
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5208	begin
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5209	i:= random(100) + 155;
9145 6b51a32e48ed Fix more warnings (lol @ icegun "consts") unc0rr parents: 9137 diff changeset	5210	vg^.Tint:= (i shl 24) or (i shl 16) or ($FF shl 8) or (random(200) + 55);
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5211	vg^.Angle:= random(360);
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5212	vg^.dx:= 0.001 * random(80);
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5213	vg^.dy:= 0.001 * random(80)
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5214	end
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5215	end;
9077 e8d9d94c122f Waddaya think. Add it for iced up water and mines/cases/explosives nemo parents: 9076 diff changeset	5216	PlaySound(sndHogFreeze);
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5217	if iter^.Kind = gtMine then // dud mine block
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5218	begin
9251 6c238c897213 need to switch to frozen after deleteCI nemo parents: 9224 diff changeset	5219	iter^.State:= iter^.State or gstFrozen;
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5220	vg:= AddVisualGear(hwRound(iter^.X) - 4 + Random(8), hwRound(iter^.Y) - 4 - Random(4), vgtSmoke);
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5221	if vg <> nil then
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5222	vg^.Scale:= 0.5;
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5223	PlaySound(sndVaporize);
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5224	iter^.Health := 0;
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5225	iter^.Damage := 0;
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5226	iter^.State := iter^.State and (not gstAttacking)
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5227	end
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5228	else if iter^.Kind = gtCase then
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5229	begin
aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5230	DeleteCI(iter);
9251 6c238c897213 need to switch to frozen after deleteCI nemo parents: 9224 diff changeset	5231	iter^.State:= iter^.State or gstFrozen;
9041 aefe46d64dd9 Make frozen crates uncollectable, add some tinting to frozen items. Suggestions needed for what should happen to explosives nemo parents: 9026 diff changeset	5232	AddGearCI(iter)
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5233	end
9045 6561c42399d3 sheepluva suggestion for frozen barrel behaviour. untested. nemo parents: 9043 diff changeset	5234	else // gtExplosives
9251 6c238c897213 need to switch to frozen after deleteCI nemo parents: 9224 diff changeset	5235	begin
6c238c897213 need to switch to frozen after deleteCI nemo parents: 9224 diff changeset	5236	iter^.State:= iter^.State or gstFrozen;
9045 6561c42399d3 sheepluva suggestion for frozen barrel behaviour. untested. nemo parents: 9043 diff changeset	5237	iter^.Health:= iter^.Health + cBarrelHealth
9251 6c238c897213 need to switch to frozen after deleteCI nemo parents: 9224 diff changeset	5238	end
9026 f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5239	end;
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5240	iter:= iter^.NextGear
f6074540bab2 Add gstFrozen state to mines/gears in range on frozen land creation, and set the mines to dud state. gstFrozen does nothing yet. Visually or otherwise. nemo parents: 8993 diff changeset	5241	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5242
8783 f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5243	// FillRoundInLandWithIce(Target.X, Target.Y, iceRadius);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5244	SetAllHHToActive;
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5245	Timer := iceWaitCollision;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5246	end;
f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5247
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5248	if (Timer = iceCollideWithWater) and ((GameTicks - Power) > groundFreezingTime) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5249	begin
9077 e8d9d94c122f Waddaya think. Add it for iced up water and mines/cases/explosives nemo parents: 9076 diff changeset	5250	PlaySound(sndHogFreeze);
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5251	DrawIceBreak(Target.X, cWaterLine - iceHeight, iceRadius, iceHeight);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5252	SetAllHHToActive;
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5253	Timer := iceWaitCollision;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5254	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: 8924 diff changeset	5255	(*
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: 8924 diff changeset	5256	Any ideas for something that would look good here?
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: 8924 diff changeset	5257	if (Target.X <> NoPointX) and ((Timer = iceCollideWithGround) or (Timer = iceCollideWithWater)) and (GameTicks mod max((groundFreezingTime-((GameTicks - Power)*2)),2) = 0) then //and CheckLandValue(Target.X, Target.Y, lfIce) 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: 8924 diff changeset	5258	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: 8924 diff changeset	5259	vg:= AddVisualGear(Target.X+random(20)-10, Target.Y+random(40)-10, vgtDust, 1);
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: 8924 diff changeset	5260	if vg <> nil 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: 8924 diff changeset	5261	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: 8924 diff changeset	5262	i:= random(100) + 155;
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: 8924 diff changeset	5263	vg^.Tint:= IceColor or $FF;
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: 8924 diff changeset	5264	vg^.Angle:= random(360);
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: 8924 diff changeset	5265	vg^.dx:= 0.001 * random(80);
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: 8924 diff changeset	5266	vg^.dy:= 0.001 * random(80)
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: 8924 diff changeset	5267	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: 8924 diff changeset	5268	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: 8924 diff changeset	5269	*)
8592 bb724ef609db Draw ice on water Urbertar@gmail.com parents: 8589 diff changeset	5270
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5271	// freeze nearby hogs
8560 134a098235fa Messing around w/ Freezer nemo parents: 8557 diff changeset	5272	hogs := GearsNear(int2hwFloat(Target.X), int2hwFloat(Target.Y), gtHedgehog, Gear^.Radius*2);
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5273	if hogs.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5274	for i:= 0 to hogs.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5275	if hogs.ar^[i] <> HHGear then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5276	if GameTicks mod 5 = 0 then
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	5277	begin
8565 a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5278	hogs.ar^[i]^.Active:= true;
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5279	if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] < 256 then
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5280	hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] := hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] + 1
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5281	else if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] = 256 then
9073 6cffcbef02e4 add hog freeze sound koda parents: 9072 diff changeset	5282	begin
9059 426aae3ffccd should unfreeze on your turn nemo parents: 9045 diff changeset	5283	hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000-1;//cHedgehogTurnTime + cReadyDelay
9073 6cffcbef02e4 add hog freeze sound koda parents: 9072 diff changeset	5284	PlaySound(sndHogFreeze);
6cffcbef02e4 add hog freeze sound koda parents: 9072 diff changeset	5285	end;
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	5286	end;
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: 7007 diff changeset	5287	inc(Pos)
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5288	end
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5289	else if (t > 400) and ((gY > cWaterLine) or
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: 7007 diff changeset	5290	(((gX and LAND_WIDTH_MASK = 0) and (gY and LAND_HEIGHT_MASK = 0))
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5291	and (Land[gY, gX] <> 0))) then
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5292	begin
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: 7007 diff changeset	5293	Target.X:= gX;
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: 7007 diff changeset	5294	Target.Y:= gY;
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5295	X:= HHGear^.X;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5296	Y:= HHGear^.Y
8812 fdac638c6f9a oups. reused same variable twice. my bad. You know, maybe somewhere in uVariables or uGearsList should define what we use Gear variables for in each gear nemo parents: 8795 diff changeset	5297	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: 8924 diff changeset	5298	if (gX > max(LAND_WIDTH,4096)*2) or
7829 c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	5299	(gX < -max(LAND_WIDTH,4096)) or
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	5300	(gY < -max(LAND_HEIGHT,4096)) or
c1dc7839d7b9 Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this. nemo parents: 7784 diff changeset	5301	(gY > max(LAND_HEIGHT,4096)+512) then
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: 8924 diff changeset	5302	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: 8924 diff changeset	5303	//X:= HHGear^.X;
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: 8924 diff changeset	5304	//Y:= HHGear^.Y
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: 8924 diff changeset	5305	Target.X:= gX;
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: 8924 diff changeset	5306	Target.Y:= gY;
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: 8924 diff changeset	5307	end
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: 7007 diff changeset	5308	end
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: 7007 diff changeset	5309	end;
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5310	end;
7389 15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5311
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5312	procedure doStepAddAmmo(Gear: PGear);
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5313	var a: TAmmoType;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5314	gi: PGear;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5315	begin
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5316	if Gear^.Timer > 0 then dec(Gear^.Timer)
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5317	else
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5318	begin
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5319	if Gear^.Pos = posCaseUtility then
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5320	a:= GetUtility(Gear^.Hedgehog)
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5321	else
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5322	a:= GetAmmo(Gear^.Hedgehog);
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5323	CheckSum:= CheckSum xor GameTicks;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5324	gi := GearsList;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5325	while gi <> nil do
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5326	begin
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5327	with gi^ do CheckSum:= CheckSum xor X.round xor X.frac xor dX.round xor dX.frac xor Y.round xor Y.frac xor dY.round xor dY.frac;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5328	AddRandomness(CheckSum);
8030 165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5329	if gi^.Kind = gtGenericFaller then gi^.State:= gi^.State and not gstTmpFlag;
7389 15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5330	gi := gi^.NextGear
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5331	end;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5332	AddPickup(Gear^.Hedgehog^, a, Gear^.Power, hwRound(Gear^.X), hwRound(Gear^.Y));
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5333	DeleteGear(Gear)
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5334	end;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5335	end;
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5336
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5337	procedure doStepGenericFaller(Gear: PGear);
15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5338	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5339	if Gear^.Timer < $FFFFFFFF then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5340	if Gear^.Timer > 0 then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5341	dec(Gear^.Timer)
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5342	else
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5343	begin
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5344	DeleteGear(Gear);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5345	exit
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5346	end;
8030 165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5347	if (Gear^.State and gstTmpFlag <> 0) or (GameTicks and $7 = 0) then
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5348	begin
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5349	doStepFallingGear(Gear);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5350	if (Gear^.State and gstInvisible <> 0) and (GameTicks and $FF = 0) and (hwRound(Gear^.X) < LongInt(leftX)) or (hwRound(Gear^.X) > LongInt(rightX)) or (hwRound(Gear^.Y) < LongInt(topY)) then
8030 165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5351	begin
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5352	Gear^.X:= int2hwFloat(GetRandom(rightX-leftX)+leftX);
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5353	Gear^.Y:= int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5354	Gear^.dX:= _90-(GetRandomf*_360);
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5355	Gear^.dY:= _90-(GetRandomf*_360)
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5356	end;
165aeaaaf445 Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit. nemo parents: 8003 diff changeset	5357	end
7389 15c3fb4882df Sorry about the slight delay in pickup. You can blame a few lame cheaters. This is to make their cheating a bit harder. nemo parents: 7370 diff changeset	5358	end;
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5359
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5360	procedure doStepCreeper(Gear: PGear);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5361	var hogs: PGearArrayS;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5362	HHGear: PGear;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5363	tdX: hwFloat;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5364	dir: LongInt;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5365	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5366	doStepFallingGear(Gear);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5367	if Gear^.Timer > 0 then dec(Gear^.Timer);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5368	// creeper sleep phase
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5369	if (Gear^.Hedgehog = nil) and (Gear^.Timer > 0) then exit;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5370
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5371	if Gear^.Hedgehog <> nil then HHGear:= Gear^.Hedgehog^.Gear
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5372	else HHGear:= nil;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5373
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5374	// creeper boom phase
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5375	if (Gear^.State and gstTmpFlag <> 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5376	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5377	if (Gear^.Timer = 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5378	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5379	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 300, CurrentHedgehog, EXPLAutoSound);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5380	DeleteGear(Gear)
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5381	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5382	// ssssss he essssscaped
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5383	if (Gear^.Timer > 250) and ((HHGear = nil) or
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5384	(((abs(HHGear^.X.Round-Gear^.X.Round) + abs(HHGear^.Y.Round-Gear^.Y.Round) + 2) > 180) and
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5385	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) > _180))) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5386	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5387	Gear^.State:= Gear^.State and (not gstTmpFlag);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5388	Gear^.Timer:= 0
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5389	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5390	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5391	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5392
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5393	// Search out a new target, as target seek time has expired, target is dead, target is out of range, or we did not have a target
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5394	if (HHGear = nil) or (Gear^.Timer = 0) or
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5395	(((abs(HHGear^.X.Round-Gear^.X.Round) + abs(HHGear^.Y.Round-Gear^.Y.Round) + 2) > Gear^.Angle) and
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5396	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) > int2hwFloat(Gear^.Angle)))
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5397	then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5398	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5399	hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Angle);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5400	if hogs.size > 1 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5401	Gear^.Hedgehog:= hogs.ar^[GetRandom(hogs.size)]^.Hedgehog
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5402	else if hogs.size = 1 then Gear^.Hedgehog:= hogs.ar^[0]^.Hedgehog
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5403	else Gear^.Hedgehog:= nil;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5404	if Gear^.Hedgehog <> nil then Gear^.Timer:= 5000;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5405	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5406	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5407
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5408	// we have a target. move the creeper.
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5409	if HHGear <> nil then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5410	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5411	// GOTCHA
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5412	if ((abs(HHGear^.X.Round-Gear^.X.Round) + abs(HHGear^.Y.Round-Gear^.Y.Round) + 2) < 50) and
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5413	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) < _50) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5414	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5415	// hisssssssssss
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5416	Gear^.State:= Gear^.State or gstTmpFlag;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5417	Gear^.Timer:= 1500;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5418	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5419	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5420	if (Gear^.State and gstMoving <> 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5421	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5422	Gear^.dY:= _0;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5423	Gear^.dX:= _0;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5424	end
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5425	else if (GameTicks and $FF = 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5426	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5427	tdX:= HHGear^.X-Gear^.X;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5428	dir:= hwSign(tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5429	if not TestCollisionX(Gear, dir) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5430	Gear^.X:= Gear^.X + signAs(_1,tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5431	if TestCollisionXwithXYShift(Gear, signAs(_10,tdX), 0, dir) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5432	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5433	Gear^.dX:= SignAs(_0_15, tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5434	Gear^.dY:= -_0_3;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5435	Gear^.State:= Gear^.State or gstMoving
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5436	end
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5437	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5438	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5439	end;
7729 c374746bb56e Data for copying throwing knife to Land once it hits. nemo parents: 7726 diff changeset	5440
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5441	////////////////////////////////////////////////////////////////////////////////
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5442	procedure doStepKnife(Gear: PGear);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5443	//var ox, oy: LongInt;
0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5444	// la: hwFloat;
0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5445	var a: real;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5446	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5447	// Gear is shrunk so it can actually escape the hog without carving into the terrain
8494 53b91a602955 Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further. nemo parents: 8413 diff changeset	5448	if (Gear^.Radius = 4) and (Gear^.CollisionMask = $FFFF) then Gear^.Radius:= 7;
7872 ab6db9e07c4d Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking. nemo parents: 7864 diff changeset	5449	if Gear^.Damage > 100 then Gear^.CollisionMask:= 0
7874 c8aba48f38dc Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20% nemo parents: 7872 diff changeset	5450	else if Gear^.Damage > 30 then
c8aba48f38dc Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20% nemo parents: 7872 diff changeset	5451	if GetRandom(max(4,18-Gear^.Damage div 10)) < 3 then Gear^.CollisionMask:= 0;
7872 ab6db9e07c4d Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking. nemo parents: 7864 diff changeset	5452	Gear^.Damage:= 0;
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5453	if Gear^.Timer > 0 then dec(Gear^.Timer);
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5454	if (Gear^.State and gstMoving <> 0) and (Gear^.State and gstCollision = 0) then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5455	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5456	DeleteCI(Gear);
8494 53b91a602955 Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further. nemo parents: 8413 diff changeset	5457	Gear^.Radius:= 7;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5458	// used for damage and impact calc. needs balancing I think
8501 9f70e6f7fb63 restore prior modifier. I think the damage dealt is appropriate to intended uses nemo parents: 8494 diff changeset	5459	Gear^.Health:= hwRound(hwSqr((hwAbs(Gear^.dY)+hwAbs(Gear^.dX))*_4));
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5460	doStepFallingGear(Gear);
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5461	AllInactive := false;
7864 667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5462	a:= Gear^.DirAngle;
667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5463	CalcRotationDirAngle(Gear);
667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5464	Gear^.DirAngle:= a+(Gear^.DirAngle-a)2hwSign(Gear^.dX) // double rotation
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5465	end
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5466	else if (Gear^.CollisionIndex = -1) and (Gear^.Timer = 0) then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5467	begin
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5468	(*ox:= 0; oy:= 0;
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5469	if TestCollisionYwithGear(Gear, -1) <> 0 then oy:= -1;
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5470	if TestCollisionXwithGear(Gear, 1) then ox:= 1;
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5471	if TestCollisionXwithGear(Gear, -1) then ox:= -1;
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5472	if TestCollisionYwithGear(Gear, 1) <> 0 then oy:= 1;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5473	if Gear^.Health > 0 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5474	PlaySound(sndRopeAttach);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5475
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5476	la:= _10000;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5477	if (ox <> 0) or (oy <> 0) then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5478	la:= CalcSlopeNearGear(Gear, ox, oy);
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5479	if la = _10000 then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5480	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5481	// debug for when we couldn't get an angle
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5482	//AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite);
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5483	*)
7784 cf6261f7fdb5 Disable jiggling of cleavers 'cause it just looks odd. Adding a constraint based on proximity to portal is an option too, this was just easier. nemo parents: 7777 diff changeset	5484	Gear^.DirAngle:= DxDy2Angle(Gear^.dX, Gear^.dY) + (random(30)-15);
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5485	if (Gear^.dX.isNegative and Gear^.dY.isNegative) or
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5486	((not Gear^.dX.isNegative) and (not Gear^.dY.isNegative)) then Gear^.DirAngle:= Gear^.DirAngle-90;
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5487	// end
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5488	// else Gear^.DirAngle:= hwFloat2Float(la)*90; // sheepluva's comment claims 45deg = 0.5 - yet orientation doesn't seem consistent?
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5489	// AddFileLog('la: '+floattostr(la)+' DirAngle: '+inttostr(round(Gear^.DirAngle)));
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5490	Gear^.dX:= _0;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5491	Gear^.dY:= _0;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5492	Gear^.State:= Gear^.State and (not gstMoving) or gstCollision;
8494 53b91a602955 Cleaver tweaks based on feedback. Nerf damage, shrink radius. This means cleaver will embed into ground quite a bit further. nemo parents: 8413 diff changeset	5493	Gear^.Radius:= 16;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5494	if Gear^.Health > 0 then AmmoShove(Gear, Gear^.Health, 0);
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5495	Gear^.Health:= 0;
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5496	Gear^.Timer:= 500;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5497	AddGearCI(Gear)
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5498	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5499	else if GameTicks and $3F = 0 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5500	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5501	if (TestCollisionYwithGear(Gear, -1) = 0)
7767 d1ea9b3f543e damn nots nemo parents: 7759 diff changeset	5502	and (not TestCollisionXwithGear(Gear, 1))
d1ea9b3f543e damn nots nemo parents: 7759 diff changeset	5503	and (not TestCollisionXwithGear(Gear, -1))
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5504	and (TestCollisionYwithGear(Gear, 1) = 0) then Gear^.State:= Gear^.State and (not gstCollision) or gstMoving;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5505	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5506	end;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5507	(*
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5508	This didn't end up getting used, but, who knows, might be reasonable for javellin or something
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5509	// Make the knife initial angle based on the hog attack angle, or is that too hard?
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5510	procedure doStepKnife(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5511	var t,
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5512	gx, gy, ga, // gear x,y,angle
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5513	lx, ly, la, // land x,y,angle
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5514	ox, oy, // x,y offset
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5515	w, h, // wXh of clip area
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5516	tx, ty // tip position in sprite
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5517	: LongInt;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5518	surf: PSDL_Surface;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5519	s: hwFloat;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5520
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5521	begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5522	Gear^.dY := Gear^.dY + cGravity;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5523	if (GameFlags and gfMoreWind) <> 0 then
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5524	Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5525	Gear^.X := Gear^.X + Gear^.dX;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5526	Gear^.Y := Gear^.Y + Gear^.dY;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5527	CheckGearDrowning(Gear);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5528	gx:= hwRound(Gear^.X);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5529	gy:= hwRound(Gear^.Y);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5530	if Gear^.State and gstDrowning <> 0 then exit;
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5531	with Gear^ do
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5532	begin
8751 4609823efc94 More flagging of Land values. Also use less than for tests of non-terrain, instead of "and $FF00 = 0". Saves a couple of ops, which actually matters a small amount in a few places. nemo parents: 8744 diff changeset	5533	if CheckLandValue(gx, gy, lfLandMask) then
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5534	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5535	t:= Angle + hwRound((hwAbs(dX)+hwAbs(dY)) * _10);
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5536
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5537	if t < 0 then inc(t, 4096)
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5538	else if 4095 < t then dec(t, 4096);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5539	Angle:= t;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5540
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5541	DirAngle:= Angle / 4096 * 360
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5542	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5543	else
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5544	begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5545	//This is the set of postions for the knife.
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5546	//Using FlipSurface and copyToXY the knife can be written to the LandPixels at 32 positions, and an appropriate line drawn in Land.
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5547	t:= Angle mod 1024;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5548	case t div 128 of
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5549	0: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5550	ox:= 2; oy:= 5;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5551	w := 25; h:= 5;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5552	tx:= 0; ty:= 2
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5553	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5554	1: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5555	ox:= 2; oy:= 15;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5556	w:= 24; h:= 8;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5557	tx:= 0; ty:= 7
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5558	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5559	2: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5560	ox:= 2; oy:= 27;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5561	w:= 23; h:= 12;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5562	tx:= -12; ty:= -5
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5563	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5564	3: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5565	ox:= 2; oy:= 43;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5566	w:= 21; h:= 15;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5567	tx:= 0; ty:= 14
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5568	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5569	4: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5570	ox:= 29; oy:= 8;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5571	w:= 19; h:= 19;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5572	tx:= 0; ty:= 17
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5573	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5574	5: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5575	ox:= 29; oy:= 32;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5576	w:= 15; h:= 21;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5577	tx:= 0; ty:= 20
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5578	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5579	6: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5580	ox:= 51; oy:= 3;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5581	w:= 11; h:= 23;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5582	tx:= 0; ty:= 22
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5583	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5584	7: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5585	ox:= 51; oy:= 34;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5586	w:= 7; h:= 24;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5587	tx:= 0; ty:= 23
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5588	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5589	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5590
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5591	surf:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5592	copyToXYFromRect(SpritesData[sprKnife].Surface, surf, ox, oy, w, h, 0, 0);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5593	// try to make the knife hit point first
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5594	lx := 0;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5595	ly := 0;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5596	if CalcSlopeTangent(Gear, gx, gy, lx, ly, 255) then
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5597	begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5598	la:= vector2Angle(int2hwFloat(lx), int2hwFloat(ly));
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5599	ga:= vector2Angle(dX, dY);
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5600	AddFileLog('la: '+inttostr(la)+' ga: '+inttostr(ga)+' Angle: '+inttostr(Angle));
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5601	// change to 0 to 4096 forced by LongWord in Gear
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5602	if la < 0 then la:= 4096+la;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5603	if ga < 0 then ga:= 4096+ga;
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5604	if ((Angle > ga) and (Angle < la)) or ((Angle < ga) and (Angle > la)) then
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5605	begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5606	if Angle >= 2048 then dec(Angle, 2048)
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5607	else if Angle < 2048 then inc(Angle, 2048)
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5608	end;
b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5609	AddFileLog('la: '+inttostr(la)+' ga: '+inttostr(ga)+' Angle: '+inttostr(Angle))
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5610	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5611	case Angle div 1024 of
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5612	0: begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5613	flipSurface(surf, true);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5614	flipSurface(surf, true);
7739 8d5d6b1be9ba no. still doesn't work right nemo parents: 7734 diff changeset	5615	BlitImageAndGenerateCollisionInfo(gx-(w-tx), gy-(h-ty), w, surf)
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5616	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5617	1: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5618	flipSurface(surf, false);
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5619	BlitImageAndGenerateCollisionInfo(gx-(w-tx), gy-ty, w, surf)
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5620	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5621	2: begin // knife was actually drawn facing this way...
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5622	BlitImageAndGenerateCollisionInfo(gx-tx, gy-ty, w, surf)
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5623	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5624	3: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5625	flipSurface(surf, true);
7739 8d5d6b1be9ba no. still doesn't work right nemo parents: 7734 diff changeset	5626	BlitImageAndGenerateCollisionInfo(gx-tx, gy-(h-ty), w, surf)
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5627	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5628	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5629	SDL_FreeSurface(surf);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5630	// this needs to calculate actual width/height + land clipping since update texture doesn't.
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5631	// i.e. this will crash if you fire near sides of map, but until I get the blit right, not going to put real values
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5632	UpdateLandTexture(hwRound(X)-32, 64, hwRound(Y)-32, 64, true);
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5633	DeleteGear(Gear);
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5634	exit
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5635	end
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5636	end;
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5637	end;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5638	*)

author	nemo
	Wed, 26 Jun 2013 21:40:10 -0400
changeset 9277	ad1ec7212ac7
parent 9251	6c238c897213
permissions	-rw-r--r--