hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:1b9f026e9fc6
+:4609823efc94
 ry:= ly;
 if cReducedQuality and rqBlurryLand <> 0 then
 begin
 rx:= rx div 2;ry:= ry div 2;
 end;
-if Land[yy + py, xx + px] and $FF00 = 0 then
+if Land[yy + py, xx + px] <= lfAllObjMask then
 if gun then
 begin
 LandDirty[yy div 32, xx div 32]:= 1;
 if LandPixels[ry, rx] = 0 then
 Land[ly, lx]:=  lfDamaged or lfObject
 y := hwRound(Gear^.Y);
 if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] <> 0) then
 inc(Gear^.Damage);
 // let's interrupt before a collision to give portals a chance to catch the bullet
-if (Gear^.Damage = 1) and (Gear^.Tag = 0) and not(CheckLandValue(x, y, $FF00)) then
+if (Gear^.Damage = 1) and (Gear^.Tag = 0) and not(CheckLandValue(x, y, lfLandMask)) then
 begin
 Gear^.Tag := 1;
 Gear^.Damage := 0;
 Gear^.X := Gear^.X - Gear^.dX;
 Gear^.Y := Gear^.Y - Gear^.dY;
 SetLittle(HHGear^.dX);
 HHGear^.dY := _0;
 end
 else
 begin
-if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), $FF00) then
+if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), lfLandMask) then
 begin
 Gear^.dY := Gear^.dY + cGravity;
 Gear^.Y := Gear^.Y + Gear^.dY
 end;
 if hwRound(Gear^.Y) > cWaterLine then
 Gear^.Timer := 1
 end;
 Gear^.X := Gear^.X + HHGear^.dX;
-if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, $FF00) then
+if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, lfLandMask) then
 begin
 HHGear^.X := Gear^.X;
 HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius)
 end;
 begin
 AllInactive := false;
 HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and (not gmAttack);
-Gear^.CollisionMask:= lfCurrentMask;
+Gear^.CollisionMask:= lfNotCurrentMask;
 FollowGear := Gear;
 Gear^.doStep := @doStepCakeFall
 end;
 begin
 rx := rndSign(getRandomf * _0_1);
 ry := rndSign(getRandomf * _0_1);
 ball:= AddGear(gx, gy, gtBall, 0, SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx, AngleCos(HHGear^.Angle) * ( - _0_8) + ry, 0);
-ball^.CollisionMask:= lfCurrentMask;
+ball^.CollisionMask:= lfNotCurrentMask;
 PlaySound(sndGun);
 end;
 if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then
 hasdxy, isbullet, iscake, isCollision: Boolean;
 begin
 doPortalColorSwitch();
 // destroy portal if ground it was attached too is gone
-if ((Land[hwRound(Gear^.Y), hwRound(Gear^.X)] and $FF00) = 0)
+if (Land[hwRound(Gear^.Y), hwRound(Gear^.X)] <= lfAllObjMask)
 or (Gear^.Timer < 1)
 or (Gear^.Hedgehog^.Team <> CurrentHedgehog^.Team)
 or (hwRound(Gear^.Y) > cWaterLine) then
 begin
 deleteGear(Gear);
 speed := _0_5 * (_10 / Gear^.Tag);
 flame:= AddGear(gx, gy, gtFlame, gstTmpFlag,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
-flame^.CollisionMask:= lfCurrentMask;
+flame^.CollisionMask:= lfNotCurrentMask;
 if (Gear^.Health mod 30) = 0 then
 begin
 flame:= AddGear(gx, gy, gtFlame, 0,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
-flame^.CollisionMask:= lfCurrentMask;
+flame^.CollisionMask:= lfNotCurrentMask;
 end
 end;
 Gear^.Timer:= Gear^.Tag
 end;
 speed := (_3 / Gear^.Tag);
 land:= AddGear(gx, gy, gtFlake, gstTmpFlag,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
-land^.CollisionMask:= lfCurrentMask;
+land^.CollisionMask:= lfNotCurrentMask;
 Gear^.Timer:= Gear^.Tag
 end;
 if (Gear^.Health = 0) or ((HHGear^.State and gstHHDriven) = 0) or ((HHGear^.Message and gmAttack) <> 0) then
 WIP. The ice gun will have the following effects.  It has been proposed by sheepluva that it take the appearance of a large freezer
 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.
 For now we assume a "ray" like a deagle projected out from the gun.
 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".
 * When fired at water a layer of ice textured land is added above the water.
-* When fired at non-ice land (land and $FF00 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.
+* 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.
 * 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.
 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.
 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.
 *)
 gx:= hwRound(Gear^.X);
 gy:= hwRound(Gear^.Y);
 if Gear^.State and gstDrowning <> 0 then exit;
 with Gear^ do
 begin
-if CheckLandValue(gx, gy, $FF00) then
+if CheckLandValue(gx, gy, lfLandMask) then
 begin
 t:= Angle + hwRound((hwAbs(dX)+hwAbs(dY)) * _10);
 if t < 0 then inc(t, 4096)
 else if 4095 < t then dec(t, 4096);

changeset 8751	4609823efc94
parent 8744	6c87486fd89b
child 8773	7d3af949dd34
child 8774	39754516eee6