sheepy-clone: hedgewars/GSHandlers.inc@3818b38d72c0 (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
6700 e04da46ee43c the most important commit of the year koda parents: 6580 diff changeset	3	* Copyright (c) 2004-2012 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
5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	135	procedure RestoreHog(HH: PHedgehog);
5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	136	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	137	HH^.Gear:=HH^.GearHidden;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	138	HH^.GearHidden:= nil;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	139	InsertGearToList(HH^.Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	140	HH^.Gear^.State:= (HH^.Gear^.State and (not (gstHHDriven or gstInvisible 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	141	AddGearCI(HH^.Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	142	HH^.Gear^.Active:= true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	143	ScriptCall('onHogRestore', HH^.Gear^.Uid)
5807 5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	144	end;
5c8fe58dead5 Define 2 script callbacks to notify of hog vanishment nemo parents: 5806 diff changeset	145
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	146
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	147	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	148	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	149	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	150	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	151	Gear^.Y := Gear^.Y + cDrownSpeed;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	152	Gear^.X := Gear^.X + Gear^.dX * cDrownSpeed;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	153	// 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	154	if ((not SuddenDeathDmg and (WaterOpacity < $FF))
8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	155	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	156	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	157	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	158	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	159	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	160	if (not SuddenDeathDmg and (WaterOpacity > $FE))
8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	161	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	162	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	163	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	164	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	165
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	166	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	167	procedure doStepFallingGear(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	168	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	169	isFalling: boolean;
3020 9b443edb8dd1 use cWaterLine for steam, splashes and droplets nemo parents: 3019 diff changeset	170	//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	171	tdX, tdY: hwFloat;
3001 a1d1e0d0067a Still fiddling with bouncing, hoping to make it work nemo parents: 2998 diff changeset	172	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	173	land: word;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	174	begin
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	175	// 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	176	if Gear^.dX.Round > 2 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	177	Gear^.dX.QWordValue:= 8589934592;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	178	if Gear^.dY.Round > 2 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	179	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	180
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	181	Gear^.State := Gear^.State and (not gstCollision);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	182	collV := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	183	collH := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	184	tdX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	185	tdY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	186
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	187
3359 d17b9f6adae5 Engine: smxx parents: 3358 diff changeset	188	// 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	189	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	190	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	191	Gear^.State := Gear^.State or gstCollision;
3359 d17b9f6adae5 Engine: smxx parents: 3358 diff changeset	192
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	193	if Gear^.dY.isNegative 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	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	196	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	197	if land <> 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	198	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	199	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	200	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	201	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	202	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	203	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	204
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	205	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	206	Gear^.State := Gear^.State or gstCollision
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	207	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	208	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	209	collV := 1;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	210	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	211	else
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	212	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	213	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	214	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	215	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	216	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	217	isFalling := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	218	if land and lfIce <> 0 then
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	219	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	220	else
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	221	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	222
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	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	224	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	225	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	226	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	227	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	228	isFalling := true;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	229	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	230	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	231	end
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	232	end;
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	233
2989 b49d87499398 Add back sheepluva's 45° patch for some weapons. Rescale Tiy's latest icons to his specifications. nemo parents: 2983 diff changeset	234
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	235	if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	236	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	237	collH := hwSign(Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	238	Gear^.dX := - Gear^.dX * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	239	Gear^.dY := Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	240	Gear^.State := Gear^.State or gstCollision
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	241	end
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	242	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	243	collH := -hwSign(Gear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	244	//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	245	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	246	or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	247	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	248	Gear^.dX := tdYGear^.ElasticityGear^.Friction;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	249	Gear^.dY := tdX*Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	250	//*Gear^.Friction;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	251	Gear^.dY.isNegative := not tdY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	252	isFalling := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	253	Gear^.AdvBounce := 10;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	254	end;
503 2cfdc4bfc2be Mines also collide unc0rr parents: 498 diff changeset	255
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	256	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	257	dec(Gear^.AdvBounce);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	258
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	259	if isFalling then
4299 d23f8a25fc3f tweak more wind mode nemo parents: 4297 diff changeset	260	begin
d23f8a25fc3f tweak more wind mode nemo parents: 4297 diff changeset	261	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	262	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	263	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	264	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	265
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	266	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	267	Gear^.Y := Gear^.Y + Gear^.dY;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	268	if Gear^.Kind <> gtBee then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	269	CheckGearDrowning(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	270	//if (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) < _0_0002) and
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	271	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	272	Gear^.State := Gear^.State and (not gstMoving)
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	273	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	274	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	275
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	276	if (Gear^.nImpactSounds > 0) and
7777 e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	277	(Gear^.State and gstCollision <> 0) and
e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	278	(((Gear^.Kind <> gtMine) and (Gear^.Damage <> 0)) or (Gear^.State and gstMoving <> 0)) and
e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	279	(((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	280	((Gear^.Radius >= 3) and
7777 e0be9fbc21b4 Fix knockball nemo parents: 7767 diff changeset	281	((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	282	PlaySound(TSound(ord(Gear^.ImpactSound) + LongInt(GetRandom(Gear^.nImpactSounds))), true);
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	283	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	284
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	285	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	286	procedure doStepBomb(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	287	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	288	i, x, y: LongInt;
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	289	dX, dY, gdX: hwFloat;
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	290	vg: PVisualGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	291	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	292	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	293
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	294	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	295
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	296	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	297	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	298	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	299	gtGrenade: makeHogsWorry(Gear^.X, Gear^.Y, 50);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	300	gtClusterBomb: makeHogsWorry(Gear^.X, Gear^.Y, 20);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	301	gtWatermelon: makeHogsWorry(Gear^.X, Gear^.Y, 75);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	302	gtHellishBomb: makeHogsWorry(Gear^.X, Gear^.Y, 90);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	303	gtGasBomb: makeHogsWorry(Gear^.X, Gear^.Y, 50);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	304	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	305
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	306	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	307	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	308	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	309	if (Gear^.State and gstCollision) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	310	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	311	end;
3004 e9b3613cc3fb Engine: smxx parents: 3002 diff changeset	312
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	313	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	314	begin
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	315	vg:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeWhite);
95345f98da19 Engine: smxx parents: 3473 diff changeset	316	if vg <> nil then
95345f98da19 Engine: smxx parents: 3473 diff changeset	317	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	318	end;
3475 95345f98da19 Engine: smxx parents: 3473 diff changeset	319
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	320	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	321	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	322	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	323	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	324	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	325	gtClusterBomb:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	326	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	327	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	328	y := hwRound(Gear^.Y);
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	329	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	330	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	331	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	332	begin
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	333	dX := rndSign(GetRandomf * _0_1) + gdX / 5;
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	334	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	335	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	336	end
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	337	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	338	gtWatermelon:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	339	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	340	x := hwRound(Gear^.X);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	341	y := hwRound(Gear^.Y);
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	342	gdX:= Gear^.dX;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	343	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	344	for i:= 0 to 5 do
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	345	begin
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	346	dX := rndSign(GetRandomf * _0_1) + gdX / 5;
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	347	dY := (GetRandomf - _1_5) * _0_3;
6120 85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	348	FollowGear:= AddGear(x, y, gtMelonPiece, 0, dX, dY, 75);
85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	349	FollowGear^.DirAngle := i * 60
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	350	end
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	351	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	352	gtHellishBomb:
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	353	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	354	x := hwRound(Gear^.X);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	355	y := hwRound(Gear^.Y);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	356	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	357
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	358	for i:= 0 to 127 do
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	359	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	360	dX := AngleCos(i * 16) * _0_5 * (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	361	dY := AngleSin(i * 16) * _0_5 * (GetRandomf + _1);
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	362	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	363	begin
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	364	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	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	end
61c1161ee32f Remove unnecessary assignments post-creation. Simplifies Lua manipulation of these adds as well as just being tidier. nemo parents: 6122 diff changeset	367	else
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	368	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	369	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	370	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	371	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	372	end
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	373	end;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	374	gtGasBomb:
de2026031833 Engine: smaxx parents: 3710 diff changeset	375	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	376	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLAutoSound);
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	377	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	378	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	379	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	380	y:= GetRandom(40);
6120 85d99bbe074c set followgear to cluster/melon/gascloud nemo parents: 6112 diff changeset	381	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	382	end
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	383	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	384	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	385	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	386	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	387	end;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	388
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	389	CalcRotationDirAngle(Gear);
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	390
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	391	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	392	begin
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	393
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	394	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	395	begin
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	396	Gear^.nImpactSounds := 0;
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	397	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	398	end;
6498 5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	399
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	400	if (GameTicks and $3F) = 0 then
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	401	if (Gear^.State and gstCollision) = 0 then
5678806aafca Some tiny optimizations unc0rr parents: 6491 diff changeset	402	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	403	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	404	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	405
2457 ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	406	////////////////////////////////////////////////////////////////////////////////
ecf0c7e7995b Initial molotov cocktail. Still needs graphics, tweaking of fire behaviour. Also changed probabilities for default weapon sets nemo parents: 2455 diff changeset	407	procedure doStepMolotov(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	408	var
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	409	s: Longword;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	410	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	411	dX, dY: hwFloat;
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	412	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	413	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	414	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	415
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	416	doStepFallingGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	417	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	418
5870 b9b9fb00c9dd smoke for molotov sheepluva parents: 5869 diff changeset	419	// 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	420	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	421	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	422	begin
5873 4f2d8ce3732b fix side-effects of nemo's bottle-turnin' sheepluva parents: 5871 diff changeset	423	// 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	424	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	425	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	426	else i:= 50;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	427
5873 4f2d8ce3732b fix side-effects of nemo's bottle-turnin' sheepluva parents: 5871 diff changeset	428	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	429	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	430	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	431	end;
5870 b9b9fb00c9dd smoke for molotov sheepluva parents: 5869 diff changeset	432
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	433	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	434	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	435	PlaySound(sndMolotov);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	436	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	437	gY := hwRound(Gear^.Y);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	438	for i:= 0 to 4 do
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	439	begin
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	440	(*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	441	if glass <> nil then
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	442	begin
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	443	glass^.Frame:= 2;
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	444	glass^.Tint:= $41B83ED0 - i * $10081000;
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	445	glass^.dX:= 1/(10*(random(11)-5));
5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	446	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	447	end;*)
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	448	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	449	if glass <> nil then
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	450	with glass^ do
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	451	begin
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	452	Frame:= 2;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	453	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	454	Angle:= random(360);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	455	dx:= 0.0000001;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	456	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	457	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	458	dx := -dx;
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	459	FrameTicks:= 750;
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	460	State:= ord(sprEgg)
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	461	end;
5874 5cd329cf2460 nemo's molotov burst effect; with a slight color modification added sheepluva parents: 5873 diff changeset	462	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	463	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	464	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	465	dX := AngleCos(i * 2) * ((_0_15(i div 5))) (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	466	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	467	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	468	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	469	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	470	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	471	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	472	DeleteGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	473	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	474	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	475	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	476
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	477	////////////////////////////////////////////////////////////////////////////////
1279 33cae6d1635c Use new sounds unc0rr parents: 1273 diff changeset	478
78 66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	479	procedure doStepCluster(Gear: PGear);
66bb79dd248d Cluster bomb unc0rr parents: 75 diff changeset	480	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	481	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	482	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	483	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	484	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	485	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	486	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	487	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	488	end;
1262 e9191c693e44 Add watermelon sprite unc0rr parents: 1261 diff changeset	489
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	490	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	491	or (Gear^.Kind = gtBall) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	492	CalcRotationDirAngle(Gear)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	493	else if (GameTicks and $1F) = 0 then
3440 dee31c5149e0 * gtHealthTag, gtSmokeTrace, gtEvilTrace, gtExplosion and gtBigExplosion are visual gears now (vgt) sheepluva* parents: 3431 diff changeset	494	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
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
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	511	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
95 1ef5e2c41115 - Fixed compilation unc0rr parents: 89 diff changeset	512	end;
1ef5e2c41115 - Fixed compilation unc0rr parents: 89 diff changeset	513
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	514	////////////////////////////////////////////////////////////////////////////////
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	515	procedure doStepSnowball(Gear: PGear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	516	var kick, i: LongInt;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	517	particle: PVisualGear;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	518	gdX, gdY: hwFloat;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	519	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	520	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	521	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	522	Gear^.dX := Gear^.dX + cWindSpeed;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	523	gdX := Gear^.dX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	524	gdY := Gear^.dY;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	525	doStepFallingGear(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	526	CalcRotationDirAngle(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	527	if (Gear^.State and gstCollision) <> 0 then
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	528	begin
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	529	kick:= hwRound((hwAbs(gdX)+hwAbs(gdY)) * _20);
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	530	Gear^.dX:= gdX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	531	Gear^.dY:= gdY;
7621 f0d739c34f2b disable snowball damage, by request of sheepluva nemo parents: 7592 diff changeset	532	AmmoShove(Gear, 0, kick);
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	533	for i:= 15 + kick div 10 downto 0 do
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	534	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	535	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	536	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	537	particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	538	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	539	DeleteGear(Gear);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	540	exit
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	541	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	542	if ((GameTicks and $1F) = 0) and (Random(3) = 0) then
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	543	begin
4582 85e92b6e5ad4 FAIL - actually assign nemo parents: 4578 diff changeset	544	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	545	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	546	particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	547	end
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	548	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	549
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	550	////////////////////////////////////////////////////////////////////////////////
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	551	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	552	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	553	move, draw, allpx, gun: Boolean;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	554	s: PSDL_Surface;
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	555	p: PLongwordArray;
5693 24a93bbdb81a Avoid unsightly gaps in landbacktex nemo parents: 5692 diff changeset	556	lf: LongWord;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	557	begin
5695 f1015857deb8 Prevent flakes from drawing if they spawn in land nemo parents: 5693 diff changeset	558	inc(Gear^.Pos);
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	559	gun:= (Gear^.State and gstTmpFlag) <> 0;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	560	move:= false;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	561	draw:= false;
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	562	if gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	563	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	564	Gear^.State:= Gear^.State and (not gstInvisible);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	565	doStepFallingGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	566	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	567	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	568	draw:= true;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	569	xx:= hwRound(Gear^.X);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	570	yy:= hwRound(Gear^.Y);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	571	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	572	else if GameTicks and $7 = 0 then
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	573	begin
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	574	with Gear^ do
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	575	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	576	State:= State and (not gstInvisible);
5355 9e0c51a882aa match snow to visual gear nemo parents: 5340 diff changeset	577	X:= X + cWindSpeed * 3200 + dX;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	578	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	579	xx:= hwRound(X);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	580	yy:= hwRound(Y);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	581	if vobVelocity <> 0 then
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	582	begin
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	583	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	584	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	585	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	586	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	587	DirAngle := DirAngle - 360;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	588	end;
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	589	(*
df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	590	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	591	inc(Health, 8);
5186 a05c14510c8a fix some more warnings koda parents: 5173 diff changeset	592	if longword(Health) > vobFrameTicks then
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	593	begin
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	594	dec(Health, vobFrameTicks);
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	595	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	596	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	597	Timer:= 0
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	598	end;
7649 df90970ae81a Correct snow fall/rotation (matching visual gear) nemo parents: 7627 diff changeset	599	*)
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	600	// 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	601	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	602	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	603	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	604	move:=true
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	605	// 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	606	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	607	begin
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	608	lf:= Land[yy, xx] and (lfObject or lfBasic or lfIndestructible);
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	609	if lf = 0 then lf:= lfObject;
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	610	// If there's room below keep falling
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	611	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	612	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	613	X:= X - cWindSpeed * 1600 - dX;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	614	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	615	// 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	616	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	617	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	618	X:= X - _0_8 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	619	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	620	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	621	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	622	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	623	X:= X - _0_8 * 2 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	624	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	625	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	626	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	627	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	628	X:= X + _0_8 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	629	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	630	end
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	631	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	632	begin
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	633	X:= X + _0_8 * 2 * hwSign(cWindSpeed);
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	634	Y:= Y - dY - cGravity * vobFallSpeed * 8;
458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	635	end
4805 01332828b568 Fancier detection of hogs/objects. Hogs wont get buried even by the worst of storms. Palewolf parents: 4803 diff changeset	636	// 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	637	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	638	then move:=true
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	639	else draw:= true
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	640	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	641	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	642	end;
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	643	if draw then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	644	with Gear^ do
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	645	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	646	// 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	647	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	648	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	649	or (CurAmmoGear^.Kind <> gtRope)) then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	650	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	651	////////////////////////////////// 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	652	if not gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	653	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	654	dec(yy,3);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	655	dec(xx,1)
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	656	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	657	s:= SpritesData[sprSnow].Surface;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	658	p:= s^.pixels;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	659	allpx:= true;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	660	for py:= 0 to Pred(s^.h) do
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	661	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	662	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	663	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	664	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	665	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	666	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	667	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	668	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	669	if cReducedQuality and rqBlurryLand <> 0 then
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 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:= 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	672	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	673	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	674	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	675	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	676	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	677	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	678	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	679	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	680	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	681	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	682	if gun then
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	683	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	684	else LandPixels[ry, rx]:= addBgColor(LandPixels[ry, rx], p^[px]);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	685	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	686	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	687	end;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	688	p:= @(p^[s^.pitch shr 2])
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	689	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	690
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	691	// 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	692	//Land[py, px+1]:= lfBasic;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	693
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	694	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	695	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	696	else
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	697	begin
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	698	UpdateLandTexture(
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	699	max(0, min(LAND_WIDTH, xx)),
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	700	min(LAND_WIDTH - xx, Pred(s^.w)),
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	701	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	702	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	703	);
4791 458d9854c679 Snow blends into land, trys to fill the gaps Palewolf parents: 4790 diff changeset	704	end;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	705	////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS ////////////////////////////////////
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	706	end
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	707	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	708
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	709	if move then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	710	begin
5025 ac1691d35cf2 Land sprayer tweaks, make land spray and mudball not end turn nemo parents: 5024 diff changeset	711	if gun then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	712	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	713	DeleteGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	714	exit
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	715	end;
5695 f1015857deb8 Prevent flakes from drawing if they spawn in land nemo parents: 5693 diff changeset	716	Gear^.Pos:= 0;
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	717	Gear^.X:= int2hwFloat(LongInt(GetRandom(snowRight - snowLeft)) + snowLeft);
8003 7d8bce524daf LongInt Land width/height, mouse coords nemo parents: 7992 diff changeset	718	Gear^.Y:= int2hwFloat(LAND_HEIGHT + LongInt(GetRandom(50)) - 1325);
5413 6786f672d30b Somehow this line got lost somewhere unc0rr parents: 5402 diff changeset	719	Gear^.State:= Gear^.State or gstInvisible;
4611 445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	720	end
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	721	end;
445d382cd401 A very very basic snow implementation nemo parents: 4602 diff changeset	722
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	723	////////////////////////////////////////////////////////////////////////////////
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	724	procedure doStepGrave(Gear: PGear);
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	725	begin
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	726	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	727	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	728	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	729	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	730	end;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	731
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	732	AllInactive := false;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	733
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	734	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	735	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	736	Gear^.dY := _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	737
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	738	if not Gear^.dY.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	739	if TestCollisionY(Gear, 1) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	740	begin
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	741	Gear^.dY := - Gear^.dY * Gear^.Elasticity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	742	if Gear^.dY > - _1div1024 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	743	begin
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	744	Gear^.Active := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	745	exit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	746	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	747	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	748	PlaySound(Gear^.ImpactSound)
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	749	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	750
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	751	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	752	CheckGearDrowning(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	753	Gear^.dY := Gear^.dY + cGravity
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	754	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	755
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	756	////////////////////////////////////////////////////////////////////////////////
3080 b7fa8ad60e3b Engine: smxx parents: 3075 diff changeset	757	procedure doStepBeeWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	758	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	759	t: hwFloat;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	760	gX,gY,i: LongInt;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	761	uw, nuw: boolean;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	762	flower: PVisualGear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	763
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	764	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	765	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	766	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	767	gY := hwRound(Gear^.Y);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	768	uw := (Gear^.Tag <> 0); // was bee underwater last tick?
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	769	nuw := (cWaterLine < gy + Gear^.Radius); // is bee underwater now?
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	770
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	771	// if water entered or left
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	772	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	773	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	774	AddVisualGear(gX, cWaterLine, vgtSplash);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	775	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	776	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	777	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	778	AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	779	StopSoundChan(Gear^.SoundChannel);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	780	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	781	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	782	Gear^.SoundChannel := LoopSound(sndBeeWater);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	783	Gear^.Tag := 1;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	784	end
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	785	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	786	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	787	Gear^.SoundChannel := LoopSound(sndBee);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	788	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	789	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	790	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	791
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	792
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	793	if Gear^.Timer = 0 then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	794	Gear^.RenderTimer:= false
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	795	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	796	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	797	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	798	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	799	if (GameTicks and $30) = 0 then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	800	AddVisualGear(gX, gY, vgtBeeTrace);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	801	Gear^.dX := Gear^.Elasticity * (Gear^.dX + _0_000064 * (Gear^.Target.X - gX));
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	802	Gear^.dY := Gear^.Elasticity * (Gear^.dY + _0_000064 * (Gear^.Target.Y - gY));
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	803	// make sure new speed isn't higher than original one (which we stored in Friction variable)
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	804	t := Gear^.Friction / Distance(Gear^.dX, Gear^.dY);
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	805	Gear^.dX := Gear^.dX * t;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	806	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	807	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	808
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	809	Gear^.X := Gear^.X + Gear^.dX;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	810	Gear^.Y := Gear^.Y + Gear^.dY;
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	811
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	812	end;
3591 c447d5218f6f bee: sheepluva parents: 3588 diff changeset	813
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	814
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	815	CheckCollision(Gear);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	816	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	817	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	818	StopSoundChan(Gear^.SoundChannel);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	819	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	820	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	821	begin
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	822	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	823	if flower <> nil then
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	824	with flower^ 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	Scale:= 0.75;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	827	dx:= 0.001 * (random(200));
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	828	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	829	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	830	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	831	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	832	dy := -dy;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	833	FrameTicks:= random(250) + 250;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	834	State:= ord(sprTargetBee);
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	835	end;
70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	836	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	837	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	838	end;
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	839
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	840	if (Gear^.Timer > 0) then
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	841	dec(Gear^.Timer)
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	842	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	843	begin
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	844	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	845	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	846	StopSoundChan(Gear^.SoundChannel);
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	847	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	848	end
6251 5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	849	else
5cd33711afb9 Bee: sheepluva parents: 6156 diff changeset	850	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	851	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	852	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	853
3080 b7fa8ad60e3b Engine: smxx parents: 3075 diff changeset	854	procedure doStepBee(Gear: PGear);
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	855	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	856	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	857	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	858	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	859	Gear^.dY := Gear^.dY + cGravity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	860	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	861	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	862	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	863	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	864	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	865	exit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	866	end;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	867	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	868	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	869	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	870	Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	871	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	872	AttackBar:= 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	873
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	874	Gear^.SoundChannel := LoopSound(sndBee);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	875	Gear^.Timer := 5000;
3591 c447d5218f6f bee: sheepluva parents: 3588 diff changeset	876	// save initial speed in otherwise unused Friction variable
c447d5218f6f bee: sheepluva parents: 3588 diff changeset	877	Gear^.Friction := Distance(Gear^.dX, Gear^.dY);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	878	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	879	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	880	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	881
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	882	////////////////////////////////////////////////////////////////////////////////
876 d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	883	procedure doStepShotIdle(Gear: PGear);
d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	884	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	885	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	886	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	887	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	888	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	889	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	890	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	891	end
876 d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	892	end;
d5b6e0ae5755 Desert Eagle and Shotgun shot animations unc0rr parents: 854 diff changeset	893
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	894	procedure doStepShotgunShot(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	895	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	896	i: LongWord;
2828 e45410eae9ea Engine: smxx parents: 2762 diff changeset	897	shell: PVisualGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	898	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	899	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	900
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	901	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	902	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	903	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	904	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	905	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	906	PlaySound(sndShotgunFire);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	907	shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	908	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	909	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	910	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	911	shell^.dY := gear^.dY.QWordValue / -17179869184;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	912	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	913	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	914	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	915	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	916	exit
7564 651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	917	end else
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	918	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	919	begin
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	920	DeleteGear(Gear);
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	921	AfterAttack;
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	922	exit
651d56a6e568 Cancel shotgun shot if hedgehog is moved moved (by explosion) unc0rr parents: 7539 diff changeset	923	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	924	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	925	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	926
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	927	i := 200;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	928	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	929	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	930	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	931	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	932	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	933	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	934	Gear^.X := Gear^.X + Gear^.dX * 8;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	935	Gear^.Y := Gear^.Y + Gear^.dY * 8;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	936	ShotgunShot(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	937	Gear^.doStep := @doStepShotIdle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	938	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	939	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	940
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	941	CheckGearDrowning(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	942	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	943	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	944	Gear^.doStep := @doStepShotIdle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	945	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	946	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	947	dec(i)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	948	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	949	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	950	Gear^.doStep := @doStepShotIdle
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	951	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	952
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	953	////////////////////////////////////////////////////////////////////////////////
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	954	procedure spawnBulletTrail(Bullet: PGear);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	955	var oX, oY: hwFloat;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	956	VGear: PVisualGear;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	957	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	958	if Bullet^.PortalCounter = 0 then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	959	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	960	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	961	oy:= CurrentHedgehog^.Gear^.Y + Int2hwFloat(GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle));
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	962	end
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	963	else
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	964	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	965	ox:= Bullet^.Elasticity;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	966	oy:= Bullet^.Friction;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	967	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	968
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	969	// Bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	970	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	971
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	972	if VGear <> nil then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	973	begin
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	974	VGear^.X:= hwFloat2Float(ox);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	975	VGear^.Y:= hwFloat2Float(oy);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	976	VGear^.dX:= hwFloat2Float(Bullet^.X);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	977	VGear^.dY:= hwFloat2Float(Bullet^.Y);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	978
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	979	// 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	980	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	981	or (hwRound(Bullet^.Y) and LAND_HEIGHT_MASK <> 0) then
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	982	// only extend if not under water
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	983	if hwRound(Bullet^.Y) < cWaterLine then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	984	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	985	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	986	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	987	end;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	988
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	989	VGear^.Timer := 200;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	990	end;
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
2023 41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	993	procedure doStepBulletWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	994	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	995	i, x, y: LongWord;
351 29bc9c36ad5f Fixed-point arithmetics in engine. unc0rr parents: 346 diff changeset	996	oX, oY: hwFloat;
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	997	VGear: PVisualGear;
38 c1ec4b15d70e Better Desert Eagle and Shotgun unc0rr parents: 37 diff changeset	998	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	999	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1000	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1001	i := 80;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1002	oX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1003	oY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1004	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1005	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1006	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1007	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1008	y := hwRound(Gear^.Y);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1009
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1010	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	1011	inc(Gear^.Damage);
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1012	// 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	1013	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	1014	begin
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1015	Gear^.Tag := 1;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1016	Gear^.Damage := 0;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1017	Gear^.X := Gear^.X - Gear^.dX;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1018	Gear^.Y := Gear^.Y - Gear^.dY;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1019	CheckGearDrowning(Gear);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1020	break;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1021	end
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1022	else
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1023	Gear^.Tag := 0;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	1024
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1025	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	1026	if Gear^.AmmoType = amDEagle then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1027	AmmoShove(Gear, 7, 20)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1028	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1029	AmmoShove(Gear, Gear^.Timer, 20);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1030	CheckGearDrowning(Gear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1031	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	1032	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	1033
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1034	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	1035	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1036	DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 82 - i, 1);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1037	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1038	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	1039	end;
6982 8d41d22a291d breaking news, we don't support typed consts anymore koda parents: 6924 diff changeset	1040	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	1041	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1042	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	1043	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1044	if Random(6) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1045	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1046	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1047	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	1048	end;
2994 7ae3067546f2 Palewolf adds bubbles and splashes when firing bullets into the water nemo parents: 2989 diff changeset	1049	end;
1760 55a1edd97911 Fix nemo's large land patch unc0rr parents: 1753 diff changeset	1050
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1051	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	1052	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	1053	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	1054	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1055	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	1056	cLaserSighting := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1057	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	1058	cArtillery := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1059
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	1060	// 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	1061	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	1062	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1063	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	1064	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	1065	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1066	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	1067	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1068	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1069
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1070	spawnBulletTrail(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1071	Gear^.doStep := @doStepShotIdle
4327 224efdd648e1 Small animation on bullet impact Palewolf parents: 4325 diff changeset	1072	end;
37 2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1073	end;
2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1074
559 6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1075	procedure doStepDEagleShot(Gear: PGear);
6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1076	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1077	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	1078	// 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	1079	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	1080	Gear^.Y := Gear^.Y + Gear^.dY * 3;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1081	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	1082	end;
41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1083
41d3afaa20c7 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump nemo parents: 2017 diff changeset	1084	procedure doStepSniperRifleShot(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1085	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1086	HHGear: PGear;
2828 e45410eae9ea Engine: smxx parents: 2762 diff changeset	1087	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	1088	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1089	cArtillery := true;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1090	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1091	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1092	HedgehogChAngle(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1093	if not cLaserSighting then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1094	// 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	1095	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1096	cLaserSighting := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1097	HHGear^.Message := 0;
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	1098	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	1099	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	1100	end;
2031 b6f3e56fb100 david_ac's game scheme options for mine delay/quantity, tweaks to sniper rifle nemo parents: 2029 diff changeset	1101
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1102	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	1103	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1104	shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1105	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	1106	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	1107	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	1108	shell^.dY := gear^.dY.QWordValue / -8589934592;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1109	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	1110	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1111	Gear^.State := Gear^.State or gstAnimation;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1112	Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _0_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1113	Gear^.dY := -AngleCos(HHGear^.Angle) * _0_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1114	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	1115	// 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	1116	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	1117	Gear^.Y := Gear^.Y + Gear^.dY * 3;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1118	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	1119	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1120	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1121	if (GameTicks mod 32) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1122	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	1123	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1124	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	1125	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	1126	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1127	else
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7062 diff changeset	1128	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	1129	dec(HHGear^.Angle);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1130
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1131	if (TurnTimeLeft > 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1132	dec(TurnTimeLeft)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1133	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1134	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1135	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1136	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1137	end;
559 6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1138	end;
6083fffc9e2f Desert Eagle sound unc0rr parents: 557 diff changeset	1139
37 2b7f2a43b999 - Properly get seed in net game unc0rr parents: 23 diff changeset	1140	////////////////////////////////////////////////////////////////////////////////
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1141	procedure doStepActionTimer(Gear: PGear);
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1142	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1143	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	1144	case Gear^.Kind of
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1145	gtATStartGame:
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1146	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1147	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1148	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	1149	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1150	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	1151	end
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1152	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1153	gtATFinishGame:
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1154	begin
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1155	AllInactive := false;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1156	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	1157	begin
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1158	ScreenFade := sfToBlack;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1159	ScreenFadeValue := 0;
a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1160	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	1161	end;
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1162	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	1163	begin
7068 b1b7eb9c8cc9 Get rid of cripple SendIPCc unc0rr parents: 7066 diff changeset	1164	SendIPC(_S'N');
b1b7eb9c8cc9 Get rid of cripple SendIPCc unc0rr parents: 7066 diff changeset	1165	SendIPC(_S'q');
5368 a66d5141a3ba fix build. seems like a indentation-related merge-oopsy dragged deleted code back in. sheepluva parents: 5366 diff changeset	1166	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	1167	end
8679 a8bdcf7bec20 fix fade to black in training nemo parents: 8668 diff changeset	1168	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1169	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1170	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	1171	DeleteGear(Gear)
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1172	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1173
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1174	////////////////////////////////////////////////////////////////////////////////
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1175	procedure doStepPickHammerWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1176	var
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1177	i, ei, x, y: LongInt;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1178	HHGear: PGear;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1179	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1180	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1181	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1182	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	1183	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	1184	dec(TurnTimeLeft);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1185	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	1186	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	1187	or((HHGear^.State and gstHHDriven) =0) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1188	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	1189	StopSoundChan(Gear^.SoundChannel);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1190	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1191	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	1192	doStepHedgehogMoving(HHGear); // for gfInfAttack
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1193	exit
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1194	end;
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1195
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1196	x:= hwRound(Gear^.X);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1197	y:= hwRound(Gear^.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1198	if (Gear^.Timer mod 33) = 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1199	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1200	HHGear^.State := HHGear^.State or gstNoDamage;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1201	doMakeExplosion(x, y + 7, 6, Gear^.Hedgehog, EXPLDontDraw);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1202	HHGear^.State := HHGear^.State and (not gstNoDamage)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1203	end;
422 12295a8b8b2f Tune pickhammer unc0rr parents: 415 diff changeset	1204
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1205	if (Gear^.Timer mod 47) = 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1206	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1207	// 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	1208	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	1209	for i:= 0 to 1 do
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1210	AddVisualGear(x - 5 + Random(10), y + 12, vgtDust);
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1211
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1212	i := x - Gear^.Radius - LongInt(GetRandom(2));
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1213	ei := x + Gear^.Radius + LongInt(GetRandom(2));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1214	while i <= ei do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1215	begin
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1216	DrawExplosion(i, y + 3, 3);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1217	inc(i, 1)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1218	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	1219
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1220	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	1221	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1222	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1223	Gear^.Y := Gear^.Y + _1_9;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1224	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1225	SetAllHHToActive;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1226	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	1227	if TestCollisionYwithGear(Gear, 1) <> 0 then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1228	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1229	Gear^.dY := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1230	SetLittle(HHGear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1231	HHGear^.dY := _0;
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1232	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1233	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1234	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	1235	if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), lfLandMask) then
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1236	begin
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1237	Gear^.dY := Gear^.dY + cGravity;
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1238	Gear^.Y := Gear^.Y + Gear^.dY
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1239	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1240	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	1241	Gear^.Timer := 1
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1242	end;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1243
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1244	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	1245	if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, lfLandMask) then
6314 b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1246	begin
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1247	HHGear^.X := Gear^.X;
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1248	HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius)
b4fc5b863f5f Add more border checks nemo parents: 6305 diff changeset	1249	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1250
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1251	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	1252	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	1253	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	1254	else //there would be a mistake.
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1255	else
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^.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	1258	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	1259	Gear^.dX := - _0_3
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1260	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1261	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	1262	Gear^.dX := _0_3
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1263	else Gear^.dX := _0;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1264	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1265
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1266	procedure doStepPickHammer(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1267	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1268	i, y: LongInt;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1269	ar: TRangeArray;
911 b709fe13ed69 Fix issue with hedgehog on top of the hedgehog with pickhammer unc0rr parents: 883 diff changeset	1270	HHGear: PGear;
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1271	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1272	i := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1273	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1274
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1275	y := hwRound(Gear^.Y) - cHHRadius * 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1276	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	1277	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1278	ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1279	ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1280	inc(y, 2);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1281	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	1282	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1283
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1284	DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1285	Gear^.dY := HHGear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1286	DeleteCI(HHGear);
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	Gear^.SoundChannel := LoopSound(sndPickhammer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1289	doStepPickHammerWork(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1290	Gear^.doStep := @doStepPickHammerWork
4 bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1291	end;
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1292
bcbd7adb4e4b - set svn:eol-style to native unc0rr parents: 1 diff changeset	1293	////////////////////////////////////////////////////////////////////////////////
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1294	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1295	BTPrevAngle, BTSteps: LongInt;
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1296
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1297	procedure doStepBlowTorchWork(Gear: PGear);
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	HHGear: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1300	b: boolean;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1301	prevX: LongInt;
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1302	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1303	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1304	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	1305	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	1306	dec(TurnTimeLeft);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1307
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1308	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1309
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1310	HedgehogChAngle(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1311
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1312	b := false;
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	if abs(LongInt(HHGear^.Angle) - BTPrevAngle) > 7 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1315	begin
5722 3b7f2bfc8632 Keep blowtorch direction (doesn't actually fix the bug with hedgehog turning opposite direction) unc0rr parents: 5716 diff changeset	1316	Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1317	Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1318	BTPrevAngle := HHGear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1319	b := true
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1320	end;
1528 3fee15104c1d More stable blowtorch: unc0rr parents: 1507 diff changeset	1321
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1322	if ((HHGear^.State and gstMoving) <> 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1323	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1324	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	1325	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	1326	Gear^.Timer := 0
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1327	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1328
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1329	if Gear^.Timer mod cHHStepTicks = 0 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1330	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1331	b := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1332	if Gear^.dX.isNegative then
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1333	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	1334	else
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1335	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	1336
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1337	if ((HHGear^.State and gstMoving) = 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1338	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1339	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1340	prevX := hwRound(HHGear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1341
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1342	// why the call to HedgehogStep then a further increment of X?
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1343	if (prevX = hwRound(HHGear^.X)) and
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1344	CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y),
3519 56cbc035b74b rename flags nemo parents: 3509 diff changeset	1345	lfIndestructible) then HedgehogStep(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1346
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 HHGear^.X := HHGear^.X + SignAs(_1, HHGear^.dX);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1350	HHGear^.State := HHGear^.State or gstAttacking
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1351	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1352
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1353	inc(BTSteps);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1354	if BTSteps = 7 then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1355	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1356	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	1357	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	1358	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1359	Gear^.X := HHGear^.X + Gear^.dX * (cHHRadius + cBlowTorchC);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1360	Gear^.Y := HHGear^.Y + Gear^.dY * (cHHRadius + cBlowTorchC);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1361	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1362	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1363	AmmoShove(Gear, 2, 15);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	1364	HHGear^.State := HHGear^.State and (not gstNoDamage)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1365	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1366	end;
305 1c1cd66ffcdc Better blowtorch unc0rr parents: 304 diff changeset	1367
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1368	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	1369	begin
654eed7c6b97 tweak DrawTunnel call of blowtorch. should fix issues with blowtorch going horizontal when it shouldn't sheepluva parents: 6251 diff changeset	1370	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	1371	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	1372	((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	1373	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	1374	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	1375	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1376
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1377	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	1378	or ((HHGear^.Message and gmAttack) <> 0) then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1379	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1380	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1381	HHGear^.State := HHGear^.State and (not gstNotKickable);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1382	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1383	AfterAttack
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	1384	end
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1385	end;
7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1386
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1387	procedure doStepBlowTorch(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1388	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1389	HHGear: PGear;
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1390	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1391	BTPrevAngle := High(LongInt);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1392	BTSteps := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1393	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	1394	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	1395	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	1396	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	1397	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	1398	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	1399	((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	1400	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	1401	cHHStepTicks, cHHRadius * 2 + 7);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1402	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1403	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1404	Gear^.doStep := @doStepBlowTorchWork
303 1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1405	end;
1659c4aad5ab Now blow torch angle can be changed during blowing :) unc0rr parents: 302 diff changeset	1406
302 7aca131ecd7f First implementation of Blow Torch unc0rr parents: 300 diff changeset	1407	////////////////////////////////////////////////////////////////////////////////
10 edf56dca1587 - Mine weapon unc0rr parents: 9 diff changeset	1408	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	1409	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	1410	dxdy: hwFloat;
10 edf56dca1587 - Mine weapon unc0rr parents: 9 diff changeset	1411	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1412	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	1413	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1414	DeleteCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1415	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1416	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	1417	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1418	AddGearCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1419	Gear^.dX := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1420	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	1421	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1422	CalcRotationDirAngle(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1423	AllInactive := false
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1424	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1425	else if (GameTicks and $3F) = 25 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	1426	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	1427	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	1428	begin
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1429	dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1430	if (dxdy > _0_3) and
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1431	((TestCollisionYwithGear(Gear, 1) <> 0) or
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1432	TestCollisionXwithGear(Gear, 1) or
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1433	(TestCollisionYwithGear(Gear, -1) <> 0) or
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1434	TestCollisionXwithGear(Gear, -1)) then
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1435	inc(Gear^.Damage, hwRound(dxdy * _25));
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	(*
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1570	TODO
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1571	Increase damage as barrel smokes?
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1572	Try tweaking friction some more
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1573	*)
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	procedure doStepRollingBarrel(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1575	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1576	i: LongInt;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1577	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	1578	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	1579	begin
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^.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	1581	SetLittle(Gear^.dY);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1582	Gear^.State := Gear^.State or gstAnimation;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1583
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1584	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	1585	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	1586	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1587	DeleteCI(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1588	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	1589	dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1590	if (dxdy > _0_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	1591	begin
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1592	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	1593	begin
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1594	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	1595	inc(Gear^.Damage, hwRound(dxdy * _25));
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1596	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	1597	begin
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1598	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	1599	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	1600	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	1601	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1602	end
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1603	else if TestCollisionXwithGear(Gear, 1) or (TestCollisionYwithGear(Gear, -1) <> 0) or TestCollisionXwithGear(Gear, -1) then
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1604	inc(Gear^.Damage, hwRound(dxdy * _25))
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1605	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1606	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1607	CalcRotationDirAngle(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1608	//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	1609	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1610	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1611	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1612	Gear^.State := Gear^.State or gsttmpFlag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1613	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	1614	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1615
2944 e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1616	(*
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1617	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	1618	begin
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1619	x:= hwRound(Gear^.X);
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1620	y:= hwRound(Gear^.Y);
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1621	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	1622	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	1623	begin
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1624	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	1625	Gear^.dX:= -_0_08
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1626	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	1627	Gear^.dX:= _0_08;
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1628	end;
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1629	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	1630	end; *)
e8a891bf6660 Adjust fall damage again, zero out X/Y to avoid sinking/shivering barrels. nemo parents: 2941 diff changeset	1631
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1632	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	1633	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	1634	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	1635	Gear^.dX := _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1636
5128 3c65326bb713 Check for 0 health to avoid div by 0. spotted by mikade. nemo parents: 5121 diff changeset	1637	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	1638	if (cBarrelHealth div Gear^.Health) > 2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1639	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	1640	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	1641	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	1642	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1643	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	1644	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	1645	Gear^.doStep := @doStepCase;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1646	// Hand off to doStepCase for the explosion
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	1647
566f967ec22f White/Black smoke, break out rolling barrel into its own routine, adjust rolling barrel impact damage. NEEDS TESTING nemo parents: 2939 diff changeset	1648	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	1649
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1650	procedure doStepCase(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1651	var
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1652	i, x, y: LongInt;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1653	k: TGearType;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1654	exBoom: boolean;
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1655	dX, dY: HWFloat;
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1656	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	1657	sparkles: PVisualGear;
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1658	gi: PGear;
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1659	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1660	k := Gear^.Kind;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1661	exBoom := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1662
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	1663	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	1664	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1665	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1666	FreeActionsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1667	SetAllToActive;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1668	// something (hh, mine, etc...) could be on top of the case
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1669	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	1670	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	1671	Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1672	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1673	end;
15 6200cca92480 - Minor code simplifying unc0rr parents: 14 diff changeset	1674
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1675	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	1676	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1677	//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	1678	if (hwAbs(Gear^.dX) > _0_15) or ((hwAbs(Gear^.dY) > _0_15) and (hwAbs(Gear^.dX) > _0_02)) then
8958 3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1679	Gear^.doStep := @doStepRollingBarrel
3818b38d72c0 simplify mine/explosive damage calc. clear dX in stable explosives. remove 0/4096 in trace routines. nemo parents: 8952 diff changeset	1680	else Gear^.dX:= _0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1681
5128 3c65326bb713 Check for 0 health to avoid div by 0. spotted by mikade. nemo parents: 5121 diff changeset	1682	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	1683	if (cBarrelHealth div Gear^.Health) > 2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1684	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	1685	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	1686	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	1687	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1688	Gear^.Damage := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1689	if Gear^.Health <= 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1690	exBoom := true;
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	1691	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	1692	else
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1693	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	1694	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	1695	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1696	gi := GearsList;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1697	while gi <> nil do
7396 7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1698	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1699	if gi^.Kind = gtGenericFaller then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1700	begin
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1701	gi^.Active:= true;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1702	gi^.X:= int2hwFloat(GetRandom(rightX-leftX)+leftX);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1703	gi^.Y:= int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1704	gi^.dX:= _90-(GetRandomf*_360);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1705	gi^.dY:= _90-(GetRandomf*_360)
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1706	end;
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1707	gi := gi^.NextGear
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	1708	end
7396 7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1709	end;
7c0e07c23aad what the heck, let's add a few more nemo parents: 7395 diff changeset	1710
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1711	if Gear^.Timer = 500 then
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1712	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	1713	(* 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	1714	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	1715	has its own complexities. *)
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1716	// Abuse a couple of gear values to track origin
7339 5984b749ad9b free up power for use by script nemo parents: 7335 diff changeset	1717	Gear^.Angle:= hwRound(Gear^.Y);
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1718	Gear^.Tag:= random(2);
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1719	inc(Gear^.Timer)
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1720	end;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1721	if Gear^.Timer < 1833 then inc(Gear^.Timer);
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1722	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	1723	begin
7339 5984b749ad9b free up power for use by script nemo parents: 7335 diff changeset	1724	sparkles:= AddVisualGear(hwRound(Gear^.X), Gear^.Angle, vgtDust, 1);
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1725	if sparkles <> nil then
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1726	begin
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1727	sparkles^.dX:= 0;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1728	sparkles^.dY:= 0;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1729	sparkles^.Angle:= 270;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1730	if Gear^.Tag = 1 then
7276 e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1731	sparkles^.Tint:= $3744D7FF
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1732	else sparkles^.Tint:= $FAB22CFF
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1733	end;
e570bc0df33c Another take at prettier crate appearance nemo parents: 7272 diff changeset	1734	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1735	if Gear^.Timer < 1000 then
7283 322ff9418461 oops nemo parents: 7281 diff changeset	1736	begin
322ff9418461 oops nemo parents: 7281 diff changeset	1737	AllInactive:= false;
322ff9418461 oops nemo parents: 7281 diff changeset	1738	exit
322ff9418461 oops nemo parents: 7281 diff changeset	1739	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1740	end;
2911 cd355befa683 Engine: smxx parents: 2887 diff changeset	1741
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1742	if (Gear^.Damage > 0) or exBoom then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1743	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1744	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1745	y := hwRound(Gear^.Y);
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1746	hog:= Gear^.Hedgehog;
2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1747
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1748	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1749	// <-- delete gear!
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1750
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1751	if k = gtCase then
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1752	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1753	doMakeExplosion(x, y, 25, hog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1754	for i:= 0 to 63 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1755	AddGear(x, y, gtFlame, 0, _0, _0, 0);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1756	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1757	else 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	1758	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	1759	doMakeExplosion(x, y, 75, hog, EXPLAutoSound);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1760	for i:= 0 to 31 do
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1761	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	1762	dX := AngleCos(i * 64) * _0_5 * (getrandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	1763	dY := AngleSin(i * 64) * _0_5 * (getrandomf + _1);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1764	AddGear(x, y, gtFlame, 0, dX, dY, 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	1765	AddGear(x, y, gtFlame, gstTmpFlag, -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	1766	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1767	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1768	exit
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1769	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1770
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1771	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	1772	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	1773	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1774	AllInactive := false;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1775
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1776	Gear^.dY := Gear^.dY + cGravity;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1777
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1778	if (Gear^.dY.isNegative) and (TestCollisionYwithGear(Gear, -1) <> 0) then
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1779	Gear^.dY := _0;
3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1780
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1781	Gear^.Y := Gear^.Y + Gear^.dY;
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1782
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1783	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	1784	SetAllHHToActive(false);
7661 3046ad5b361e fix for issue 376 (embedding barrels in ceiling) sheepluva parents: 7659 diff changeset	1785
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	1786	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	1787	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	1788	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	1789	inc(Gear^.Damage, hwRound(Gear^.dY * _70));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1790
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1791	if Gear^.dY > _0_2 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1792	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	1793	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	1794
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1795	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	1796	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	1797	Gear^.dY := _0
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1798	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	1799	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	1800	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1801	//if Gear^.dY > - _0_001 then Gear^.dY:= _0
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1802	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	1803	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1804
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1805	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	1806	AddGearCI(Gear)
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1807	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	1808	DeleteCI(Gear)
14 81f125629b25 - Mine checks whether a hedgehog is near less frequently unc0rr parents: 13 diff changeset	1809	end;
49 3afe33c1cf06 - Teams health bars sorting unc0rr parents: 46 diff changeset	1810
3afe33c1cf06 - Teams health bars sorting unc0rr parents: 46 diff changeset	1811	////////////////////////////////////////////////////////////////////////////////
2460 ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1812
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1813	procedure doStepTarget(Gear: PGear);
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1814	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1815	if (Gear^.Timer = 0) and (Gear^.Tag = 0) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1816	PlaySound(sndWarp);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1817
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1818	if (Gear^.Tag = 0) and (Gear^.Timer < 1000) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1819	inc(Gear^.Timer)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1820	else if Gear^.Tag = 1 then
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	1821	Gear^.Tag := 2
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1822	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	1823	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	1824	dec(Gear^.Timer)
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1825	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1826	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1827	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1828	exit;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1829	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1830
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1831	doStepCase(Gear)
2460 ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1832	end;
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1833
ac0c497fb842 Adjustments to training mode and credits by Smaxx nemo parents: 2457 diff changeset	1834	////////////////////////////////////////////////////////////////////////////////
854 fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1835	procedure doStepIdle(Gear: PGear);
fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1836	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1837	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1838	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1839	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	1840	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1841	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1842	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1843	end
854 fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1844	end;
fef7f2d908bf Animate baseball bat attack unc0rr parents: 853 diff changeset	1845
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	1846	////////////////////////////////////////////////////////////////////////////////
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1847	procedure doStepShover(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1848	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1849	HHGear: PGear;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1850	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1851	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1852	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1853	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1854
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1855	AmmoShove(Gear, 30, 115);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1856
4182 5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1857	HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1858	Gear^.Timer := 250;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1859	Gear^.doStep := @doStepIdle
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1860	end;
29b477319854 - New test map unc0rr parents: 78 diff changeset	1861
29b477319854 - New test map unc0rr parents: 78 diff changeset	1862	////////////////////////////////////////////////////////////////////////////////
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1863	procedure doStepWhip(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1864	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1865	HHGear: PGear;
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1866	i: LongInt;
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1867	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	1868	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1869	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1870	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1871
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1872	for i:= 0 to 3 do
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1873	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1874	AmmoShove(Gear, 30, 25);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1875	Gear^.X := Gear^.X + Gear^.dX * 5
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	1876	end;
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1877
4182 5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1878	HHGear^.State := (HHGear^.State and (not gstNoDamage)) or gstMoving;
5240a84df702 Fix rev dec8aafc6414 (not tested) unc0rr parents: 4168 diff changeset	1879
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1880	Gear^.Timer := 250;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1881	Gear^.doStep := @doStepIdle
925 c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1882	end;
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1883
c20156328529 Implement whip weapon unc0rr parents: 924 diff changeset	1884	////////////////////////////////////////////////////////////////////////////////
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1885	procedure doStepFlame(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1886	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1887	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	1888	sticky: Boolean;
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1889	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	1890	tdX,tdY: HWFloat;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	1891	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	1892	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	1893	if not sticky then AllInactive := false;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1894
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	1895	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	1896	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1897	AllInactive := false;
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1898
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1899	if ((GameTicks mod 100) = 0) then
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1900	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	1901	vgt:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFire, gstTmpFlag);
3751 a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1902	if vgt <> nil then
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1903	begin
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1904	vgt^.dx:= 0;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1905	vgt^.dy:= 0;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1906	vgt^.FrameTicks:= 1800 div (Gear^.Tag mod 3 + 2);
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1907	end;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1908	end;
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1909
a70c61c076ae Engine: smaxx parents: 3728 diff changeset	1910
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1911	if Gear^.dX.QWordValue > _0_01.QWordValue then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1912	Gear^.dX := Gear^.dX * _0_995;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1913
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1914	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	1915	// 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	1916
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1917	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	1918	Gear^.dY := Gear^.dY * _0_995;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1919
3609 bc63ed514b70 Minor fire tweak for readability and lethalness, remove exit condition that was hanging game (identified by jaylittle) nemo parents: 3603 diff changeset	1920	//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	1921	Gear^.X := Gear^.X + Gear^.dX + cWindSpeed * 640;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1922	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1923
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1924	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	1925	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1926	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1927	for i:= 0 to 3 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1928	AddVisualGear(gX - 16 + Random(32), cWaterLine - 16 + Random(16), vgtSteam);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1929	PlaySound(sndVaporize);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1930	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1931	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1932	end
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1933	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1934	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1935	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	1936	if sticky then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1937	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	1938	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	1939	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	1940	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	1941	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	1942	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	1943	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	1944	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	1945	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	1946	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	1947	Gear^.dY:= tdY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1948	Gear^.Radius := 1
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1949	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	1950	if Gear^.Timer > 0 then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1951	begin
2475 e0646a529a38 Fire tweaks nemo parents: 2470 diff changeset	1952	dec(Gear^.Timer);
e0646a529a38 Fire tweaks nemo parents: 2470 diff changeset	1953	inc(Gear^.Damage)
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1954	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1955	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1956	begin
3462 4b36933dce1d fix multi-round fire sheepluva parents: 3461 diff changeset	1957	gX := hwRound(Gear^.X);
4b36933dce1d fix multi-round fire sheepluva parents: 3461 diff changeset	1958	gY := hwRound(Gear^.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1959	// 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	1960	if not sticky then
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1961	begin
3640 54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1962	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	1963	begin
54676a34b9ad Reduce calls to expensive operations in fire. Slightly alters fire behaviour, but should still be reasonable nemo parents: 3609 diff changeset	1964	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	1965	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	1966	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	1967	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	1968	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	1969	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	1970	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	1971	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	1972	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	1973	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	1974	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	1975	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1976	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	1977	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	1978	//DrawExplosion(gX, gY, 4);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	1979
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	1980	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	1981	for i:= Random(2) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1982	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	1983
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	1984	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	1985	dec(Gear^.Health);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1986	Gear^.Timer := 450 - Gear^.Tag * 8
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1987	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1988	else
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1989	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1990	// Modified fire
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1991	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	1992	begin
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	1993	DrawExplosion(gX, gY, 4);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1994
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	1995	for i:= Random(3) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1996	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	1997	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1998
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	1999	// 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	2000	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	2001	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	2002	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	2003	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	2004	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2005	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2006	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	2007	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2008	gX := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2009	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	2010	if not sticky then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2011	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2012	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	2013	for i:= Random(2) downto 0 do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2014	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	2015	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2016	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	2017	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	2018	AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2019
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2020	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	2021	end;
79 29b477319854 - New test map unc0rr parents: 78 diff changeset	2022	end;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2023
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2024	////////////////////////////////////////////////////////////////////////////////
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2025	procedure doStepFirePunchWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2026	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2027	HHGear: PGear;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2028	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2029	AllInactive := false;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2030	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	2031	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2032	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2033	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2034	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2035	end;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2036
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2037	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2038	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	2039	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2040	Gear^.Tag := hwRound(HHGear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2041	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	2042	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2043	Gear^.Y := HHGear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2044	AmmoShove(Gear, 30, 40);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2045	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	2046	end;
351 29bc9c36ad5f Fixed-point arithmetics in engine. unc0rr parents: 346 diff changeset	2047
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2048	HHGear^.dY := HHGear^.dY + cGravity;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2049	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	2050	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2051	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2052	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2053	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2054	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2055	end;
2089 a08758aed76a Prevent unc0rr's sneaky escape nemo parents: 2087 diff changeset	2056
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2057	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	2058	lfIndestructible) then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2059	HHGear^.Y := HHGear^.Y + HHGear^.dY
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2060	end;
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2061
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2062	procedure doStepFirePunch(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2063	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2064	HHGear: PGear;
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2065	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2066	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2067	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2068	DeleteCI(HHGear);
6156 baf30b1a7a75 lolwut nemo parents: 6155 diff changeset	2069	//HHGear^.X := int2hwFloat(hwRound(HHGear^.X)) - _0_5; WTF?
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2070	HHGear^.dX := SignAs(cLittle, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2071
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2072	HHGear^.dY := - _0_3;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2073
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2074	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2075	Gear^.dX := SignAs(_0_45, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2076	Gear^.dY := - _0_9;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2077	Gear^.doStep := @doStepFirePunchWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2078	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	2079
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2080	PlaySoundV(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack)
82 2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2081	end;
2f4f3236cccc - New fort unc0rr parents: 81 diff changeset	2082
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2083	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2084
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2085	procedure doStepParachuteWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2086	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2087	HHGear: PGear;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2088	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2089	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2090
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2091	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2092
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	2093	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	2094	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	2095	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	2096	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	2097	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2098	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	2099	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2100	Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2101	SetLittle(dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2102	dY := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2103	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	2104	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2105	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2106	isCursorVisible := false;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	2107	ApplyAmmoChanges(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2108	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2109	end;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2110
4774 d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2111	HHGear^.X := HHGear^.X + cWindSpeed * 200;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2112
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2113	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	2114	HHGear^.X := HHGear^.X - cMaxWindSpeed * 80
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2115
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2116	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	2117	HHGear^.X := HHGear^.X + cMaxWindSpeed * 80;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2118
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2119	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	2120	HHGear^.Y := HHGear^.Y - cGravity * 40
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2121
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2122	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	2123	HHGear^.Y := HHGear^.Y + cGravity * 40;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2124
4774 d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2125	// don't drift into obstacles
d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2126	if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
d81c6e14416d fix parachute wall climbing bug sheepluva parents: 4758 diff changeset	2127	HHGear^.X := HHGear^.X - int2hwFloat(hwSign(HHGear^.dX));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2128	HHGear^.Y := HHGear^.Y + cGravity * 100;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2129	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2130	Gear^.Y := HHGear^.Y
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2131	end;
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2132
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2133	procedure doStepParachute(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2134	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2135	HHGear: PGear;
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2136	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2137	HHGear := Gear^.Hedgehog^.Gear;
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	DeleteCI(HHGear);
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	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2142
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2143	HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked or gstMoving));
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2144	HHGear^.Message := HHGear^.Message and (not gmAttack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2145
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2146	Gear^.doStep := @doStepParachuteWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2147
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2148	Gear^.Message := HHGear^.Message;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2149	doStepParachuteWork(Gear)
929 9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2150	end;
9456e1e77369 - Continue preparation for implementing attack from rope and parachute unc0rr parents: 928 diff changeset	2151
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2152	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2153	procedure doStepAirAttackWork(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2154	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2155	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2156	Gear^.X := Gear^.X + cAirPlaneSpeed * Gear^.Tag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2157
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2158	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	2159	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2160	dec(Gear^.Health);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2161	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	2162	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	2163	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	2164	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	2165	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	2166	//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	2167	// Gear^.Tag, _0, 5000);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2168	end;
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2169	Gear^.dX := Gear^.dX + int2hwFloat(30 * Gear^.Tag);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2170	StopSoundChan(Gear^.SoundChannel, 4000);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2171	end;
1124 1636a3c7c061 - Airplane is higher unc0rr parents: 1123 diff changeset	2172
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2173	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2174	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2175
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	2176	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	2177	begin
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2178	// avoid to play forever (is this necessary?)
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2179	StopSoundChan(Gear^.SoundChannel);
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2180	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	2181	end;
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2182	end;
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2183
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2184	procedure doStepAirAttack(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2185	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2186	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2187
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2188	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	2189	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2190	Gear^.Tag := 1;
5067 57101536cf86 fix for Issue 207: To far left for Napalm (and other weapons) sheepluva parents: 5063 diff changeset	2191	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	2192	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2193	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2194	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2195	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	2196	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	2197	end;
1507 d18c67b7ad4c Quick and dirty napalm implementation unc0rr parents: 1505 diff changeset	2198
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2199	Gear^.Y := int2hwFloat(topY-300);
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2200	Gear^.dX := int2hwFloat(Gear^.Target.X - 5 * Gear^.Tag * 15);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2201
4778 1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2202	// 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	2203	if (Gear^.State = 2) then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2204	Gear^.dX := Gear^.dX - cBombsSpeed * Gear^.Tag * 900
4778 1565a553d200 have napalm strike bombs explode right over the target sheepluva parents: 4774 diff changeset	2205	// calcs for regular falling gears
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2206	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	2207	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	2208	cGravity) * Gear^.Tag;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2209
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2210	Gear^.Health := 6;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2211	Gear^.doStep := @doStepAirAttackWork;
4956 48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2212	Gear^.SoundChannel := LoopSound(sndPlane, 4000);
48e1f9a04c28 usound: added function for loops with fade in and out koda parents: 4886 diff changeset	2213
263 36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2214	end;
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2215
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2216	////////////////////////////////////////////////////////////////////////////////
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2217
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2218	procedure doStepAirBomb(Gear: PGear);
36379e6abcdd - Health tags over drowned hedgehogs unc0rr parents: 219 diff changeset	2219	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2220	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2221	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2222	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	2223	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2224	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	2225	DeleteGear(Gear);
8204 9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2226	with mobileRecord do
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2227	if (performRumble <> nil) and (not fastUntilLag) then
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	2228	performRumble(kSystemSoundID_Vibrate);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2229	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2230	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2231	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2232	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
211 558476056205 Parachute unc0rr parents: 183 diff changeset	2233	end;
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2234
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2235	////////////////////////////////////////////////////////////////////////////////
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2236
4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2237	procedure doStepGirder(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2238	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2239	HHGear: PGear;
1915 c357f5b55320 patch by nemo: unc0rr parents: 1914 diff changeset	2240	x, y, tx, ty: hwFloat;
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2241	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2242	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2243
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2244	HHGear := Gear^.Hedgehog^.Gear;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2245	tx := int2hwFloat(Gear^.Target.X);
2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2246	ty := int2hwFloat(Gear^.Target.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2247	x := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2248	y := HHGear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2249
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2250	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	2251	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	2252	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2253	PlaySound(sndDenied);
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2254	HHGear^.Message := HHGear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2255	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2256	HHGear^.State := HHGear^.State or gstHHChooseTarget;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2257	isCursorVisible := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2258	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	2259	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2260	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2261	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2262	PlaySound(sndPlaced);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2263	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2264	AfterAttack;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2265	end;
1914 aab686a4e0c5 Add sounds to girder unc0rr parents: 1909 diff changeset	2266
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2267	HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked));
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2268	HHGear^.Message := HHGear^.Message and (not gmAttack);
409 4f1841929ccc Construction tool unc0rr parents: 408 diff changeset	2269	end;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2270
e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2271	////////////////////////////////////////////////////////////////////////////////
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2272	procedure doStepTeleportAfter(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2273	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2274	HHGear: PGear;
912 acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2275	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2276	HHGear := Gear^.Hedgehog^.Gear;
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2277	doStepHedgehogMoving(HHGear);
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2278	// if not infattack mode wait for hedgehog finish falling to collect cases
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2279	if ((GameFlags and gfInfAttack) <> 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2280	or ((HHGear^.State and gstMoving) = 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2281	or (Gear^.Hedgehog^.Gear^.Damage > 0)
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2282	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	2283	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2284	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2285	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2286	end
912 acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2287	end;
acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2288
acab672fb1aa Fix collecting cases after teleportation unc0rr parents: 911 diff changeset	2289	procedure doStepTeleportAnim(Gear: PGear);
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2290	begin
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2291	if (Gear^.Hedgehog^.Gear^.Damage > 0) then
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2292	begin
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2293	DeleteGear(Gear);
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2294	AfterAttack;
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2295	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2296	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2297	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	2298	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2299	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2300	inc(Gear^.Pos);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2301	if Gear^.Pos = 11 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2302	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	2303	end;
525 ae21b8e86dd9 Teleported hedgehog picks up cases unc0rr parents: 522 diff changeset	2304	end;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2305
e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2306	procedure doStepTeleport(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2307	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2308	HHGear: PGear;
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2309	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2310	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2311
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2312	HHGear := Gear^.Hedgehog^.Gear;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2313	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	2314	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	2315	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	2316	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2317	HHGear^.Message := HHGear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2318	HHGear^.State := HHGear^.State and (not gstAttacking);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2319	HHGear^.State := HHGear^.State or gstHHChooseTarget;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2320	DeleteGear(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2321	isCursorVisible := true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2322	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	2323	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2324	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2325	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2326	DeleteCI(HHGear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2327	SetAllHHToActive;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2328	Gear^.doStep := @doStepTeleportAnim;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2329
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2330	// 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	2331	Gear^.dX := HHGear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2332	// 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	2333	HHGear^.dX.isNegative := (Gear^.X.QWordValue <> 0);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2334	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2335	Gear^.Y := HHGear^.Y;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2336	HHGear^.X := int2hwFloat(Gear^.Target.X);
2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2337	HHGear^.Y := int2hwFloat(Gear^.Target.Y);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2338	HHGear^.State := HHGear^.State or gstMoving;
7659 a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2339	Gear^.Hedgehog^.Unplaced := false;
a5cf49dc993e teleport hack fixes: sheepluva parents: 7658 diff changeset	2340	isCursorVisible := false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2341	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	2342	end;
5612 2638dec1b323 This really should have been a TPoint for consistency nemo parents: 5606 diff changeset	2343	Gear^.Target.X:= NoPointX
520 e83dfb7ffead Teleportation tool unc0rr parents: 519 diff changeset	2344	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2345
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2346	////////////////////////////////////////////////////////////////////////////////
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2347	procedure doStepSwitcherWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2348	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2349	HHGear: PGear;
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2350	hedgehog: PHedgehog;
6992 b8f3d8991e92 marked a couple of functions as inline koda parents: 6982 diff changeset	2351	State: Longword;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2352	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2353	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2354
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2355	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	2356	begin
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2357	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	2358	//Msg := Gear^.Message and (not gmSwitch);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2359	DeleteGear(Gear);
7341 d70478d265ec Fix crash when hedgehog dies while switching from it unc0rr parents: 7339 diff changeset	2360	ApplyAmmoChanges(hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2361
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2362	HHGear := CurrentHedgehog^.Gear;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	2363	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	2364	//HHGear^.Message := Msg;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2365	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2366	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2367
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2368	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	2369	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2370	HHGear := CurrentHedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2371	HHGear^.Message := HHGear^.Message and (not gmSwitch);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2372	Gear^.Message := Gear^.Message and (not gmSwitch);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2373	State := HHGear^.State;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2374	HHGear^.State := 0;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2375	HHGear^.Z := cHHZ;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2376	HHGear^.Active := false;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2377	HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2378
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2379	PlaySound(sndSwitchHog);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2380
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2381	repeat
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2382	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	2383	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	2384	(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	2385	(CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Effects[heFrozen]=0);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2386
7270 93e92e82d5c8 Step 1. Add current hedgehog as top bit of bottom byte. nemo parents: 7268 diff changeset	2387	SwitchCurrentHedgehog(@CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog]);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2388	AmmoMenuInvalidated:= true;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2389
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2390	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2391	HHGear^.State := State;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2392	HHGear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2393	FollowGear := HHGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2394	HHGear^.Z := cCurrHHZ;
7400 09427dbec1d8 Fix TARDIS, make switcher work w/ the new more stringent check. nemo parents: 7399 diff changeset	2395	HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2396	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2397	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	2398	end;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2399	end;
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2400
92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2401	procedure doStepSwitcher(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2402	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2403	HHGear: PGear;
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2404	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2405	Gear^.doStep := @doStepSwitcherWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2406
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2407	HHGear := Gear^.Hedgehog^.Gear;
5358 e2201f71beac call onusedammo earlier for switcher nemo parents: 5355 diff changeset	2408	OnUsedAmmo(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2409	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	2410	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2411	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2412	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	2413	end
534 92fb2b0d5117 - Fix some bugs unc0rr parents: 525 diff changeset	2414	end;
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2415
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2416	////////////////////////////////////////////////////////////////////////////////
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2417	procedure doStepMortar(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2418	var
8413 454191defee6 restore former cluster behaviour (makes the most diff for the bomb) nemo parents: 8370 diff changeset	2419	dX, dY, gdX, gdY: hwFloat;
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2420	i: LongInt;
227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2421	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2422	AllInactive := false;
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2423	gdX := Gear^.dX;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2424	gdY := Gear^.dY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2425
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2426	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2427	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	2428	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2429	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	2430	gdX.isNegative := not gdX.isNegative;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2431	gdY.isNegative := not gdY.isNegative;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2432	gdX:= gdX*_0_2;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2433	gdY:= gdY*_0_2;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2434
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2435	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	2436	begin
8945 145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2437	dX := gdX + rndSign(GetRandomf) * _0_03;
145bf64a9579 this should improve consistency of mortar cluster spread and snowball knocks nemo parents: 8934 diff changeset	2438	dY := gdY + rndSign(GetRandomf) * _0_03;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2439	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	2440	end;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	2441
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2442	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2443	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2444	end;
963 5f8bb3470563 Fix mortar clusters spread direction unc0rr parents: 945 diff changeset	2445
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2446	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2447	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
924 227f9fcdc2f4 Initial implementation of mortar unc0rr parents: 919 diff changeset	2448	end;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2449
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2450	////////////////////////////////////////////////////////////////////////////////
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2451	procedure doStepKamikazeWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2452	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2453	i: LongWord;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2454	HHGear: PGear;
5866 9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2455	sparkles: PVisualGear;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2456	hasWishes: boolean;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2457	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2458	AllInactive := false;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2459	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	2460	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	2461	Gear^.AdvBounce:= 1;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2462
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2463	HHGear := Gear^.Hedgehog^.Gear;
7958 c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2464	if HHGear = nil then
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2465	begin
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2466	DeleteGear(Gear);
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2467	exit
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2468	end;
c031c3e2eb2a Fix crash in kamikaze unc0rr parents: 7874 diff changeset	2469
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2470	HHGear^.State := HHGear^.State or gstNoDamage;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2471	DeleteCI(HHGear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2472
3852 37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2473	Gear^.X := HHGear^.X;
37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2474	Gear^.Y := HHGear^.Y;
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2475	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	2476	begin
9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2477	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	2478	if sparkles <> nil then
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2479	begin
82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2480	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	2481	sparkles^.Angle:= random(360);
5924 82fc26c53d2a Tweak sparkles, glass. Left glass commented out in case he prefers old behaviour. nemo parents: 5922 diff changeset	2482	end
5866 9017a0ff4201 aaaallways, I want to beeee with you, and make belieeeeve with you nemo parents: 5841 diff changeset	2483	end;
3852 37f883cc7edb Fix kamikaze portal loop nemo parents: 3851 diff changeset	2484
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2485	i := 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2486	repeat
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2487
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2488	Gear^.X := Gear^.X + HHGear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2489	Gear^.Y := Gear^.Y + HHGear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2490	HHGear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2491	HHGear^.Y := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2492
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2493	inc(Gear^.Damage, 2);
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	// if TestCollisionXwithGear(HHGear, hwSign(Gear^.dX))
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2496	// or TestCollisionYwithGear(HHGear, hwSign(Gear^.dY)) then inc(Gear^.Damage, 3);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2497
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2498	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	2499	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	2500	or (Gear^.Damage > Gear^.Health);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2501
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2502	inc(upd);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2503	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	2504	begin
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2505	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	2506	begin
5913 1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2507	if Gear^.AdvBounce <> 0 then
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2508	Gear^.Pos := 3
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2509	else
1791f776b726 fix and optimize kamikaze's png sheepluva parents: 5896 diff changeset	2510	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	2511	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2512
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2513	AmmoShove(Gear, 30, 40);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2514
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2515	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	2516	HHGear^.Y - _2 - HHGear^.dY * 10 + hwAbs(HHGear^.dY) * 2,
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2517	HHGear^.dX,
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2518	HHGear^.dY,
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2519	20 + cHHRadius * 2,
6130 026fd01a5e2c Blend the outter side too nemo parents: 6126 diff changeset	2520	cHHRadius * 2 + 7);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2521
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2522	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	2523	end;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2524
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2525	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	2526	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2527	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	2528	if hasWishes then
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2529	for i:= 0 to 31 do
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2530	begin
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2531	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	2532	if sparkles <> nil then
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2533	with sparkles^ do
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2534	begin
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2535	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	2536	Angle:= random(360);
6112 7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2537	dx:= 0.001 * (random(200));
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2538	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	2539	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	2540	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2541	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	2542	dy := -dy;
6112 7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2543	FrameTicks:= random(400) + 250
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2544	end
7839a2ae90ae Restrict slipperiness to girders and bridges. Make girders more obviously ice. nemo parents: 6092 diff changeset	2545	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2546	AfterAttack;
7395 d0d38cd0d27c - Check for harmful gear deletions unc0rr parents: 7394 diff changeset	2547	HHGear^.Message:= HHGear^.Message or gmDestroy;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2548	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2549	end
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2550	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2551	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2552	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2553	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	2554	end
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2555	end;
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2556
987 0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2557	procedure doStepKamikazeIdle(Gear: PGear);
0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2558	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2559	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2560	dec(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2561	if Gear^.Timer = 0 then
5922 7e7774e7be8c moar sparkles :3 sheepluva parents: 5913 diff changeset	2562	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2563	Gear^.Pos := 1;
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2564	PlaySoundV(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2565	Gear^.doStep := @doStepKamikazeWork
5922 7e7774e7be8c moar sparkles :3 sheepluva parents: 5913 diff changeset	2566	end
987 0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2567	end;
0fcd3fadda41 Use kamiakze sprite unc0rr parents: 984 diff changeset	2568
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2569	procedure doStepKamikaze(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2570	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2571	HHGear: PGear;
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2572	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2573	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2574
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2575	HHGear := Gear^.Hedgehog^.Gear;
3454 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	HHGear^.dX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2578	HHGear^.dY := Gear^.dY;
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^.dX := SignAs(_0_45, Gear^.dX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2581	Gear^.dY := - _0_9;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2582
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2583	Gear^.Timer := 550;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2584
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2585	Gear^.doStep := @doStepKamikazeIdle
984 dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2586	end;
dd5f16f69926 Kamikaze weapon unc0rr parents: 980 diff changeset	2587
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2588	////////////////////////////////////////////////////////////////////////////////
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2589
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2590	const cakeh = 27;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2591	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2592	CakePoints: array[0..Pred(cakeh)] of record
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2593	x, y: hwFloat;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2594	end;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2595	CakeI: Longword;
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2596
1110 3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2597	procedure doStepCakeExpl(Gear: PGear);
3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2598	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2599	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2600
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2601	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	2602	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	2603	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2604
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2605	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	2606	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2607	DeleteGear(Gear)
1110 3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2608	end;
3660bbfc1cba Finish cake implementation unc0rr parents: 1109 diff changeset	2609
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2610	procedure doStepCakeDown(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2611	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2612	gi: PGear;
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2613	dmg, dmgBase: LongInt;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2614	fX, fY, tdX, tdY: hwFloat;
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2615	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2616	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2617
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2618	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	2619	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	2620	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2621	Gear^.Tag := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2622
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2623	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	2624	begin
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2625	///////////// adapted from doMakeExplosion ///////////////////////////
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2626	//fX:= Gear^.X;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2627	//fY:= Gear^.Y;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2628	//fX.QWordValue:= fX.QWordValue and $FFFFFFFF00000000;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2629	//fY.QWordValue:= fY.QWordValue and $FFFFFFFF00000000;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2630	fX:= int2hwFloat(hwRound(Gear^.X));
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2631	fY:= int2hwFloat(hwRound(Gear^.Y));
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2632	dmgBase:= cakeDmg shl 1 + cHHRadius div 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2633	gi := GearsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2634	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	2635	begin
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2636	if gi^.Kind = gtHedgehog then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2637	begin
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2638	dmg:= 0;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2639	tdX:= gi^.X-fX;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2640	tdY:= gi^.Y-fY;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2641	if hwRound(hwAbs(tdX)+hwAbs(tdY)) < dmgBase then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2642	dmg:= dmgBase - max(hwRound(Distance(tdX, tdY)),gi^.Radius);
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2643	if (dmg > 1) then dmg:= ModifyDamage(min(dmg div 2, cakeDmg), gi);
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2644	if (dmg > 1) then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2645	if (CurrentHedgehog^.Gear = gi) and (not gi^.Invulnerable) then
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2646	gi^.State := gi^.State or gstLoser
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2647	else
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2648	gi^.State := gi^.State or gstWinner;
8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2649	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2650	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	2651	end;
6765 8fcd2508c49f bug #336 nemo parents: 6761 diff changeset	2652	//////////////////////////////////////////////////////////////////////
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2653	Gear^.doStep := @doStepCakeExpl;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2654	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	2655	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2656	else dec(Gear^.Pos)
1109 87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2657	end;
87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2658
87c44c14fdd4 - Cake sits down before exploding unc0rr parents: 1108 diff changeset	2659
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2660	procedure doStepCakeWork(Gear: PGear);
7370 d50b874e7ee8 Introduce uGearsHandlers.pas, for now only part of cake handlers is moved there unc0rr parents: 7341 diff changeset	2661	var
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2662	tdx, tdy: hwFloat;
1088 9702e17146e6 Stubs for spider weapon unc0rr parents: 1066 diff changeset	2663	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2664	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2665
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2666	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	2667	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	2668	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2669
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	2670	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	2671	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	2672	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	2673	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	2674	// 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	2675	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	2676	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	2677	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	2678	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	2679	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	2680	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	2681	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	2682
7370 d50b874e7ee8 Introduce uGearsHandlers.pas, for now only part of cake handlers is moved there unc0rr parents: 7341 diff changeset	2683	cakeStep(Gear);
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2684
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2685	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	2686	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2687	CakeI := (CakeI + 1) mod cakeh;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2688	tdx := CakePoints[CakeI].x - Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2689	tdy := - CakePoints[CakeI].y + Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2690	CakePoints[CakeI].x := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2691	CakePoints[CakeI].y := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2692	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	2693	end;
1088 9702e17146e6 Stubs for spider weapon unc0rr parents: 1066 diff changeset	2694	end;
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2695
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2696	procedure doStepCakeUp(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2697	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2698	i: Longword;
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2699	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2700	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2701
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2702	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	2703	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	2704	exit;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2705	Gear^.Tag := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2706
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2707	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	2708	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2709	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	2710	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2711	CakePoints[i].x := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2712	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	2713	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2714	CakeI := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2715	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	2716	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2717	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2718	inc(Gear^.Pos)
1103 1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2719	end;
1ff3db3c12af Show cake rotated correct angle unc0rr parents: 1090 diff changeset	2720
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2721	procedure doStepCakeFall(Gear: PGear);
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2722	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2723	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2724
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2725	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	2726	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	2727	Gear^.doStep := @doStepCakeUp
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2728	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	2729	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2730	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	2731	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	2732	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	2733	end
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2734	end;
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2735
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2736	procedure doStepCake(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2737	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2738	HHGear: PGear;
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2739	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2740	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2741
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	2742	HHGear := Gear^.Hedgehog^.Gear;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	2743	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	2744	Gear^.CollisionMask:= lfNotCurrentMask;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2745
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2746	FollowGear := Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2747
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2748	Gear^.doStep := @doStepCakeFall
1089 24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2749	end;
24e9e1ca0394 First implementation of the Cake weapon unc0rr parents: 1088 diff changeset	2750
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2751	////////////////////////////////////////////////////////////////////////////////
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2752	procedure doStepSeductionWork(Gear: PGear);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	2753	var i: LongInt;
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2754	hogs: PGearArrayS;
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2755	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2756	AllInactive := false;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2757	hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Radius);
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2758	if hogs.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2759	begin
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2760	for i:= 0 to hogs.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2761	with hogs.ar^[i]^ do
5533 cf32b5928cbe exclude current hedgehog nemo parents: 5531 diff changeset	2762	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2763	if hogs.ar^[i] <> CurrentHedgehog^.Gear then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2764	begin
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2765	dX:= _50 * cGravity * (Gear^.X - X) / _25;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2766	dY:= -_450 * cGravity;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2767	Active:= true;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2768	end
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	2769	end;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2770	end ;
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2771	AfterAttack;
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2772	DeleteGear(Gear);
5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2773	(*
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2774	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2775	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2776	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2777	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2778
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2779	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	2780	if (Land[y, x] <> 0) then
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2781	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2782	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2783	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2784	Gear^.dX := Gear^.dX * _1_5;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2785	Gear^.dY := Gear^.dY * _1_5 - _0_3;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2786	AmmoShove(Gear, 0, 40);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2787	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2788	DeleteGear(Gear)
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2789	end
f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2790	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2791	else
4578 f3cf226fad16 Snowball weapon nemo parents: 4473 diff changeset	2792	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2793	AfterAttack;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2794	DeleteGear(Gear)
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2795	end*)
1286 a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2796	end;
a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2797
a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2798	procedure doStepSeductionWear(Gear: PGear);
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2799	var heart: PVisualGear;
1286 a02a5345b91e Seduction animation unc0rr parents: 1284 diff changeset	2800	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2801	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2802	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2803	if Gear^.Timer > 250 then
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2804	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2805	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2806	inc(Gear^.Pos);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2807	if Gear^.Pos = 5 then
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2808	PlaySoundV(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2809	end;
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2810
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	2811	if (Gear^.Pos = 14) and (RealTicks and $3 = 0) then
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2812	begin
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2813	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	2814	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	2815	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	2816	begin
4f42009237df For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same nemo parents: 5563 diff changeset	2817	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	2818	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	2819	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	2820	dx := -dx;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2821	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	2822	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	2823	FrameTicks:= random(750) + 1000;
5748 70d7f8e40f53 Just for fun. Flowers! Also, use a less blatant image in ammo menu. nemo parents: 5738 diff changeset	2824	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	2825	end;
5562 8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2826	end;
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2827
8056d82b4d23 Seduction animation. New visual gear type. nemo parents: 5533 diff changeset	2828	if Gear^.Pos = 15 then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2829	Gear^.doStep := @doStepSeductionWork
1259 0c660c3d98a4 - Continue seduction implementation unc0rr parents: 1207 diff changeset	2830	end;
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2831
21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2832	procedure doStepSeduction(Gear: PGear);
21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2833	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2834	AllInactive := false;
5525 5fb06333314e Experimental area-of-effect Seduction nemo parents: 5515 diff changeset	2835	//DeleteCI(Gear^.Hedgehog^.Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2836	Gear^.doStep := @doStepSeductionWear
1284 21916b5de218 - Update Italian translation unc0rr parents: 1279 diff changeset	2837	end;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2838
18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2839	////////////////////////////////////////////////////////////////////////////////
18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2840	procedure doStepWaterUp(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2841	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2842	i: LongWord;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2843	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2844	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	2845	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	2846	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2847	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2848	exit
4153 6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2849	end;
6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2850
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2851	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2852
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2853	inc(Gear^.Timer);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2854	if Gear^.Timer = 17 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2855	Gear^.Timer := 0
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2856	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2857	exit;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2858
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2859	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	2860	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2861	dec(cWaterLine);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2862	for i:= 0 to LAND_WIDTH - 1 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2863	Land[cWaterLine, i] := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2864	SetAllToActive
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2865	end;
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2866
4153 6bd94e4c5d65 2 more variables to control water rise and health loss during sudden death. henek parents: 4135 diff changeset	2867	dec(Gear^.Tag);
1298 18fdc25fe65d - Fix water rise unc0rr parents: 1297 diff changeset	2868	end;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2869
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2870	////////////////////////////////////////////////////////////////////////////////
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2871	procedure doStepDrill(Gear: PGear);
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2872	forward;
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2873
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2874	procedure doStepDrillDrilling(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2875	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2876	t: PGearArray;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2877	tempColl: Word;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2878	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2879	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	2880	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	2881	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	2882	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	2883	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	2884	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	2885
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	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	2887	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	2888	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	2889	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	2890	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	2891	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	2892	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	2893	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	2894	exit
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2895	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	2896
8564 dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2897	tempColl:= Gear^.CollisionMask;
dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2898	Gear^.CollisionMask:= $007F;
dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2899	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	2900	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	2901	else t := nil;
8564 dadfda4ba248 prevent drilling into hogs w/ drill rocket nemo parents: 8501 diff changeset	2902	Gear^.CollisionMask:= tempColl;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2903	//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	2904
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2905	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	2906	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	2907	// 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	2908	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	2909	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2910	//out of time or exited ground
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2911	StopSoundChan(Gear^.SoundChannel);
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2912	if (Gear^.State and gsttmpFlag) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2913	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	2914	else
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2915	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	2916	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2917	exit
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2918	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2919
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	2920	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	2921	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	2922	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	2923	Gear^.Tag := 1;
4758 73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2924	Gear^.doStep := @doStepDrill
73aef6a577ba drill strike falling instead of exploding when exiting ground Henek parents: 4708 diff changeset	2925	end;
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2926
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2927	dec(Gear^.Timer);
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2928	end;
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2929
cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2930	procedure doStepDrill(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2931	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2932	t: PGearArray;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2933	oldDx, oldDy: hwFloat;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	2934	t2: hwFloat;
1573 cf88e0ace609 Drill rocket unc0rr parents: 1555 diff changeset	2935	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2936	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2937
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2938	if (Gear^.State and gsttmpFlag) = 0 then
d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2939	Gear^.dX := Gear^.dX + cWindSpeed;
d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2940
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2941	oldDx := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2942	oldDy := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2943
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2944	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2945
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2946	if (GameTicks and $3F) = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2947	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2948
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2949	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	2950	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2951	//hit
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2952	Gear^.dX := oldDx;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2953	Gear^.dY := oldDy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2954
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2955	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	2956	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	2957	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2958	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	2959	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	2960	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2961	//hit the ground not the HH
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2962	t2 := _0_5 / Distance(Gear^.dX, Gear^.dY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2963	Gear^.dX := Gear^.dX * t2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2964	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	2965	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2966
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	2967	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	2968	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2969	//explode right on contact with HH
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	2970	if (Gear^.State and gsttmpFlag) <> 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2971	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	2972	else
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	2973	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	2974	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2975	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	2976	end;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	2977
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2978	Gear^.SoundChannel := LoopSound(sndDrillRocket);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	2979	Gear^.doStep := @doStepDrillDrilling;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2980
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	2981	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	2982	gear^.RenderTimer:= true;
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2983	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	2984	end
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2985	else if ((Gear^.State and gsttmpFlag) <> 0) and (Gear^.Tag <> 0) then
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2986	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2987	if Gear^.Timer > 0 then
7325 a68eca3ad1fe Tiny optimization + formatting fix unc0rr parents: 7310 diff changeset	2988	dec(Gear^.Timer)
a68eca3ad1fe Tiny optimization + formatting fix unc0rr parents: 7310 diff changeset	2989	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	2990	begin
6761 e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2991	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound);
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2992	DeleteGear(Gear);
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2993	end
e95f7509a5c5 Avoid rare double decrement. nemo parents: 6754 diff changeset	2994	end;
1590 646d56eacb8f - Refactor drill rocket unc0rr parents: 1586 diff changeset	2995	end;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	2996
1633 c1de4078b0fd Drill rocket patch unc0rr parents: 1631 diff changeset	2997	////////////////////////////////////////////////////////////////////////////////
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	2998	procedure doStepBallgunWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	2999	var
7296 fb5b7cb58a67 er. this one too nemo parents: 7293 diff changeset	3000	HHGear, ball: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3001	rx, ry: hwFloat;
3143 682bc7f99c63 * tweaked some random stuff in GSHandlers.inc sheepluva parents: 3139 diff changeset	3002	gX, gY: LongInt;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3003	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3004	AllInactive := false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3005	dec(Gear^.Timer);
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3006	HHGear := Gear^.Hedgehog^.Gear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3007	HedgehogChAngle(HHGear);
3484 3c65b1d979cd Engine: smxx parents: 3483 diff changeset	3008	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
3c65b1d979cd Engine: smxx parents: 3483 diff changeset	3009	gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3010	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	3011	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3012	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3013	ry := rndSign(getRandomf * _0_1);
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	3014
7296 fb5b7cb58a67 er. this one too nemo parents: 7293 diff changeset	3015	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	3016	ball^.CollisionMask:= lfNotCurrentMask;
2376 ece7b87f1334 Strip trailing spaces nemo parents: 2367 diff changeset	3017
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3018	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	3019	end;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3020
7195 9e6e8e5a4c2e Check for gstHHDriven instead of damage check, so ballgun stops when turn ends in multiattack mode unc0rr parents: 7170 diff changeset	3021	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	3022	begin
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3023	DeleteGear(Gear);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3024	AfterAttack
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3025	end
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3026	end;
0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3027
0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3028	procedure doStepBallgun(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3029	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3030	HHGear: PGear;
1601 0cff69c8c4cf Ballsgun unc0rr parents: 1590 diff changeset	3031	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3032	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3033	HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown));
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3034	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3035	Gear^.doStep := @doStepBallgunWork
1633 c1de4078b0fd Drill rocket patch unc0rr parents: 1631 diff changeset	3036	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3037
1696 bb1e305320a1 rc plane falls down when looses control unc0rr parents: 1689 diff changeset	3038	////////////////////////////////////////////////////////////////////////////////
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3039	procedure doStepRCPlaneWork(Gear: PGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3040
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3041	const cAngleSpeed = 3;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3042	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3043	HHGear: PGear;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3044	i: LongInt;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3045	dX, dY: hwFloat;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3046	fChanged: boolean;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3047	trueAngle: Longword;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3048	t: PGear;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3049	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3050	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3051
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3052	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3053	FollowGear := Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3054
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3055	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	3056	dec(Gear^.Timer);
4886 e3e5362a308e fixed unlimeted fuel bug for rcplane Henek parents: 4881 diff changeset	3057
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3058	fChanged := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3059	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	3060	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3061	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	3062	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	3063	dec(Gear^.Angle)
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3064	else if Gear^.Angle < 2048 then
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3065	inc(Gear^.Angle)
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3066	else fChanged := false
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2944 diff changeset	3067	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3068	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3069	begin
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3070	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	3071	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3072	fChanged := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3073	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	3074	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3075
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3076	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	3077	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3078	fChanged := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3079	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	3080	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3081	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3082
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3083	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	3084	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3085	Gear^.dX.isNegative := (Gear^.Angle > 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3086	if Gear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3087	trueAngle := 4096 - Gear^.Angle
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3088	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3089	trueAngle := Gear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3090
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3091	Gear^.dX := SignAs(AngleSin(trueAngle), Gear^.dX) * _0_25;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3092	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	3093	end;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3094
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3095	Gear^.X := Gear^.X + Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3096	Gear^.Y := Gear^.Y + Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3097
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3098	if (GameTicks and $FF) = 0 then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3099	if Gear^.Timer < 3500 then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3100	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace)
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3101	else
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3102	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3103
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3104	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	3105	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3106	HHGear^.Message := HHGear^.Message and (not gmAttack);
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3107	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	3108	_0_5, 0);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3109	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	3110	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3111
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3112	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	3113	begin
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3114	Gear^.State := Gear^.State or gsttmpFlag;
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3115	PauseMusic;
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3116	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	3117	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3118
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3119	// pickup bonuses
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3120	t := CheckGearNear(Gear, gtCase, 36, 36);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3121	if t <> nil then
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3122	PickUp(HHGear, t);
7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3123
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3124	CheckCollision(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3125
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3126	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	3127	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	3128	StopSoundChan(Gear^.SoundChannel);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3129	StopSound(sndRideOfTheValkyries);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3130	ResumeMusic;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3131
4808 7c3e5b52344a remove obsolete TrainingFlags code koda parents: 4805 diff changeset	3132	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	3133	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	3134	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 25, Gear^.Hedgehog, EXPLAutoSound);
5228 b018f6117fc1 Nerf RC a bit nemo parents: 5221 diff changeset	3135	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	3136	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3137	dX := AngleCos(i * 64) * _0_5 * (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	3138	dY := AngleSin(i * 64) * _0_5 * (GetRandomf + _1);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3139	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	3140	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	3141	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3142	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	3143	end;
1713 194ed95f9e8d Hedgehog is also sad when rcplane is drawning unc0rr parents: 1712 diff changeset	3144
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3145	AfterAttack;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3146	CurAmmoGear := nil;
5016 9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3147	if (GameFlags and gfInfAttack) = 0 then
9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3148	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3149	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	3150	TagTurnTimeLeft:= TurnTimeLeft;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3151
5016 9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3152	TurnTimeLeft:= 14 * 125;
9347d82a26cc added game mode Tag Team, mostly untested, please test :) Henek parents: 5013 diff changeset	3153	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3154
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3155	HHGear^.Message := 0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3156	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	3157	end
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3158	end;
3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3159
3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3160	procedure doStepRCPlane(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3161	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3162	HHGear: PGear;
1689 3d0eee01f734 RC Plane unc0rr parents: 1669 diff changeset	3163	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3164	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3165	HHGear^.Message := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3166	HHGear^.State := HHGear^.State or gstNotKickable;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3167	Gear^.Angle := HHGear^.Angle;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3168	Gear^.Tag := hwSign(HHGear^.dX);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3169
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3170	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	3171	Gear^.Angle := 4096 - Gear^.Angle;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3172	Gear^.doStep := @doStepRCPlaneWork
1712 f5b916de40f0 Patch by nemo (polished by me) unc0rr parents: 1708 diff changeset	3173	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	3174
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	3175	////////////////////////////////////////////////////////////////////////////////
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	3176	procedure doStepJetpackWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3177	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3178	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	3179	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	3180	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	3181	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	3182	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	3183	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	3184	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	3185	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	3186	dec(Gear^.Pos);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3187	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3188	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3189	//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	3190	move := _0_2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3191	fuel := 50;
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3192	(*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	3193	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	3194	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	3195	fuel:= 5;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3196	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	3197
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	3198	if Gear^.Health > 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	3199	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	3200	if (HHGear^.Message and gmUp) <> 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	3201	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	3202	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	3203	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	3204	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	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	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	3207	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	3208	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	3209	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	3210	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	3211	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	3212	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	3213	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	3214	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	3215	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	3216	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	3217	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	3218	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	3219	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	3220	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	3221	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	3222	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	3223	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	3224	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	3225	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	3226	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	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	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	3229	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	3230	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	3231	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	3232	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	3233	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	3234	bubble^.X := bubble^.X + 28;
4187 adb144a907aa remove last warnings from xcodeproj koda parents: 4184 diff changeset	3235	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	3236	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	3237	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	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	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	3240	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	3241	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	3242	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	3243	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	3244	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	3245	end;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3246
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3247	// erases them all at once :-/
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3248	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	3249	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3250	Gear^.Timer := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3251	Gear^.MsgParam := 0
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3252	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3253
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3254	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	3255	Gear^.Health := 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3256
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3257	i:= Gear^.Health div 20;
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	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	3260	begin
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	3261	Gear^.Damage:= i;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3262	//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	3263	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	3264	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	3265	end;
2182 ed7e7eb3f9ed Ugly graphic for jetpack - jetpack should be essentially functional. nemo parents: 2181 diff changeset	3266
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3267	if HHGear^.Message and (gmAttack or gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3268	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	3269
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3270	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	3271	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3272
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3273	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3274	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	3275
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3276	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	3277	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	3278	HHGear^.dY.isNegative:= false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3279
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3280	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	3281	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	3282	doStepHedgehogMoving(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3283
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	3284	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	3285	(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	3286	//or CheckGearDrowning(HHGear)
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	3287	or (cWaterLine + 512 < hwRound(HHGear^.Y))
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	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	3289	// 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	3290	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	3291	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	3292	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3293	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	3294	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3295	Message := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3296	Active := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3297	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	3298	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3299	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3300	isCursorVisible := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3301	ApplyAmmoChanges(HHGear^.Hedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3302	// if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3303
2619 bc2786a00fb8 fix wrong ttf blending in ppc koda parents: 2608 diff changeset	3304	// 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	3305
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3306	//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	3307	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	3308	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	3309
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	3310	procedure doStepJetpack(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3311	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3312	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	3313	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	3314	Gear^.Pos:= 0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3315	Gear^.doStep := @doStepJetpackWork;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3316
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	3317	HHGear := Gear^.Hedgehog^.Gear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3318	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	3319	AfterAttack;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3320	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	3321	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3322	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3323	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	3324
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3325	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	3326	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3327	Gear^.State := Gear^.State or gsttmpFlag;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3328	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	3329	end
2301 7a4ad0772c88 minor saucer change Tiy had requested once. nemo parents: 2283 diff changeset	3330	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	3331	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3332
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3333	////////////////////////////////////////////////////////////////////////////////
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3334	procedure doStepBirdyDisappear(Gear: PGear);
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3335	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3336	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3337	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3338	if Gear^.Timer < 2000 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3339	inc(Gear^.Timer, 1)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3340	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3341	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3342	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	3343	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3344	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3345
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3346	procedure doStepBirdyFly(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3347	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3348	HHGear: PGear;
3161 cb5f04cc9d76 - Add HH dX/dY to Birdy disappearing animation palewolf parents: 3151 diff changeset	3349	fuel, i: LongInt;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3350	move: hwFloat;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3351	begin
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3352	HHGear := Gear^.Hedgehog^.Gear;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3353	if HHGear = nil then
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3354	begin
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3355	DeleteGear(Gear);
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3356	exit
72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3357	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3358
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	3359	move := _0_2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3360	fuel := 50;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3361
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3362	if Gear^.Pos > 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3363	dec(Gear^.Pos, 1)
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3364	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	3365	Gear^.Pos := 500;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3366
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3367	if HHGear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3368	Gear^.Tag := -1
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3369	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3370	Gear^.Tag := 1;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3371
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3372	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	3373	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3374	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	3375	or (HHGear^.Y > -_256) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3376	HHGear^.dY := HHGear^.dY - move;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3377
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3378	dec(Gear^.Health, fuel);
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3379	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	3380	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3381
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3382	if (HHGear^.Message and gmLeft) <> 0 then move.isNegative := true;
9abce5468583 Engine: smaxx parents: 3852 diff changeset	3383	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	3384	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	3385	HHGear^.dX := HHGear^.dX + (move * _0_1);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3386	dec(Gear^.Health, fuel div 5);
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3387	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	3388	end;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3389
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3390	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	3391	Gear^.Health := 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3392
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3393	if ((GameTicks and $FF) = 0) and (Gear^.Health < 500) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3394	for i:= ((500-Gear^.Health) div 250) downto 0 do
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3395	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFeather);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3396
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	3397	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	3398	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3399	HHGear^.Message := HHGear^.Message and (not gmAttack);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3400	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	3401	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	3402	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	3403	PlaySound(sndBirdyLay);
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3404	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	3405	end;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3406	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3407
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	3408	if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3409	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	3410
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3411	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	3412	HHGear^.State := HHGear^.State or gstMoving;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3413
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3414	Gear^.X := HHGear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3415	Gear^.Y := HHGear^.Y - int2hwFloat(32);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3416	// 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	3417	// this is probably not needed anymore
cdd3d8c723ec Update changelog, comment on possibly redundant lines in GSHandlers nemo parents: 6314 diff changeset	3418	if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3419
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3420	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	3421	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	3422	doStepHedgehogMoving(HHGear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3423
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3424	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	3425	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	3426	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	3427	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	3428	// 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	3429	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	3430	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	3431	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3432	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	3433	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3434	Message := 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3435	Active := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3436	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	3437	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3438	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	3439	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	3440	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3441	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	3442	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	3443	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3444	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	3445	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	3446	CurAmmoGear := nil;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3447	isCursorVisible := false;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3448	AfterAttack;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3449	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3450	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3451
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3452	procedure doStepBirdyDescend(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3453	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3454	HHGear: PGear;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3455	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3456	if Gear^.Timer > 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3457	dec(Gear^.Timer, 1)
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3458	else if Gear^.Hedgehog^.Gear = nil then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3459	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3460	DeleteGear(Gear);
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3461	AfterAttack;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3462	exit
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3463	end;
6154 72c6239a7cc6 Fix birdy flight bug nemo parents: 6131 diff changeset	3464	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3465	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	3466	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	3467	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3468	if Gear^.Timer = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3469	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	3470	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3471	else if Gear^.Timer = 0 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3472	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3473	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	3474	HHGear^.dY := -_0_2
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3475	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3476	end;
25b6b554c516 Engine: smxx parents: 2982 diff changeset	3477
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3478	procedure doStepBirdyAppear(Gear: PGear);
08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3479	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3480	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3481	if Gear^.Timer < 2000 then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3482	inc(Gear^.Timer, 1)
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3483	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3484	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3485	Gear^.Timer := 500;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3486	Gear^.dX := _0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3487	Gear^.dY := _0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3488	Gear^.State := Gear^.State and (not gstAnimation);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3489	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	3490	end
3149 08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3491	end;
08c4d9670b54 Birdy appears from off-screen palewolf parents: 3146 diff changeset	3492
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3493	procedure doStepBirdy(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3494	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3495	HHGear: PGear;
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3496	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3497	gear^.State := gear^.State or gstAnimation and (not gstTmpFlag);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3498	Gear^.doStep := @doStepBirdyAppear;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3499
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3500	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	3501	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3502	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3503	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3504	end;
2995 b90745d87332 Engine: smxx parents: 2994 diff changeset	3505
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3506	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3507
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3508	if HHGear^.dX.isNegative then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3509	Gear^.Tag := -1
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3510	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3511	Gear^.Tag := 1;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3512	Gear^.Pos := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3513	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3514	FollowGear := HHGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3515	with HHGear^ do
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	3516	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3517	State := State and (not gstAttacking);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3518	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	3519	end
2983 25b6b554c516 Engine: smxx parents: 2982 diff changeset	3520	end;
3032 9c190d3c165b Insert commit message here palewolf parents: 3020 diff changeset	3521
9c190d3c165b Insert commit message here palewolf parents: 3020 diff changeset	3522	////////////////////////////////////////////////////////////////////////////////
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3523	procedure doStepEggWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3524	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3525	vg: PVisualGear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3526	i: LongInt;
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3527	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3528	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3529	Gear^.dX := Gear^.dX;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3530	doStepFallingGear(Gear);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3531	// CheckGearDrowning(Gear); // already checked for in doStepFallingGear
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3532	CalcRotationDirAngle(Gear);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3533
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3534	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	3535	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	3536	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 10, Gear^.Hedgehog, EXPLPoisoned, $C0E0FFE0);
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3537	PlaySound(sndEggBreak);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3538	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEgg);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3539	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	3540	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	3541	vg^.Frame := 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3542
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3543	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	3544	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3545	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	3546	vgtDust);
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3547	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	3548	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	3549	end;
3115 831bd0f7050d Engine: smxx parents: 3107 diff changeset	3550
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3551	DeleteGear(Gear);
831bd0f7050d Engine: smxx parents: 3107 diff changeset	3552	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3553	end;
3065 4afa5e3e27e4 Birdy egg added mbait parents: 3036 diff changeset	3554	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	3555
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	3556	////////////////////////////////////////////////////////////////////////////////
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3557	procedure doPortalColorSwitch();
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3558	var CurWeapon: PAmmo;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3559	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3560	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	3561	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	3562	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	3563	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3564	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	3565
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	3566	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	3567	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	3568	CurWeapon^.Pos := 0
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3569
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3570	else
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3571	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	3572	end;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3573	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3574
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	3575	procedure doStepPortal(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3576	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3577	iterator, conPortal: PGear;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3578	s, r, nx, ny, ox, oy, poffs, noffs, pspeed, nspeed,
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3579	resetx, resety, resetdx, resetdy: hwFloat;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3580	sx, sy, rh, resetr: LongInt;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3581	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	3582	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3583	doPortalColorSwitch();
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3584
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	3585	// 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	3586	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	3587	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	3588	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	3589	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	3590	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3591	deleteGear(Gear);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3592	EXIT;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3593	end;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3594
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3595	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	3596	or (Gear^.Health < 1) then
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3597	dec(Gear^.Timer);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3598
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3599	if Gear^.Timer < 10000 then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3600	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	3601
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	3602	// 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	3603	if (Gear^.LinkedGear = nil) then
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3604	exit;
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3605	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	3606	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	3607
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3608	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	3609
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	// check all gears for stuff to port through
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3611	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	3612	while true do
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3613	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	3614
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3615	// 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	3616	if iterator = nil then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3617	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	3618	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3619	iterator := iterator^.NextGear;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3620
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3621	// 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	3622	if iterator = nil then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3623	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	3624
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	3625	// 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	3626	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	3627	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	3628	continue;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3629
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3630	// don't port hogs on rope
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3631	// 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	3632	// 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	3633
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3634	// 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	3635	if (iterator^.Radius > Gear^.Radius) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3636	continue;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3637
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3638	// 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	3639	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	3640
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3641	// too far away?
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3642	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	3643	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	3644	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	3645	or (iterator^.Y > Gear^.Y + r) then
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3646	continue;
5044 6e8da75e5f5e I changed r. Still not a perfect fix. Colin Rice (clr_) parents: 5042 diff changeset	3647
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3648	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	3649
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3650	// 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	3651	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	3652	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3653	if Gear^.Y < iterator^.Y then
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3654	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	3655	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	3656	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	3657	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	3658	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3659	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	3660	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	3661	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	3662	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	3663
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3664	// 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	3665	iscake:= (iterator^.Kind = gtCake);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3666
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3667	// 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	3668	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	3669	begin
6452 7c6f9b6672dc More work on the parser unc0rr parents: 6450 diff changeset	3670	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	3671	continue;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3672	end
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3673	else
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	3674	if not ((Gear^.dXox + Gear^.dYoy).isNegative) then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3675	continue;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3676
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3677	isbullet:= (iterator^.Kind in [gtShotgunShot, gtDEagleShot, gtSniperRifleShot, gtSineGunShot]);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3678
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3679	r:= int2hwFloat(iterator^.Radius);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3680
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3681	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	3682	begin
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3683	// wow! good candidate there, let's see if the distance and direction is okay!
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3684	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	3685	begin
8900 b77fd3c2eec5 whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error? sheepluva parents: 8898 diff changeset	3686	s := Distance(iterator^.dX, iterator^.dY);
8898 0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3687	// if the resulting distance is 0 skip this gear
0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3688	if s.QWordValue = 0 then
0ccaa19c6367 fix for Issue 611: Engine crash in portal code sheepluva parents: 8838 diff changeset	3689	continue;
8900 b77fd3c2eec5 whoops, unbreak build. how come that cmake doesn't stop anymore on engine build error? sheepluva parents: 8898 diff changeset	3690	s := r / s;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3691	ox:= iterator^.X + s * iterator^.dX;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3692	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	3693	end
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3694	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3695	begin
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3696	ox:= iterator^.X;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3697	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	3698	end;
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3699
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3700	if (hwRound(Distance(Gear^.X-ox,Gear^.Y-oy)) > Gear^.Radius + 1 ) then
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3701	continue;
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
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3704	// draw bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3705	if isbullet then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3706	spawnBulletTrail(iterator);
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3707
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3708	// calc gear offset in portal vector direction
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3709	ox := (iterator^.X - Gear^.X);
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3710	oy := (iterator^.Y - Gear^.Y);
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3711	poffs:= (Gear^.dX * ox + Gear^.dY * oy);
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3712
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3713	if not isBullet and poffs.isNegative then
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3714	continue;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3715
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3716	// only port bullets close to the portal
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3717	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	3718	continue;
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3719
4076 7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3720	//
7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3721	// gears that make it till here will definately be ported
7ca17cb94992 we had it with you intolerant portals\! sheepluva parents: 4050 diff changeset	3722	//
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3723	// (but old position/movement vector might be restored in case there's
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3724	// not enough space on the other side)
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3725	//
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3726
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3727	resetr := iterator^.Radius;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3728	resetx := iterator^.X;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3729	resety := iterator^.Y;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3730	resetdx := iterator^.dX;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3731	resetdy := iterator^.dY;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3732
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3733	// create a normal of the portal vector, but ...
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3734	nx := Gear^.dY;
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3735	ny := Gear^.dX;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3736	// ... 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	3737	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	3738	nx.isNegative := (not nx.isNegative)
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3739	else
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3740	ny.isNegative := not ny.isNegative;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3741
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3742	// calc gear offset in portal normal vector direction
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3743	noffs:= (nx * ox + ny * oy);
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3744
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	3745	if isBullet and (noffs.Round >= Longword(Gear^.Radius)) then
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3746	continue;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3747
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3748	// 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	3749	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	3750	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	3751	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	3752	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	3753	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	3754	continue;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3755
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3756	// 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	3757	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	3758	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3759	pspeed:= (Gear^.dX * iterator^.dX + Gear^.dY * iterator^.dY);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3760	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	3761	end
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3762	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3763	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3764	pspeed:= hwAbs(cGravity * oy);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3765	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	3766	end;
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3767
8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3768	// creating normal vector of connected (exit) portal
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3769	nx := conPortal^.dY;
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3770	ny := conPortal^.dX;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3771	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	3772	nx.isNegative := (not nx.isNegative)
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3773	else
3570 3836fa355f96 portal: entry angle is now affecting exit angle sheepluva parents: 3569 diff changeset	3774	ny.isNegative := not ny.isNegative;
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3775
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3776	// inverse cake's normal movement direction,
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3777	// 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	3778	//if iscake then nspeed.isNegative:= not nspeed.isNegative;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3779
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3780	//AddFileLog('poffs:'+cstr(poffs)+' noffs:'+cstr(noffs)+' pspeed:'+cstr(pspeed)+' nspeed:'+cstr(nspeed));
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3781	iterator^.dX := -pspeed * conPortal^.dX + nspeed * nx;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	3782	iterator^.dY := -pspeed * conPortal^.dY + nspeed * ny;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3783
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3784	// 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	3785	// still respecting the movement direction
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3786
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3787	// 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	3788	// 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	3789	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	3790	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	3791	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3792	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	3793	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	3794	poffs:= ox;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3795	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	3796	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	3797	noffs:= noffs * s * (nspeed / pspeed);
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3798
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3799	// 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	3800	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	3801	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3802	s := hwAbs(noffs) + r - int2hwFloat(Gear^.Radius);
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3803	if s > _0 then
bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3804	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	3805	end;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3806
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3807	iterator^.X := conPortal^.X + poffs * conPortal^.dX + noffs * nx;
5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3808	iterator^.Y := conPortal^.Y + poffs * conPortal^.dY + noffs * ny;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3809
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3810	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	3811	begin
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3812	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	3813	end;
4092 bf13068194b3 more portal tweaks (closer exit position, cake stuff, etc) sheepluva parents: 4076 diff changeset	3814
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3815	// see if the space on the exit side actually is enough
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3816
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3817	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	3818	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3819	// TestCollisionXwithXYShift requires a hwFloat for xShift
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3820	ox.QWordValue := _1.QWordValue;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3821	ox.isNegative := not iterator^.dX.isNegative;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3822
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3823	sx := hwSign(iterator^.dX);
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3824	sy := hwSign(iterator^.dY);
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3825
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3826	if iterator^.Radius > 1 then
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3827	iterator^.Radius := iterator^.Radius - 1;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3828
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3829	// 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	3830	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	3831	or TestCollisionX(iterator, sx);
5594 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	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	3834	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3835	// check center area (with half the radius so that the
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3836	// the square check won't check more pixels than we want to)
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3837	iterator^.Radius := 1 + resetr div 2;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3838	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	3839	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	3840	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	3841	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3842
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3843	iterator^.Radius := resetr;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3844
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3845	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	3846	begin
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3847	// collision! oh crap! go back!
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3848	iterator^.X := resetx;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3849	iterator^.Y := resety;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3850	iterator^.dX := resetdx;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3851	iterator^.dY := resetdy;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3852	continue;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3853	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3854	end;
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3855
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3856	//
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3857	// You're now officially portaled!
3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3858	//
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	// 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	3861	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	3862	iterator^.PortalCounter:= 33
5940 c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3863	else
c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3864	begin
c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3865	inc(iterator^.PortalCounter);
7658 70a874a26414 adjust velocity when entering/exiting the 4x routine nemo parents: 7649 diff changeset	3866	iterator^.Active:= true;
7992 0b7dc27b2baf add gstMoving to avoid sticking nemo parents: 7874 diff changeset	3867	iterator^.State:= iterator^.State and (not gstHHHJump) or gstMoving;
5940 c025b4842cb4 clear HHJump on portaling nemo parents: 5935 diff changeset	3868	end;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3869
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3870	// 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	3871	// SYNCED ANGLE UPDATE
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3872	if iterator^.Kind = gtRCPlane then
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3873	begin
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3874	// recycling as temp vars
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3875	resety.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3876	resety.QWordValue:= 4294967296 * 112;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3877	resetx.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3878	resetx.QWordValue:= 4294967296 * 35;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3879	resetdx.isNegative:= false;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3880	resetdx.QWordValue:= 4294967296 * 1152;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3881
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3882	resetdy:=hwAbs(iterator^.dX*4);
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3883	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	3884	iterator^.Angle:= hwRound(resetdy*_2048 / _PI);
7101 d8fb38141950 Ok. I think this should flip it correctly... nemo parents: 7098 diff changeset	3885	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	3886	if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
6787 8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3887	end
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3888	// VISUAL USE OF ANGLE ONLY
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3889	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	3890	begin
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3891	iterator^.Angle:= DxDy2AttackAngle(iterator^.dX, iterator^.dY);
8a4cd042d191 orient kamikaze correctly when going through portals nemo parents: 6786 diff changeset	3892	iterator^.Angle:= 2048-iterator^.Angle;
6786 f631b8350b53 oh yeah, dY... nemo parents: 6785 diff changeset	3893	if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
6785 a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3894	end;
a8aa5984185f Allow RC plane to go through portals nemo parents: 6765 diff changeset	3895
6555 11f82e49d276 allow roping into a portal (still detaches rope) nemo parents: 6535 diff changeset	3896	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	3897	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	3898	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	3899	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	3900	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	3901
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3902	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	3903	and (iterator^.Kind <> gtFlake) then
4050 8e4f4b72c132 various portal tweaks, also: nemo's gear jiggling is back sheepluva parents: 4047 diff changeset	3904	FollowGear := iterator;
5594 3ab68a93434b portal: combating the space-detection issue. sheepluva parents: 5564 diff changeset	3905
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3906	// store X/Y values of exit for net bullet trail
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3907	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	3908	begin
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3909	iterator^.Elasticity:= iterator^.X;
ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3910	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	3911	end;
5841 ef0a76e154cb some portal love for deagle/etc shots sheepluva parents: 5839 diff changeset	3912
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3913	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	3914	dec(Gear^.Health);
3571 5c99b239340e portal: some moar tweaks sheepluva parents: 3570 diff changeset	3915	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	3916	end;
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	3917
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3918
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3919
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3920	procedure loadNewPortalBall(oldPortal: PGear; destroyGear: Boolean);
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3921	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	3922	CurWeapon: PAmmo;
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	3923	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3924	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	3925	with CurrentHedgehog^ do
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3926	begin
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	3927	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	3928	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	3929	begin
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3930	if not destroyGear then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3931	begin
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3932	// switch color of ball to opposite of oldPortal
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3933	if (oldPortal^.Tag and 2) = 0 then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3934	CurWeapon^.Pos:= 1
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3935	else
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3936	CurWeapon^.Pos:= 0;
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3937	end;
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3938
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3939	// make the ball visible
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	3940	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	3941	end
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3942	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3943	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	3944	oldPortal^.Timer:= 0;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3945	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3946
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3947	procedure doStepMovingPortal_real(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3948	var
6490 531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3949	x, y, tx, ty: LongInt;
531bf083e8db - Give uLand more modularity unc0rr parents: 6474 diff changeset	3950	s: hwFloat;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3951	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3952	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3953	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3954	tx := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3955	ty := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3956	// avoid compiler hints
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3957
7309 5bb4bd846c87 oops nemo parents: 7305 diff changeset	3958	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	3959	begin
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	3960	Gear^.State := Gear^.State or gstCollision;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	3961	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	3962
7310 7f8d62b869bd More efficient nemo parents: 7309 diff changeset	3963	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	3964	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	3965	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	3966	begin
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3967	loadNewPortalBall(Gear, true);
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3968	EXIT;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3969	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3970
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3971	// making a normalized normal vector
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3972	s := _1/DistanceI(tx,ty);
3562 c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3973	Gear^.dX := s * ty;
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3974	Gear^.dY := -s * tx;
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3975
c601630a12d5 portal: sheepluva parents: 3560 diff changeset	3976	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	3977	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	3978	Gear^.DirAngle := 180-Gear^.DirAngle;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3979
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3980	if ((Gear^.LinkedGear = nil)
71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	3981	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	3982	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3983	loadNewPortalBall(Gear, false);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3984	inc(Gear^.Tag);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3985	Gear^.doStep := @doStepPortal;
3396 e5b3e5f2818e More portal changes. Allows for a multishoot utility. Hopefully not breaking anything. nemo parents: 3391 diff changeset	3986	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3987	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	3988	loadNewPortalBall(Gear, true);
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	3989	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	3990
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	3991	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	3992	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	3993	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	3994	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	3995	loadNewPortalBall(Gear, true);
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	3996	end;
46a2694867bc portal: sheepluva parents: 3424 diff changeset	3997
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	3998	procedure doStepMovingPortal(Gear: PGear);
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	3999	begin
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4000	doPortalColorSwitch();
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4001	doStepPerPixel(Gear, @doStepMovingPortal_real, true);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4002	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	4003	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	4004	deleteGear(Gear);
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4005	end;
27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4006
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	4007	procedure doStepPortalShot(newPortal: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4008	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4009	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	4010	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	4011	CurWeapon: PAmmo;
3428 46a2694867bc portal: sheepluva parents: 3424 diff changeset	4012	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	4013	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	4014
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	4015	// 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	4016	// 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	4017	// (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	4018	// to the scaler)
3562 c601630a12d5 portal: sheepluva parents: 3560 diff changeset	4019	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	4020	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	4021	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	4022
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4023	newPortal^.LinkedGear := nil;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4024
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4025	if CurrentHedgehog <> nil then
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	4026	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	4027	begin
6924 57b66ee3bff3 Get rid of overloaded functions in uAmmo unc0rr parents: 6833 diff changeset	4028	CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4029	// 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	4030	newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4031	// when doing a backjump the dx is the opposite of the facing direction
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4032	if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery) then
3578 00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4033	newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
00aac66147c8 portal: angle preservation tweaking sheepluva parents: 3572 diff changeset	4034
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4035	// make portal gun look unloaded
4790 4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	4036	if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
4cb3f7890fbd fix portal gun wrong color issue sheepluva parents: 4778 diff changeset	4037	CurWeapon^.Timer := CurWeapon^.Timer or 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4038
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4039	iterator := GearsList;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4040	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	4041	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4042	if (iterator^.Kind = gtPortal) then
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4043	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	4044	begin
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4045	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	4046	begin
3468 c7b80bdbc384 * make portals delete each other only indirectly (by setting timer to 0) sheepluva parents: 3462 diff changeset	4047	iterator^.Timer:= 0;
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4048	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4049	else
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4050	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4051	// 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	4052	newPortal^.LinkedGear := iterator;
71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4053	iterator^.LinkedGear := newPortal;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4054	iterator^.Health := newPortal^.Health;
6556 faa47a7e614a Allow multiple portals, so long as the team hasn't changed... nemo parents: 6555 diff changeset	4055	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4056	end;
3480 c4c3f3512404 Prevent all portal loops the guaranteed way, at least until sheepluva's tests yield something reliable. nemo parents: 3476 diff changeset	4057	iterator^.PortalCounter:= 0;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4058	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	4059	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	4060
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	4061	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	4062	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	4063	// 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	4064	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	4065	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	4066	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	4067	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	4068	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	4069	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	4070	iterator^.Active:= true;
7992 0b7dc27b2baf add gstMoving to avoid sticking nemo parents: 7874 diff changeset	4071	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	4072	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	4073	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	4074	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	4075	//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	4076	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	4077	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	4078	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	4079	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4080	end;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4081	newPortal^.State := newPortal^.State and (not gstCollision);
3569 27b0ec683572 portal / slope detection: sheepluva parents: 3562 diff changeset	4082	newPortal^.State := newPortal^.State or gstMoving;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4083	newPortal^.doStep := @doStepMovingPortal;
3388 ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	4084	end;
ab9352a4ddcc Fix portal graphic name, continuing work on portal movement nemo parents: 3384 diff changeset	4085
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	4086	////////////////////////////////////////////////////////////////////////////////
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	4087	procedure doStepPiano(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4088	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4089	r0, r1: LongInt;
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4090	odY: hwFloat;
3350 5cd02aafc612 Engine: smxx parents: 3342 diff changeset	4091	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4092	AllInactive := false;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4093	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	4094	((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	4095	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4096	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	4097	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	4098	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	4099	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	4100	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	4101	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	4102	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	4103	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	4104	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	4105	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	4106	end;
3704 ed2b9c7fb260 Engine: smaxx parents: 3682 diff changeset	4107	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4108	CurrentHedgehog^.Gear^.MsgParam := 0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4109	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	4110	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4111
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4112	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	4113	begin
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4114	Gear^.dY := Gear^.dY + cGravity * 2;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4115	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	4116	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	4117	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	4118	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	4119	OnUsedAmmo(CurrentHedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4120	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	4121	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4122	// 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	4123	CurrentHedgehog^.Gear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4124	CurrentHedgehog^.Gear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4125	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	4126	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	4127	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	4128	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	4129	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	4130	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	4131	ResumeMusic
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4132	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	4133	exit
3351 3fd3f116f2fc Engine: smxx parents: 3350 diff changeset	4134	end;
3fd3f116f2fc Engine: smxx parents: 3350 diff changeset	4135
3728 9478d13b2f9b Engine: smaxx parents: 3720 diff changeset	4136	odY:= Gear^.dY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4137	doStepFallingGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4138
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4139	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	4140	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	4141	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	4142	OnUsedAmmo(CurrentHedgehog^);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4143	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	4144	begin
3419 b66a1b597f88 Add drown-the-playing-hog check for case of piano falling off the landscape. nemo parents: 3417 diff changeset	4145	// 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	4146	CurrentHedgehog^.Gear^.Active := true;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4147	CurrentHedgehog^.Gear^.X := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4148	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	4149	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	4150	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	4151	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	4152	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	4153	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4154	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	4155	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4156	else if (Gear^.State and gstCollision) <> 0 then
3399 885304636abf Drown the hog using the piano nemo parents: 3398 diff changeset	4157	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	4158	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	4159	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	4160	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	4161	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	4162	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	4163	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	4164	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	4165	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	4166	Gear^.Pos := Gear^.Pos + 1;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4167	end
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4168	else
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4169	Gear^.dY := Gear^.dY + cGravity * 2;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4170	// let it fall faster so itdoesn't take too long for the whole attack
3382 633046fa040c Gas grenade: mbait parents: 3378 diff changeset	4171	end;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4172
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4173
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4174	////////////////////////////////////////////////////////////////////////////////
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4175	procedure doStepSineGunShotWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4176	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4177	x, y, rX, rY, t, tmp, initHealth: LongInt;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4178	oX, oY, ldX, ldY, sdX, sdY, sine, lx, ly, amp: hwFloat;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4179	justCollided: boolean;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4180	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4181	AllInactive := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4182	initHealth := Gear^.Health;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4183	lX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4184	lY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4185	ldX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4186	ldY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4187	sdy := _0_5/Distance(Gear^.dX,Gear^.dY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4188	ldX := ldX * sdy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4189	ldY := ldY * sdy;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4190	sdY := hwAbs(ldX) + hwAbs(ldY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4191	sdX := _1 - hwAbs(ldX/sdY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4192	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	4193	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	4194	sdY := -sdY;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4195
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4196	// initial angle depends on current GameTicks
7745 0326e1bf674d Better use random number here unc0rr parents: 7739 diff changeset	4197	t := getRandom(4096);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4198
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	// 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	4201	justCollided := false;
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	repeat
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4204	lX := lX + ldX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4205	lY := lY + ldY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4206	oX := Gear^.X;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4207	oY := Gear^.Y;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4208	rX := hwRound(oX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4209	rY := hwRound(oY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4210	tmp := t mod 4096;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4211	amp := _128 * (_1 - hwSqr(int2hwFloat(Gear^.Health)/initHealth));
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4212	sine := amp * AngleSin(tmp mod 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4213	sine.isNegative := (tmp < 2048);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4214	inc(t,Gear^.Health div 313);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4215	Gear^.X := lX + (sine * sdX);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4216	Gear^.Y := ly + (sine * sdY);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4217	Gear^.dX := Gear^.X - oX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4218	Gear^.dY := Gear^.Y - oY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4219
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4220	x := hwRound(Gear^.X);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4221	y := hwRound(Gear^.Y);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4222
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4223	// if borders are on, stop outside land array
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4224	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	4225	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4226	Gear^.Damage := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4227	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	4228	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4229	else
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4230	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4231	if (rY <= cWaterLine) or (y <= cWaterLine) then
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4232	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4233	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	4234	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	4235	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4236	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	4237	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4238	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	4239	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	4240	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4241	else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4242	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4243	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	4244	justCollided := true;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4245	end;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4246	end
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4247	else
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4248	justCollided := false;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4249
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4250	// kick nearby hogs, dig tunnel and add some fire
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4251	// if at least 5 collisions occured
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4252	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	4253	begin
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4254	DrawExplosion(rX,rY,Gear^.Radius);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4255
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4256	// kick nearby hogs
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4257	AmmoShove(Gear, 35, 50);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4258
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4259	dec(Gear^.Health, Gear^.Damage);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4260	Gear^.Damage := 0;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4261
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4262	// add some fire to the tunnel
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4263	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	4264	begin
588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4265	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	4266	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	4267	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4268	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4269
7391 588eabb4b384 Apparently order of multiple getrandom in params is undefined. Also remove broken and pointless getrandom call. nemo parents: 7389 diff changeset	4270	if random(100) = 0 then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4271	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	4272	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4273	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	4274	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4275
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4276	dec(Gear^.Health);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4277
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4278	// 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	4279	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	4280	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4281	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	4282	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	4283	end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4284	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	4285	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4286	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	4287	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	4288	end
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4289	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	4290	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	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
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4293	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	4294	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4295	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	4296	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	4297	end;
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4298
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4299	until (Gear^.Health <= 0);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4300
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4301	DeleteGear(Gear);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4302	AfterAttack;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4303	end;
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4304
7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4305	procedure doStepSineGunShot(Gear: PGear);
7745 0326e1bf674d Better use random number here unc0rr parents: 7739 diff changeset	4306	var
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4307	HHGear: PGear;
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4308	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4309	PlaySound(sndSineGun);
3454 a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4310
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4311	// push the shooting Hedgehog back
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4312	HHGear := CurrentHedgehog^.Gear;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4313	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4314	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4315	HHGear^.dX := Gear^.dX;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4316	HHGear^.dY := Gear^.dY;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4317	AmmoShove(Gear, 0, 80);
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4318	Gear^.dX.isNegative := not Gear^.dX.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4319	Gear^.dY.isNegative := not Gear^.dY.isNegative;
a9bef74bd6e0 Code restlyling: experimental restyling of one module mbait parents: 3440 diff changeset	4320
4034 634a8c8682de add some phone rumbling to big explosions, airbomb and sinegun koda parents: 4026 diff changeset	4321	Gear^.doStep := @doStepSineGunShotWork;
8204 9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4322	with mobileRecord do
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4323	if (performRumble <> nil) and (not fastUntilLag) then
9a6030d96273 GCI2012: Convert uMobile into a Callback Record Rowan D parents: 8061 diff changeset	4324	performRumble(kSystemSoundID_Vibrate);
3384 7eb4707d43f0 * added some comments sheepluva parents: 3382 diff changeset	4325	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4326
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4327	////////////////////////////////////////////////////////////////////////////////
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4328	procedure doStepFlamethrowerWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4329	var
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4330	HHGear, flame: PGear;
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4331	rx, ry, speed: hwFloat;
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4332	i, gX, gY: LongInt;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4333	begin
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4334	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4335	HHGear := Gear^.Hedgehog^.Gear;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4336	HedgehogChAngle(HHGear);
3484 3c65b1d979cd Engine: smxx parents: 3483 diff changeset	4337	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
3c65b1d979cd Engine: smxx parents: 3483 diff changeset	4338	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	4339
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4340	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	4341	begin
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	4342	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	4343	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4344	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	4345	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	4346	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	4347	dec(Gear^.Tag);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4348	end
3894 9abce5468583 Engine: smaxx parents: 3852 diff changeset	4349	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	4350	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4351	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	4352	dec(Gear^.Tag)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4353	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	4354	inc(Gear^.Tag);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4355	end
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4356	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4357
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4358	dec(Gear^.Timer);
ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4359	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	4360	begin
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4361	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	4362	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	4363	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4364	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4365	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	4366	speed := _0_5 * (_10 / Gear^.Tag);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4367
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4368	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	4369	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	4370	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	4371	flame^.CollisionMask:= lfNotCurrentMask;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4372
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4373	if (Gear^.Health mod 30) = 0 then
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4374	begin
c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4375	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	4376	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	4377	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	4378	flame^.CollisionMask:= lfNotCurrentMask;
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4379	end
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4380	end;
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4381	Gear^.Timer:= Gear^.Tag
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4382	end;
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4383
7539 c6ffbc6530e3 Check if hedgehog is still active instead unc0rr parents: 7477 diff changeset	4384	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	4385	begin
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4386	DeleteGear(Gear);
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4387	AfterAttack
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4388	end
3485 ab91c56a9050 Engine (Henek): smxx parents: 3484 diff changeset	4389	else
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4390	begin
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4391	i:= Gear^.Health div 5;
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4392	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	4393	begin
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4394	Gear^.Damage:= i;
6380 1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check. nemo parents: 6368 diff changeset	4395	FreeTexture(Gear^.Tex);
4251 4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4396	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	4397	'%', cWhiteColor, fntSmall)
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4398	end
4b7d3507d175 pull bugfix into 0.9.14 avoid major performance hit when using flamethrower nemo parents: 4233 diff changeset	4399	end
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4400	end;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4401
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4402	procedure doStepFlamethrower(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4403	var
3476 1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4404	HHGear: PGear;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4405	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4406	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4407	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	4408	HHGear^.State := HHGear^.State or gstNotKickable;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4409	Gear^.doStep := @doStepFlamethrowerWork
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4410	end;
1ec68b8d3bd1 Henek adds a flamethrower, updates some translations, and tweaks how fire works. nemo parents: 3475 diff changeset	4411
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	4412	////////////////////////////////////////////////////////////////////////////////
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4413	procedure doStepLandGunWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4414	var
7281 c22dd112c958 These 2 need masks now nemo parents: 7276 diff changeset	4415	HHGear, land: PGear;
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4416	rx, ry, speed: hwFloat;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4417	i, gX, gY: LongInt;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4418	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4419	AllInactive := false;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4420	HHGear := Gear^.Hedgehog^.Gear;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4421	HedgehogChAngle(HHGear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4422	gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4423	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	4424
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4425	if (GameTicks and $FF) = 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4426	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4427	if (HHGear^.Message and gmRight) <> 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4428	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4429	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	4430	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	4431	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	4432	dec(Gear^.Tag);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4433	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4434	else if (HHGear^.Message and gmLeft) <> 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4435	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4436	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	4437	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	4438	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	4439	inc(Gear^.Tag);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4440	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4441	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4442
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4443	dec(Gear^.Timer);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4444	if Gear^.Timer = 0 then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4445	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4446	dec(Gear^.Health);
5480 37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4447
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4448	rx := rndSign(getRandomf * _0_1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4449	ry := rndSign(getRandomf * _0_1);
5480 37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4450	speed := (_3 / Gear^.Tag);
37bafa5a7016 kill off some speckles, crank up land gun output nemo parents: 5474 diff changeset	4451
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4452	land:= AddGear(gx, gy, gtFlake, gstTmpFlag,
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4453	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	4454	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	4455	land^.CollisionMask:= lfNotCurrentMask;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4456
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4457	Gear^.Timer:= Gear^.Tag
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4458	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4459
7539 c6ffbc6530e3 Check if hedgehog is still active instead unc0rr parents: 7477 diff changeset	4460	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	4461	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4462	HHGear^.Message:= HHGear^.Message and (not gmAttack);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4463	DeleteGear(Gear);
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4464	AfterAttack
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4465	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4466	else
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4467	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4468	i:= Gear^.Health div 10;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4469	if (i <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4470	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4471	Gear^.Damage:= i;
6380 1ff5ad1d771b Remove a bunch of unnecessary nil checks. FreeTexture does its own nil check. nemo parents: 6368 diff changeset	4472	FreeTexture(Gear^.Tex);
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4473	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) +
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4474	'%', cWhiteColor, fntSmall)
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4475	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4476	end
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4477	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4478
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4479	procedure doStepLandGun(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4480	var
5024 1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4481	HHGear: PGear;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4482	begin
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4483	HHGear := Gear^.Hedgehog^.Gear;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4484	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	4485	HHGear^.State := HHGear^.State or gstNotKickable;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4486	Gear^.doStep := @doStepLandGunWork
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4487	end;
1e332947147c Landgun, first pass. At sdw's request. nemo parents: 5016 diff changeset	4488
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	4489	////////////////////////////////////////////////////////////////////////////////
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4490	procedure doStepPoisonCloud(Gear: PGear);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4491	begin
de2026031833 Engine: smaxx parents: 3710 diff changeset	4492	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	4493	begin
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4494	DeleteGear(Gear);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4495	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4496	end;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4497	dec(Gear^.Timer);
de2026031833 Engine: smaxx parents: 3710 diff changeset	4498	Gear^.X:= Gear^.X + Gear^.dX;
de2026031833 Engine: smaxx parents: 3710 diff changeset	4499	Gear^.Y:= Gear^.Y + Gear^.dY;
3713 f8778904600d Engine: smaxx parents: 3712 diff changeset	4500	Gear^.dX := Gear^.dX + cWindSpeed / 4;
3712 de2026031833 Engine: smaxx parents: 3710 diff changeset	4501	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	4502	if (GameTicks and $FF) = 0 then
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4503	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	4504	AllInactive:= false;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4505	end;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4506
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4507	////////////////////////////////////////////////////////////////////////////////
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4508	procedure doStepHammer(Gear: PGear);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4509	var HHGear, tmp, tmp2: PGear;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4510	t: PGearArray;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4511	i: LongInt;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4512	begin
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4513	HHGear:= Gear^.Hedgehog^.Gear;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4514	HHGear^.State:= HHGear^.State or gstNoDamage;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4515	DeleteCI(HHGear);
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4516
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4517	t:= CheckGearsCollision(Gear);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4518
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4519	for i:= 5 downto 0 do
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4520	AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4521
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4522	i:= t^.Count;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4523	while i > 0 do
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4524	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4525	dec(i);
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4526	tmp:= t^.ar[i];
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4527	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	4528	if (tmp^.Kind = gtHedgehog) or (tmp^.Kind = gtMine) or (tmp^.Kind = gtExplosives) then
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4529	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4530	//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	4531	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	4532	ApplyDamage(tmp, CurrentHedgehog, tmp^.Health div 3, dsUnknown);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4533	//DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4534	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	4535	tmp2^.LinkedGear:= tmp;
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4536	SetAllToActive
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4537	end
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4538	else
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4539	begin
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4540	end
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4541	end;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4542
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4543	HHGear^.State:= HHGear^.State and (not gstNoDamage);
3717 d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4544	Gear^.Timer:= 250;
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4545	Gear^.doStep:= @doStepIdle
d88719b0f0dc Engine: smaxx parents: 3714 diff changeset	4546	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4547
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4548	procedure doStepHammerHitWork(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4549	var
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4550	i, j, ei: LongInt;
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4551	HitGear: PGear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4552	begin
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4553	AllInactive := false;
7272 71df899c4163 Second part of the change. Make collision check use the new mask bit. nemo parents: 7270 diff changeset	4554	HitGear := Gear^.LinkedGear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4555	dec(Gear^.Timer);
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4556	if (HitGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4557	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4558	DeleteGear(Gear);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4559	exit
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4560	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4561
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4562	if (Gear^.Timer mod 5) = 0 then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4563	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4564	AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12, vgtDust);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4565
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4566	i := hwRound(Gear^.X) - HitGear^.Radius + 2;
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4567	ei := hwRound(Gear^.X) + HitGear^.Radius - 2;
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4568	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	4569	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	4570	while i <= ei do
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4571	begin
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4572	for j := 1 to 11 do DrawExplosion(i, hwRound(Gear^.Y) + 3*j, 3);
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4573	inc(i, 1)
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4574	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4575
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4576	if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9)
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4577	, lfIndestructible) then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4578	begin
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4579	//Gear^.X := Gear^.X + Gear^.dX;
5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4580	Gear^.Y := Gear^.Y + _1_9
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4581	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4582	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	4583	if TestCollisionYwithGear(Gear, 1) <> 0 then
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4584	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4585	Gear^.dY := _0;
5624 b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4586	SetLittle(HitGear^.dX);
b6f70f6335ee Allow hammer to bash mines/barrels too, increase escape time to 3s nemo parents: 5612 diff changeset	4587	HitGear^.dY := _0;
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4588	end
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4589	else
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4590	begin
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4591	//Gear^.dY := Gear^.dY + cGravity;
5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4592	//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	4593	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	4594	Gear^.Timer := 1
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4595	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4596
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4597	//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	4598	HitGear^.X := Gear^.X;
8634 5dcb1dc9e01b fix portal/hammer interaction, ban freezer from portal nemo parents: 8632 diff changeset	4599	HitGear^.Y := Gear^.Y;
5628 a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4600	SetLittle(HitGear^.dY);
a9a0c67f9656 hammer tweak nemo parents: 5624 diff changeset	4601	HitGear^.Active:= true;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4602	end;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4603
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4604	procedure doStepHammerHit(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4605	var
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4606	i, y: LongInt;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4607	ar: TRangeArray;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4608	HHGear: PGear;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4609	begin
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4610	i := 0;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4611	HHGear := Gear^.Hedgehog^.Gear;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4612
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4613	y := hwRound(Gear^.Y) - cHHRadius * 2;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4614	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	4615	begin
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4616	ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4617	ar[i].Right := hwRound(Gear^.X) + Gear^.Radius + LongInt(GetRandom(2));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4618	inc(y, 2);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4619	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	4620	end;
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4621
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4622	DrawHLinesExplosions(@ar, 3, hwRound(Gear^.Y) - cHHRadius * 2, 2, Pred(i));
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4623	Gear^.dY := HHGear^.dY;
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4624	DeleteCI(HHGear);
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4625
b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4626	doStepHammerHitWork(Gear);
3821 03b1af3a1c8f Engine: smaxx parents: 3802 diff changeset	4627	Gear^.doStep := @doStepHammerHitWork
3720 b2b108a6fae8 Engine: smaxx parents: 3717 diff changeset	4628	end;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4629
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	4630	////////////////////////////////////////////////////////////////////////////////
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4631	procedure doStepResurrectorWork(Gear: PGear);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4632	var
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4633	graves: PGearArrayS;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4634	resgear: PGear;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4635	hh: PHedgehog;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4636	i: LongInt;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4637	begin
4184 bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4638	if (TurnTimeLeft > 0) then
bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4639	dec(TurnTimeLeft);
bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4640
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4641	AllInactive := false;
4365 4f2b1a152979 Remove ugly PHedgehog(Gear^.Hedgehog) cast unc0rr parents: 4337 diff changeset	4642	hh := Gear^.Hedgehog;
4387 3698361802ed no way unc0rr parents: 4372 diff changeset	4643
3698361802ed no way unc0rr parents: 4372 diff changeset	4644	// no, you can't do that here
3698361802ed no way unc0rr parents: 4372 diff changeset	4645	{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	4646	cHHRadius - 14 - hh^.HealthTagTex^.h, hh^.HealthTagTex);
4387 3698361802ed no way unc0rr parents: 4372 diff changeset	4647	}
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	4648	(*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	4649	$FF);*)
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4650
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4651	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	4652	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4653	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	4654	exit;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4655	end
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4656	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	4657	exit;
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4658
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4659	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	4660	begin
4023 8de77872ef21 Resurrector: Levitate hog + show cross Tobias Neumann <mail@tobias-neumann.eu> parents: 4021 diff changeset	4661	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	4662	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	4663	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	4664	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	4665
4184 bc2b88eea8c4 fix stray offset in resurrector, make resurrector use time nemo parents: 4182 diff changeset	4666	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	4667
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4668	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	4669	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4670	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	4671	Gear^.Timer := 250;
3f605cca9215 Resurrector weapon: do not make it end turn, add description, Tobias Neumann <mail@tobias-neumann.eu> parents: 3971 diff changeset	4672	Gear^.doStep := @doStepIdle;
3f605cca9215 Resurrector weapon: do not make it end turn, add description, Tobias Neumann <mail@tobias-neumann.eu> parents: 3971 diff changeset	4673	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	4674	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	4675
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4676	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	4677	begin
7721 2b1ad418ba39 - Fix warnings and hints unc0rr parents: 7716 diff changeset	4678	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	4679	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	4680	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	4681	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	4682	RenderHealth(hh^);
7399 e7ce559d8c94 Update team health nemo parents: 7396 diff changeset	4683	RecountTeamHealth(hh^.Team);
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4684	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	4685	inc(Gear^.Tag)
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4686	{-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	4687	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	4688	dec(hh^.Gear^.Health);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4689	inc(graves[i]^.Health);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4690	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4691	end; -}
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4692	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4693	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	4694	begin
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4695	// 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	4696	for i:= 0 to graves.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4697	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	4698	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4699	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	4700	resgear^.Hedgehog := graves.ar^[i]^.Hedgehog;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4701	resgear^.Health := graves.ar^[i]^.Health;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4702	PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := resgear;
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	4703	graves.ar^[i]^.Message:= graves.ar^[i]^.Message or gmDestroy;
7399 e7ce559d8c94 Update team health nemo parents: 7396 diff changeset	4704	graves.ar^[i]^.Active:= true;
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4705	RenderHealth(resgear^.Hedgehog^);
3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4706	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	4707	resgear^.Hedgehog^.Effects[heResurrected]:= 1;
4874 f508adb769b8 procedure for loading hats sheepluva parents: 4867 diff changeset	4708	// only make hat-less hedgehogs look like zombies, preserve existing hats
7394 789d7831ec53 Use gmDestroy message instead unc0rr parents: 7393 diff changeset	4709
4372 3836973380b9 remove some more PHedgehog casts nemo parents: 4365 diff changeset	4710	if resgear^.Hedgehog^.Hat = 'NoHat' then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	4711	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	4712	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	4713
4045 e3a2a39a8277 Cancel out dX/dY to handle the invulnerability case nemo parents: 4044 diff changeset	4714	hh^.Gear^.dY := _0;
e3a2a39a8277 Cancel out dX/dY to handle the invulnerability case nemo parents: 4044 diff changeset	4715	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	4716	doStepHedgehogMoving(hh^.Gear);
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4717	StopSoundChan(Gear^.SoundChannel);
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4718	Gear^.Timer := 250;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4719	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	4720	end
4017 048bcb8c72ae Kill off hog immediately on using up health, use more common formatting, call render less often nemo parents: 4005 diff changeset	4721	//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	4722	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4723
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4724	procedure doStepResurrector(Gear: PGear);
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4725	var
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4726	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	4727	hh: PHedgehog;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4728	i: LongInt;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4729	begin
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4730	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	4731	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	4732
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4733	if graves.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4734	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	4735	hh := Gear^.Hedgehog;
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4736	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	4737	begin
7335 3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4738	PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := nil;
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	4739	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	4740	end;
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4741	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	4742	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	4743	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	4744	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	4745	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	4746	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	4747	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	4748	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	4749	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	4750	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	4751	inc(Gear^.Tag)
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4752	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4753	end
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4754	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	4755	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4756	StopSoundChan(Gear^.SoundChannel);
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4757	Gear^.Timer := 250;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4758	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	4759	end
3963 6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4760	end;
6090d2a2472e New Weapon: Resurrector (TODO: ammo icon + sprites) Tobias Neumann <mail@tobias-neumann.eu> parents: 3959 diff changeset	4761
4293 d79ffcdd77df makes drill attack drills weaker and not affected by wind Henek parents: 4282 diff changeset	4762	////////////////////////////////////////////////////////////////////////////////
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4763	procedure doStepNapalmBomb(Gear: PGear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4764	var
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4765	i, gX, gY: LongInt;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4766	dX, dY: hwFloat;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4767	begin
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4768	AllInactive := false;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4769	doStepFallingGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4770	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	4771	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4772	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	4773	gX := hwRound(Gear^.X);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4774	gY := hwRound(Gear^.Y);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4775	for i:= 0 to 10 do
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4776	begin
7001 89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4777	dX := AngleCos(i * 2) * ((_0_1(i div 5))) (GetRandomf + _1);
89488f5b99ca GetRandom -> GetRandomf unc0rr parents: 6992 diff changeset	4778	dY := AngleSin(i * 8) * _0_5 * (GetRandomf + _1);
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4779	AddGear(gX, gY, gtFlame, 0, dX, dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4780	AddGear(gX, gY, gtFlame, 0, dX, -dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4781	AddGear(gX, gY, gtFlame, 0, -dX, dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4782	AddGear(gX, gY, gtFlame, 0, -dX, -dY, 0);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4783	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4784	DeleteGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4785	exit
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4786	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4787	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	4788	begin
4837 2ea0a152c319 Pass PHedgehog instead of PGear to stats. Fixes crash. unc0rr parents: 4824 diff changeset	4789	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	4790	for i:= -19 to 19 do
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4791	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	4792	DeleteGear(Gear);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4793	exit
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4794	end;
4313 0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4795	if (GameTicks and $3F) = 0 then
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4796	AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4797	dec(Gear^.Timer)
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4798	end;
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4799
0690067bc5ff made napalm use napalmbombs instead of just dropping fire Henek parents: 4301 diff changeset	4800	////////////////////////////////////////////////////////////////////////////////
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4801	procedure doStepStructure(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4802	var
6491 736479f3d348 Some cleanup here and there unc0rr parents: 6490 diff changeset	4803	x, y: LongInt;
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4804	HH: PHedgehog;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4805	t: PGear;
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4806	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4807	HH:= Gear^.Hedgehog;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4808
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	4809	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	4810	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	4811	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	4812	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	4813	Gear^.dY:= _0;
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	4814	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	4815	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	4816
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4817	dec(Gear^.Health, Gear^.Damage);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4818	Gear^.Damage:= 0;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4819
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4820	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	4821	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4822	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4823	AfterAttack;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4824	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	4825	CurAmmoGear:= nil;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4826	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	4827	HideHog(HH);
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4828	Gear^.Pos:= 2
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4829	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4830
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4831	if Gear^.Pos = 2 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4832	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4833	if ((GameTicks mod 100) = 0) and (Gear^.Timer < 1000) then
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4834	begin
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4835	if (Gear^.Timer mod 10) = 0 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	DeleteCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4838	Gear^.Y:= Gear^.Y - _0_5;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4839	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4840	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4841	inc(Gear^.Timer);
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4842	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4843	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	4844	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	4845	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4846
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4847	if Gear^.Pos = 3 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4848	if Gear^.Timer < 1000 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4849	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4850	if (Gear^.Timer mod 10) = 0 then
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4851	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4852	DeleteCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4853	Gear^.Y:= Gear^.Y - _0_5;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4854	AddGearCI(Gear);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4855	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4856	inc(Gear^.Timer);
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4857	end
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4858	else
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4859	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4860	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	4861	RestoreHog(HH);
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4862	Gear^.Pos:= 4;
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4863	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4864
6472 bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4865	if Gear^.Pos = 4 then
6473 2bed5ba1a7ea Why 'And'? (help parser) unc0rr parents: 6472 diff changeset	4866	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	4867	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4868	t:= GearsList;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4869	while t <> nil do
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4870	begin
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4871	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	4872	t^.Invulnerable:= true;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4873	t:= t^.NextGear;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4874	end;
bced12412f94 present somthing that could be taken as a structure Henek parents: 6468 diff changeset	4875	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4876
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4877	if Gear^.Health <= 0 then
66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4878	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4879	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	4880	RestoreHog(HH);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4881
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4882	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	4883	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	4884
5279 66969e7494c5 remove theme.cfg from CMakeLists too Henek parents: 5233 diff changeset	4885	DeleteCI(Gear);
4881 35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4886	DeleteGear(Gear);
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4887
35e6269227b6 still in developement take on adding structures, working hiding of hogs and ejecting them later. Henek parents: 4880 diff changeset	4888	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	4889	end;
5013 04789ba3f200 added GetCurAmmoType to lua Henek parents: 4977 diff changeset	4890	end;
04789ba3f200 added GetCurAmmoType to lua Henek parents: 4977 diff changeset	4891
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	4892	////////////////////////////////////////////////////////////////////////////////
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4893	(*
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4894	TARDIS needs
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4895	Warp in. Pos = 1
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4896	Pause. Pos = 2
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4897	Hide gear (TARDIS hedgehog was nil)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4898	Warp out. Pos = 3
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4899	... idle active for some time period ... Pos = 4
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4900	Warp in. Pos = 1
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4901	Pause. Pos = 2
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4902	Restore gear (TARDIS hedgehog was not nil)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4903	Warp out. Pos = 3
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4904	*)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4905
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4906	procedure doStepTardisWarp(Gear: PGear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4907	var HH: PHedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4908	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	4909	begin
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4910	HH:= Gear^.Hedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4911	if Gear^.Pos = 2 then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4912	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4913	StopSoundChan(Gear^.SoundChannel);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4914	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	4915	begin
5715 59a8dd33f274 Restore gear ASAP, add denied sound for illegal activation without wasting ammo. nemo parents: 5710 diff changeset	4916	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	4917	begin
5935 c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4918	AfterAttack;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4919	if Gear = CurAmmoGear then CurAmmoGear := nil;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4920	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	4921	((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	4922	HideHog(HH)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4923	end
5738 a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4924	//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	4925	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	4926	RestoreHog(HH)
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4927	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4928
5971 44b063166bb2 revert prev - that was dumb. wrong gear. nemo parents: 5970 diff changeset	4929	inc(Gear^.Timer);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4930	if (Gear^.Timer > 2000) and ((GameTicks mod 2000) = 1000) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4931	begin
5728 aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4932	Gear^.SoundChannel := LoopSound(sndTardis);
aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4933	Gear^.Pos:= 3
aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	4934	end
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4935	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4936
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4937	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	4938	begin
c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4939	inc(Gear^.Power);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	4940	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	4941	(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	4942	((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	4943	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	4944	begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4945	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	4946	Tag:= 2;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4947	Timer:= 0;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4948	Pos:= 0
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4949	end
5935 c89d5065d956 Requested a few times nemo parents: 5926 diff changeset	4950	end;
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4951	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	4952	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	4953	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	4954	Gear^.Pos:= 2;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4955	if (Gear^.Pos = 3) and (Gear^.Power = 0) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4956	begin
7053 8c9dcaedc7a8 Make pas2c happier with uSound unc0rr parents: 7036 diff changeset	4957	StopSoundChan(Gear^.SoundChannel);
5710 0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4958	if HH^.GearHidden = nil then
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4959	begin
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4960	DeleteGear(Gear);
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4961	exit
0fec06ac8776 TARDIS bugfix nemo parents: 5706 diff changeset	4962	end;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4963	Gear^.Pos:= 4;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4964	// 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	4965	Gear^.Timer:= GetRandom(cHedgehogTurnTime*TeamsCount)+cHedgehogTurnTime
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4966	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4967
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4968	if (Gear^.Pos = 4) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4969	begin
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4970	cnt:= 0;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4971	for j:= 0 to Pred(HH^.Team^.Clan^.TeamsNumber) do
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4972	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	4973	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	4974	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	4975	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	4976	inc(cnt);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4977	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	4978	begin
6580 6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent. lovelacer parents: 6556 diff changeset	4979	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	4980	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	4981
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	4982	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	4983	begin
5738 a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4984	Gear^.X:= HH^.GearHidden^.X;
a81fc23356e7 that was just getting me into trouble nemo parents: 5728 diff changeset	4985	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	4986	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	4987	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	4988
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	4989	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	4990	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	4991	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	4992	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	4993	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	4994	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	4995	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	4996	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	4997	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	4998	Gear^.Power:= 0;
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	4999	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	5000	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	5001	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	5002	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5003
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5004	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5005
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5006	procedure doStepTardis(Gear: PGear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5007	var i,j,cnt: LongWord;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5008	HH: PHedgehog;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5009	begin
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5010	(*
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5011	Conditions for not activating.
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5012	1. Hog is last of his clan
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5013	2. Sudden Death is in play
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5014	3. Hog is a king
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5015	*)
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5016	HH:= Gear^.Hedgehog;
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5017	if HH^.Gear <> nil then
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5018	if (HH^.Gear = nil) or (HH^.King) or (SuddenDeathDmg) then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5019	begin
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5020	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	5021	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5022	HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5023	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	5024	end;
5715 59a8dd33f274 Restore gear ASAP, add denied sound for illegal activation without wasting ammo. nemo parents: 5710 diff changeset	5025	PlaySound(sndDenied);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5026	DeleteGear(gear);
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5027	exit
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5028	end;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5029	cnt:= 0;
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5030	for j:= 0 to Pred(HH^.Team^.Clan^.TeamsNumber) do
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5031	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	5032	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	5033	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	5034	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	5035	inc(cnt);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5036	if cnt < 2 then
4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5037	begin
6131 4e8816cf9459 merge the changes applied to 0.9.16 koda parents: 6130 5995 diff changeset	5038	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	5039	begin
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5040	HH^.Gear^.Message := HH^.Gear^.Message and (not gmAttack);
14224c9b4594 - Improvement to the parser unc0rr parents: 6419 diff changeset	5041	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	5042	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	5043	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	5044	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	5045	exit
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5046	end;
5728 aca2acfba4ca sigh I suppose I'd best avoid those trademarks... nemo parents: 5722 diff changeset	5047	Gear^.SoundChannel := LoopSound(sndTardis);
5706 4454aa0523e7 more proper implementation of TARDIS nemo parents: 5695 diff changeset	5048	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	5049	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	5050
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	5051	////////////////////////////////////////////////////////////////////////////////
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	5052
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5053	(*
0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5054	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	5055	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	5056	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	5057	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	5058	* 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	5059	* 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	5060	* 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	5061	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	5062	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	5063	*)
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5064
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5065
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5066	procedure updateFuel(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5067	var
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5068	t:LongInt;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5069	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5070	t:= Gear^.Health div 10;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5071	if (t <> Gear^.Damage) and ((GameTicks and $3F) = 0) then
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5072	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5073	Gear^.Damage:= t;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5074	FreeTexture(Gear^.Tex);
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5075	Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(t) +
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5076	'%', cWhiteColor, fntSmall)
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5077	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	5078	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	5079	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	5080	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	5081	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	5082	else if GameTicks mod 10 = 0 then dec(Gear^.Health);
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5083	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5084
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5085
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5086	procedure updateTarget(Gear:PGear; newX, newY:HWFloat);
8773 7d3af949dd34 remove engine warnings sheepluva parents: 8751 diff changeset	5087	// var
7d3af949dd34 remove engine warnings sheepluva parents: 8751 diff changeset	5088	// iter:PGear;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5089	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5090	with Gear^ do
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5091	begin
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5092	dX:= newX;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5093	dY:= newY;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5094	Pos:= 0;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5095	Target.X:= NoPointX;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5096	LastDamage:= nil;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5097	X:= Hedgehog^.Gear^.X;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5098	Y:= Hedgehog^.Gear^.Y;
8557 18330b24b92c Add freezing hogs with icegun Urbertar@gmail.com parents: 8548 diff changeset	5099	//unfreeze all semifrozen hogs - make this generic hog cleanup
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	5100	(*
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5101	iter := GearsList;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5102	while iter <> nil do
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5103	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5104	if (iter^.Kind = gtHedgehog) and
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5105	(iter^.Hedgehog^.Effects[heFrozen] and $FF = 0) then
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5106	iter^.Hedgehog^.Effects[heFrozen]:= 0;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5107	iter:= iter^.NextGear
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5108	end
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	5109	*)
8548 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);
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5114	const iceWaitCollision:Longint = 0;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5115	const iceCollideWithGround:Longint = 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;
8592 bb724ef609db Draw ice on water Urbertar@gmail.com parents: 8589 diff changeset	5118	const iceCollideWithWater:Longint = 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;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5120	const groundFreezingTime:Longint = 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
95117607b81a Fix some hints unc0rr parents: 7661 diff changeset	5124	HHGear: 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;
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	5127	i, j, 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;
8814 01e13871f578 sigh this shouldn'tve been removed in first place. nemo parents: 8812 diff changeset	5132	if (Gear^.Message and gmAttack <> 0) or (Gear^.Health = 0) or (HHGear = nil) or (HHGear^.Damage <> 0) then
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5133	begin
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5134	DeleteGear(Gear);
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5135	AfterAttack;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5136	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	5137	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	5138	updateFuel(Gear);
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5139
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	5140	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	5141	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	5142	HedgehogChAngle(HHGear);
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5143	ndX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _4;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5144	ndY:= -AngleCos(HHGear^.Angle) * _4;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5145	if (ndX <> dX) or (ndY <> dY) or
b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5146	((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	5147	(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	5148	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	5149	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	5150	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	5151	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	5152	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	5153	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	5154	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	5155	Y:= Y + dY;
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5156	gX:= hwRound(X);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5157	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	5158	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	5159
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	5160	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	5161	begin
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5162	CheckCollisionWithLand(Gear);
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5163	if (State and gstCollision) <> 0 then
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5164	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	5165	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	5166	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	5167	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	5168	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	5169	end
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5170	end
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5171	else if (target.y >= cWaterLine) then
f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5172	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	5173	if Timer = iceWaitCollision then
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5174	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	5175	Timer := iceCollideWithWater;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5176	Power := GameTicks;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5177	end;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5178	end;
b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5179
7098 f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5180	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	5181	begin
7098 f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5182	X:= HHGear^.X;
f8c453ade379 Minor tweaks to freezer, mostly to simplify current state to laptop nemo parents: 7093 diff changeset	5183	Y:= HHGear^.Y
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5184	end;
8548 b98631bf2066 Add land freezing Urbertar@gmail.com parents: 8501 diff changeset	5185
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	5186	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	5187	begin
8783 f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5188	FillRoundInLand(target.x, target.y, iceRadius, icePixel);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5189	landRect.x := min(max(target.x - iceRadius, 0), LAND_WIDTH - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5190	landRect.y := min(max(target.y - iceRadius, 0), LAND_HEIGHT - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5191	landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5192	landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5193	UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5194
8783 f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5195	// FillRoundInLandWithIce(Target.X, Target.Y, iceRadius);
f1231a48fc48 Remove some duplicating code from uLandGraphics.pas Urbertar parents: 8773 diff changeset	5196	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	5197	Timer := iceWaitCollision;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5198	end;
f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5199
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	5200	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	5201	begin
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5202	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	5203	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	5204	Timer := iceWaitCollision;
8602 f510cca2b988 Draw ice on water Urbertar@gmail.com parents: 8601 diff changeset	5205	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	5206	(*
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	5207	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	5208	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	5209	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	5210	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	5211	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	5212	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	5213	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	5214	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	5215	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	5216	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	5217	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	5218	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	5219	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	5220	*)
8592 bb724ef609db Draw ice on water Urbertar@gmail.com parents: 8589 diff changeset	5221
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5222	// freeze nearby hogs
8560 134a098235fa Messing around w/ Freezer nemo parents: 8557 diff changeset	5223	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	5224	if hogs.size > 0 then
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5225	for i:= 0 to hogs.size - 1 do
3c6f08af7dac - Don't call Length() on variable size arrays unc0rr parents: 7325 diff changeset	5226	if hogs.ar^[i] <> HHGear then
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5227	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	5228	begin
8565 a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5229	hogs.ar^[i]^.Active:= true;
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5230	if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] < 256 then
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5231	hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] := hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] + 1
a431fa208a45 too aggressive? nemo parents: 8563 diff changeset	5232	else if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] = 256 then
8668 b04a3724e328 extend time a bit. move to defrosting on team's turn. fairer than using round order I think. nemo parents: 8655 diff changeset	5233	hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000;//cHedgehogTurnTime + cReadyDelay
8563 4d9d8287e601 Trying to improve rendering, sliding and thawing. Messing around w/ making fire thaw faster. nemo parents: 8560 diff changeset	5234	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	5235	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	5236	end
7128 574b385ce7df Minor freezer changes, allow snow to accumulate on indestructible terrain too. nemo parents: 7101 diff changeset	5237	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	5238	(((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	5239	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	5240	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	5241	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	5242	Target.Y:= gY;
7093 2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5243	X:= HHGear^.X;
2d7f1fb73335 Bit more freezer. nemo parents: 7092 diff changeset	5244	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	5245	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	5246	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	5247	(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	5248	(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	5249	(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	5250	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	5251	//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	5252	//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	5253	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	5254	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	5255	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	5256	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	5257	end;
7007 0ccdff4ae8e9 Initial stub for freezer nemo parents: 7001 diff changeset	5258	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	5259
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	5260	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	5261	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	5262	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	5263	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	5264	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	5265	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	5266	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	5267	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	5268	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	5269	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	5270	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	5271	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	5272	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	5273	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	5274	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	5275	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	5276	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	5277	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	5278	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	5279	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	5280	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	5281	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	5282	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	5283	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	5284
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	5285	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	5286	begin
7406 1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5287	if Gear^.Timer < $FFFFFFFF then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5288	if Gear^.Timer > 0 then
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5289	dec(Gear^.Timer)
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5290	else
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5291	begin
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5292	DeleteGear(Gear);
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5293	exit
1fe2c821f9bf Try avoiding spamming the log by retaining the gears. untested. nemo parents: 7400 diff changeset	5294	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	5295	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	5296	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	5297	doStepFallingGear(Gear);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5298	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	5299	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	5300	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	5301	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	5302	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	5303	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	5304	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	5305	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	5306	end;
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5307
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5308	procedure doStepCreeper(Gear: PGear);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5309	var hogs: PGearArrayS;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5310	HHGear: PGear;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5311	tdX: hwFloat;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5312	dir: LongInt;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5313	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5314	doStepFallingGear(Gear);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5315	if Gear^.Timer > 0 then dec(Gear^.Timer);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5316	// creeper sleep phase
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5317	if (Gear^.Hedgehog = nil) and (Gear^.Timer > 0) then exit;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5318
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5319	if Gear^.Hedgehog <> nil then HHGear:= Gear^.Hedgehog^.Gear
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5320	else HHGear:= nil;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5321
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5322	// creeper boom phase
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5323	if (Gear^.State and gstTmpFlag <> 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5324	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5325	if (Gear^.Timer = 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5326	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5327	doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 300, CurrentHedgehog, EXPLAutoSound);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5328	DeleteGear(Gear)
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5329	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5330	// ssssss he essssscaped
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5331	if (Gear^.Timer > 250) and ((HHGear = nil) or
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5332	(((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	5333	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) > _180))) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5334	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5335	Gear^.State:= Gear^.State and (not gstTmpFlag);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5336	Gear^.Timer:= 0
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5337	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5338	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5339	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5340
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5341	// 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	5342	if (HHGear = nil) or (Gear^.Timer = 0) or
7627 e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5343	(((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	5344	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) > int2hwFloat(Gear^.Angle)))
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5345	then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5346	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5347	hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Angle);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5348	if hogs.size > 1 then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5349	Gear^.Hedgehog:= hogs.ar^[GetRandom(hogs.size)]^.Hedgehog
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5350	else if hogs.size = 1 then Gear^.Hedgehog:= hogs.ar^[0]^.Hedgehog
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5351	else Gear^.Hedgehog:= nil;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5352	if Gear^.Hedgehog <> nil then Gear^.Timer:= 5000;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5353	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5354	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5355
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5356	// we have a target. move the creeper.
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5357	if HHGear <> nil then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5358	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5359	// GOTCHA
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5360	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	5361	(Distance(HHGear^.X-Gear^.X,HHGear^.Y-Gear^.Y) < _50) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5362	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5363	// hisssssssssss
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5364	Gear^.State:= Gear^.State or gstTmpFlag;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5365	Gear^.Timer:= 1500;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5366	exit
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5367	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5368	if (Gear^.State and gstMoving <> 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5369	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5370	Gear^.dY:= _0;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5371	Gear^.dX:= _0;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5372	end
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5373	else if (GameTicks and $FF = 0) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5374	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5375	tdX:= HHGear^.X-Gear^.X;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5376	dir:= hwSign(tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5377	if not TestCollisionX(Gear, dir) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5378	Gear^.X:= Gear^.X + signAs(_1,tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5379	if TestCollisionXwithXYShift(Gear, signAs(_10,tdX), 0, dir) then
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5380	begin
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5381	Gear^.dX:= SignAs(_0_15, tdX);
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5382	Gear^.dY:= -_0_3;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5383	Gear^.State:= Gear^.State or gstMoving
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5384	end
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5385	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5386	end;
e1e112687fd6 preliminary creeper (not yet functional) nemo parents: 7623 diff changeset	5387	end;
7729 c374746bb56e Data for copying throwing knife to Land once it hits. nemo parents: 7726 diff changeset	5388
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5389	////////////////////////////////////////////////////////////////////////////////
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5390	procedure doStepKnife(Gear: PGear);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5391	//var ox, oy: LongInt;
0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5392	// la: hwFloat;
0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5393	var a: real;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5394	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5395	// 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	5396	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	5397	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	5398	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	5399	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	5400	Gear^.Damage:= 0;
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5401	if Gear^.Timer > 0 then dec(Gear^.Timer);
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5402	if (Gear^.State and gstMoving <> 0) and (Gear^.State and gstCollision = 0) then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5403	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5404	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	5405	Gear^.Radius:= 7;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5406	// 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	5407	Gear^.Health:= hwRound(hwSqr((hwAbs(Gear^.dY)+hwAbs(Gear^.dX))*_4));
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5408	doStepFallingGear(Gear);
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5409	AllInactive := false;
7864 667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5410	a:= Gear^.DirAngle;
667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5411	CalcRotationDirAngle(Gear);
667b7583c389 double cleaver rotation speed, also make spin direction dX dependent. nemo parents: 7829 diff changeset	5412	Gear^.DirAngle:= a+(Gear^.DirAngle-a)2hwSign(Gear^.dX) // double rotation
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5413	end
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5414	else if (Gear^.CollisionIndex = -1) and (Gear^.Timer = 0) then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5415	begin
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5416	(*ox:= 0; oy:= 0;
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5417	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	5418	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	5419	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	5420	if TestCollisionYwithGear(Gear, 1) <> 0 then oy:= 1;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5421	if Gear^.Health > 0 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5422	PlaySound(sndRopeAttach);
8370 0c79946e96f8 Fix tons of warnings martin_bede parents: 8204 diff changeset	5423
7758 a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5424	la:= _10000;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5425	if (ox <> 0) or (oy <> 0) then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5426	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	5427	if la = _10000 then
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5428	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5429	// debug for when we couldn't get an angle
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5430	//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	5431	*)
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	5432	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	5433	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	5434	((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	5435	// end
a225cc45513e Remove slot overcrowding, disable angle detection which isn't doing what I want. nemo parents: 7754 diff changeset	5436	// 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	5437	// AddFileLog('la: '+floattostr(la)+' DirAngle: '+inttostr(round(Gear^.DirAngle)));
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5438	Gear^.dX:= _0;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5439	Gear^.dY:= _0;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5440	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	5441	Gear^.Radius:= 16;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5442	if Gear^.Health > 0 then AmmoShove(Gear, Gear^.Health, 0);
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5443	Gear^.Health:= 0;
7759 b64afd109cf7 cut down on excessive checkins in some situations nemo parents: 7758 diff changeset	5444	Gear^.Timer:= 500;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5445	AddGearCI(Gear)
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5446	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5447	else if GameTicks and $3F = 0 then
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5448	begin
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5449	if (TestCollisionYwithGear(Gear, -1) = 0)
7767 d1ea9b3f543e damn nots nemo parents: 7759 diff changeset	5450	and (not TestCollisionXwithGear(Gear, 1))
d1ea9b3f543e damn nots nemo parents: 7759 diff changeset	5451	and (not TestCollisionXwithGear(Gear, -1))
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5452	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	5453	end
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5454	end;
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5455	(*
e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5456	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	5457	// 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	5458	procedure doStepKnife(Gear: PGear);
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5459	var t,
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5460	gx, gy, ga, // gear x,y,angle
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5461	lx, ly, la, // land x,y,angle
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5462	ox, oy, // x,y offset
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5463	w, h, // wXh of clip area
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5464	tx, ty // tip position in sprite
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5465	: LongInt;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5466	surf: PSDL_Surface;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5467	s: hwFloat;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5468
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5469	begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5470	Gear^.dY := Gear^.dY + cGravity;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5471	if (GameFlags and gfMoreWind) <> 0 then
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5472	Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5473	Gear^.X := Gear^.X + Gear^.dX;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5474	Gear^.Y := Gear^.Y + Gear^.dY;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5475	CheckGearDrowning(Gear);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5476	gx:= hwRound(Gear^.X);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5477	gy:= hwRound(Gear^.Y);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5478	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	5479	with Gear^ do
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5480	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	5481	if CheckLandValue(gx, gy, lfLandMask) then
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5482	begin
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5483	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	5484
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5485	if t < 0 then inc(t, 4096)
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5486	else if 4095 < t then dec(t, 4096);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5487	Angle:= t;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5488
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5489	DirAngle:= Angle / 4096 * 360
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5490	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5491	else
7730 2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5492	begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5493	//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	5494	//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	5495	t:= Angle mod 1024;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5496	case t div 128 of
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5497	0: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5498	ox:= 2; oy:= 5;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5499	w := 25; h:= 5;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5500	tx:= 0; ty:= 2
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5501	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5502	1: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5503	ox:= 2; oy:= 15;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5504	w:= 24; h:= 8;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5505	tx:= 0; ty:= 7
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5506	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5507	2: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5508	ox:= 2; oy:= 27;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5509	w:= 23; h:= 12;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5510	tx:= -12; ty:= -5
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5511	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5512	3: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5513	ox:= 2; oy:= 43;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5514	w:= 21; h:= 15;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5515	tx:= 0; ty:= 14
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5516	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5517	4: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5518	ox:= 29; oy:= 8;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5519	w:= 19; h:= 19;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5520	tx:= 0; ty:= 17
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5521	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5522	5: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5523	ox:= 29; oy:= 32;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5524	w:= 15; h:= 21;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5525	tx:= 0; ty:= 20
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5526	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5527	6: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5528	ox:= 51; oy:= 3;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5529	w:= 11; h:= 23;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5530	tx:= 0; ty:= 22
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5531	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5532	7: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5533	ox:= 51; oy:= 34;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5534	w:= 7; h:= 24;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5535	tx:= 0; ty:= 23
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5536	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5537	end;
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5538
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5539	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	5540	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	5541	// try to make the knife hit point first
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5542	lx := 0;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5543	ly := 0;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5544	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	5545	begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5546	la:= vector2Angle(int2hwFloat(lx), int2hwFloat(ly));
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5547	ga:= vector2Angle(dX, dY);
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5548	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	5549	// 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	5550	if la < 0 then la:= 4096+la;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5551	if ga < 0 then ga:= 4096+ga;
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5552	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	5553	begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5554	if Angle >= 2048 then dec(Angle, 2048)
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5555	else if Angle < 2048 then inc(Angle, 2048)
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5556	end;
b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5557	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	5558	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5559	case Angle div 1024 of
8795 b5b79a8f9354 merge correction, also what's with all those trailing whitespaces? koda parents: 8793 8774 diff changeset	5560	0: begin
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5561	flipSurface(surf, true);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5562	flipSurface(surf, true);
7739 8d5d6b1be9ba no. still doesn't work right nemo parents: 7734 diff changeset	5563	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	5564	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5565	1: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5566	flipSurface(surf, false);
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5567	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	5568	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5569	2: begin // knife was actually drawn facing this way...
7734 b0d8a595875b no. still doesn't work right. nemo parents: 7733 diff changeset	5570	BlitImageAndGenerateCollisionInfo(gx-tx, gy-ty, w, surf)
7733 a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5571	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5572	3: begin
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5573	flipSurface(surf, true);
7739 8d5d6b1be9ba no. still doesn't work right nemo parents: 7734 diff changeset	5574	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	5575	end
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5576	end;
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5577	SDL_FreeSurface(surf);
a1476c09403f Knife is still broken, but so koda can fix it... nemo parents: 7730 diff changeset	5578	// 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	5579	// 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	5580	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	5581	DeleteGear(Gear);
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5582	exit
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5583	end
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5584	end;
2013733f9ca9 A bit more on the knife. Also add missing files to CMakeLists nemo parents: 7729 diff changeset	5585	end;
7754 e81dc9bef8b8 First pass at cleaver. nemo parents: 7745 diff changeset	5586	*)

author	nemo
	Sat, 04 May 2013 14:46:29 -0400
changeset 8958	3818b38d72c0
parent 8952	a6ee1e7310fb
child 8962	9780e79619ed
permissions	-rw-r--r--