hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:60d9709f2d8e
+:9abce5468583
 cLaserSighting := true;
 HHGear^.Message := 0;
 if (HHGear^.Angle - 32 >= 0) then dec(HHGear^.Angle,32)
 end;
-if (HHGear^.Message and gm_Attack) <> 0 then
+if (HHGear^.Message and gmAttack) <> 0 then
 begin
 shell := AddVisualGear(hwRound(Gear^.x), hwRound(Gear^.y), vgtShell);
 if shell <> nil then
 begin
 shell^.dX := gear^.dX.QWordValue / -8589934592;
 HHGear: PGear;
 begin
 AllInactive := false;
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
 dec(Gear^.Timer);
-if (Gear^.Timer = 0)or((Gear^.Message and gm_Destroy) <> 0)or((HHGear^.State and gstHHDriven) =
+if (Gear^.Timer = 0)or((Gear^.Message and gmDestroy) <> 0)or((HHGear^.State and gstHHDriven) =
 0) then
 begin
 StopSound(Gear^.SoundChannel);
 DeleteGear(Gear);
 AfterAttack;
 Gear^.X := Gear^.X + HHGear^.dX;
 HHGear^.X := Gear^.X;
 HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius);
-if (Gear^.Message and gm_Attack) <> 0 then
+if (Gear^.Message and gmAttack) <> 0 then
 if (Gear^.State and gsttmpFlag) <> 0 then Gear^.Timer := 1
 else
 else
 if (Gear^.State and gsttmpFlag) = 0 then Gear^.State := Gear^.State or gsttmpFlag;
-if ((Gear^.Message and gm_Left) <> 0) then Gear^.dX := - _0_3
+if ((Gear^.Message and gmLeft) <> 0) then Gear^.dX := - _0_3
 else
-if ((Gear^.Message and gm_Right) <> 0) then Gear^.dX := _0_3
+if ((Gear^.Message and gmRight) <> 0) then Gear^.dX := _0_3
 else Gear^.dX := _0;
 end;
 procedure doStepPickHammer(Gear: PGear);
 var
 if Gear^.Timer mod cHHStepTicks = 0 then
 begin
 b := true;
 if Gear^.dX.isNegative then
-HHGear^.Message := (HHGear^.Message and (gm_Attack or gm_Up or gm_Down)) or gm_Left
+HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmLeft
 else
-HHGear^.Message := (HHGear^.Message and (gm_Attack or gm_Up or gm_Down)) or gm_Right;
+HHGear^.Message := (HHGear^.Message and (gmAttack or gmUp or gmDown)) or gmRight;
 if ((HHGear^.State and gstMoving) = 0) then
 begin
 HHGear^.State := HHGear^.State and not gstAttacking;
 prevX := hwRound(HHGear^.X);
 DrawTunnel(HHGear^.X - Gear^.dX * cHHRadius, HHGear^.Y - _4 - Gear^.dY * cHHRadius + hwAbs(
 Gear^.dY) * 7,
 Gear^.dX, Gear^.dY,
 cHHRadius * 5, cHHRadius * 2 + 7);
-if (Gear^.Timer = 0) or ((HHGear^.Message and gm_Attack) <> 0) then
+if (Gear^.Timer = 0) or ((HHGear^.Message and gmAttack) <> 0) then
 begin
 HHGear^.Message := 0;
 HHGear^.State := HHGear^.State and (not gstNotKickable);
 DeleteGear(Gear);
 AfterAttack
 if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY := _0;
 HHGear^.X := HHGear^.X + HHGear^.dX;
 HHGear^.Y := HHGear^.Y + HHGear^.dY;
 HHGear^.dY := HHGear^.dY + cGravity;
-if (Gear^.Message and gm_Attack) <> 0 then
+if (Gear^.Message and gmAttack) <> 0 then
 begin
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 ApplyAngleBounds(PHedgehog(Gear^.Hedgehog)^, amRope);
 procedure DeleteMe;
 begin
 with HHGear^ do
 begin
-Message := Message and not gm_Attack;
+Message := Message and not gmAttack;
 State := (State or gstMoving) and not gstWinner;
 end;
 DeleteGear(Gear)
 end;
 procedure WaitCollision;
 begin
 with HHGear^ do
 begin
-Message := Message and not gm_Attack;
+Message := Message and not gmAttack;
 State := State or gstMoving;
 end;
 RopePoints.Count := 0;
 Gear^.Elasticity := _0;
 Gear^.doStep := @doStepRopeAfterAttack
 PlaySound(sndRopeRelease);
 DeleteMe;
 exit
 end;
-if (Gear^.Message and gm_Left  <> 0) then HHGear^.dX := HHGear^.dX - _0_0002
+if (Gear^.Message and gmLeft  <> 0) then HHGear^.dX := HHGear^.dX - _0_0002
 else
-if (Gear^.Message and gm_Right <> 0) then HHGear^.dX := HHGear^.dX + _0_0002;
+if (Gear^.Message and gmRight <> 0) then HHGear^.dX := HHGear^.dX + _0_0002;
 if not TestCollisionYwithGear(HHGear, 1) then HHGear^.dY := HHGear^.dY + cGravity;
 ropeDx := HHGear^.X - Gear^.X;
 // vector between hedgehog and rope attaching point
 /////
 tx := HHGear^.X;
 ty := HHGear^.Y;
-if ((Gear^.Message and gm_Down) <> 0) and (Gear^.Elasticity < Gear^.Friction) then
+if ((Gear^.Message and gmDown) <> 0) and (Gear^.Elasticity < Gear^.Friction) then
 if not (TestCollisionXwithGear(HHGear, hwSign(ropeDx))
 or TestCollisionYwithGear(HHGear, hwSign(ropeDy))) then
 Gear^.Elasticity := Gear^.Elasticity + _0_3;
-if ((Gear^.Message and gm_Up) <> 0) and (Gear^.Elasticity > _30) then
+if ((Gear^.Message and gmUp) <> 0) and (Gear^.Elasticity > _30) then
 if not (TestCollisionXwithGear(HHGear, -hwSign(ropeDx))
 or TestCollisionYwithGear(HHGear, -hwSign(ropeDy))) then
 Gear^.Elasticity := Gear^.Elasticity - _0_3;
 HHGear^.X := Gear^.X + mdX * Gear^.Elasticity;
 HHGear^.dY := -_0_6 * HHGear^.dY;
 haveCollision := true
 end;
 if haveCollision
-and (Gear^.Message and (gm_Left or gm_Right) <> 0)
+and (Gear^.Message and (gmLeft or gmRight) <> 0)
-and (Gear^.Message and (gm_Up or gm_Down) <> 0) then
+and (Gear^.Message and (gmUp or gmDown) <> 0) then
 begin
 HHGear^.dX := SignAs(hwAbs(HHGear^.dX) + _0_2, HHGear^.dX);
 HHGear^.dY := SignAs(hwAbs(HHGear^.dY) + _0_2, HHGear^.dY)
 end;
 HHGear^.dX := HHGear^.dX * len;
 HHGear^.dY := HHGear^.dY * len;
 end;
-if (Gear^.Message and gm_Attack) <> 0 then
+if (Gear^.Message and gmAttack) <> 0 then
 if (Gear^.State and gsttmpFlag) <> 0 then
 with PHedgehog(Gear^.Hedgehog)^ do
 begin
 PlaySound(sndRopeRelease);
 if CurAmmoType <> amParachute then
 exit
 end;
 if (Gear^.Elasticity > Gear^.Friction)
-or ((Gear^.Message and gm_Attack) = 0)
+or ((Gear^.Message and gmAttack) = 0)
 or ((HHGear^.State and gstHHDriven) = 0)
 or (HHGear^.Damage > 0) then
 begin
 with PHedgehog(Gear^.Hedgehog)^.Gear^ do
 begin
 State := State and not gstAttacking;
-Message := Message and not gm_Attack
+Message := Message and not gmAttack
 end;
 DeleteGear(Gear)
 end
 end;
 dX, dY: HWFloat;
 begin
 k := Gear^.Kind;
 exBoom := false;
-if (Gear^.Message and gm_Destroy) > 0 then
+if (Gear^.Message and gmDestroy) > 0 then
 begin
 DeleteGear(Gear);
 FreeActionsList;
 SetAllToActive;
 // something (hh, mine, etc...) could be on top of the case
 with CurrentHedgehog^ do
-if Gear <> nil then Gear^.Message := Gear^.Message and not (gm_LJump or gm_HJump);
+if Gear <> nil then Gear^.Message := Gear^.Message and not (gmLJump or gmHJump);
 exit
 end;
 if k = gtExplosives then
 begin
 procedure doStepFirePunchWork(Gear: PGear);
 var
 HHGear: PGear;
 begin
 AllInactive := false;
-if ((Gear^.Message and gm_Destroy) <> 0) then
+if ((Gear^.Message and gmDestroy) <> 0) then
 begin
 DeleteGear(Gear);
 AfterAttack;
 exit
 end;
 inc(Gear^.Timer);
 if TestCollisionYwithGear(HHGear, 1)
 or ((HHGear^.State and gstHHDriven) = 0)
 or CheckGearDrowning(HHGear)
-or ((Gear^.Message and gm_Attack) <> 0) then
+or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 begin
 Message := 0;
 SetLittle(dX);
 end;
 if not TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
 HHGear^.X := HHGear^.X + cWindSpeed * 200;
-if (Gear^.Message and gm_Left) <> 0 then HHGear^.X := HHGear^.X - cMaxWindSpeed * 80
+if (Gear^.Message and gmLeft) <> 0 then HHGear^.X := HHGear^.X - cMaxWindSpeed * 80
-else if (Gear^.Message and gm_Right) <> 0 then HHGear^.X := HHGear^.X + cMaxWindSpeed * 80;
+else if (Gear^.Message and gmRight) <> 0 then HHGear^.X := HHGear^.X + cMaxWindSpeed * 80;
-if (Gear^.Message and gm_Up) <> 0 then HHGear^.Y := HHGear^.Y - cGravity * 40
+if (Gear^.Message and gmUp) <> 0 then HHGear^.Y := HHGear^.Y - cGravity * 40
-else if (Gear^.Message and gm_Down) <> 0 then HHGear^.Y := HHGear^.Y + cGravity * 40;
+else if (Gear^.Message and gmDown) <> 0 then HHGear^.Y := HHGear^.Y + cGravity * 40;
 HHGear^.Y := HHGear^.Y + cGravity * 100;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y
 end;
 DeleteCI(HHGear);
 AfterAttack;
 HHGear^.State := HHGear^.State and not (gstAttacking or gstAttacked or gstMoving);
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 Gear^.doStep := @doStepParachuteWork;
 Gear^.Message := HHGear^.Message;
 doStepParachuteWork(Gear)
 not TryPlaceOnLand(TargetPoint.X - SpritesData[sprAmGirder].Width div 2,
 TargetPoint.Y - SpritesData[sprAmGirder].Height div 2,
 sprAmGirder, Gear^.State, true) then
 begin
 PlaySound(sndDenied);
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 HHGear^.State := HHGear^.State and not gstAttacking;
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 isCursorVisible := true;
 DeleteGear(Gear)
 end
 DeleteGear(Gear);
 AfterAttack;
 end;
 HHGear^.State := HHGear^.State and not (gstAttacking or gstAttacked);
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 TargetPoint.X := NoPointX
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepTeleportAfter(Gear: PGear);
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
 if not TryPlaceOnLand(TargetPoint.X - SpritesData[sprHHTelepMask].Width div 2,
 TargetPoint.Y - SpritesData[sprHHTelepMask].Height div 2,
 sprHHTelepMask, 0, false) then
 begin
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 HHGear^.State := HHGear^.State and not gstAttacking;
 HHGear^.State := HHGear^.State or gstHHChooseTarget;
 DeleteGear(Gear);
 isCursorVisible := true;
 PlaySound(sndDenied)
 HHGear: PGear;
 Msg, State: Longword;
 begin
 AllInactive := false;
-if ((Gear^.Message and not gm_Switch) <> 0) or (TurnTimeLeft = 0) then
+if ((Gear^.Message and not gmSwitch) <> 0) or (TurnTimeLeft = 0) then
 begin
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
-Msg := Gear^.Message and not gm_Switch;
+Msg := Gear^.Message and not gmSwitch;
 DeleteGear(Gear);
 OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
 ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 HHGear := CurrentHedgehog^.Gear;
 ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 HHGear^.Message := Msg;
 exit
 end;
-if (Gear^.Message and gm_Switch) <> 0 then
+if (Gear^.Message and gmSwitch) <> 0 then
 begin
 HHGear := CurrentHedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not gm_Switch;
+HHGear^.Message := HHGear^.Message and not gmSwitch;
-Gear^.Message := Gear^.Message and not gm_Switch;
+Gear^.Message := Gear^.Message and not gmSwitch;
 State := HHGear^.State;
 HHGear^.State := 0;
 HHGear^.Active := false;
 HHGear^.Z := cHHZ;
 RemoveGearFromList(HHGear);
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
 with HHGear^ do
 begin
 State := State and not gstAttacking;
-Message := Message and not gm_Attack
+Message := Message and not gmAttack
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepMortar(Gear: PGear);
 dec(Gear^.Health);
 Gear^.Timer := Gear^.Health*10;
 Gear^.PortalCounter:= 0;
 // This is not seconds, but at least it is *some* feedback
-if (Gear^.Health = 0) or ((Gear^.Message and gm_Attack) <> 0) then
+if (Gear^.Health = 0) or ((Gear^.Message and gmAttack) <> 0) then
 begin
 FollowGear := Gear;
 Gear^.RenderTimer := false;
 Gear^.doStep := @doStepCakeDown
 end
 HHGear: PGear;
 begin
 AllInactive := false;
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
-HHGear^.Message := HHGear^.Message and (not gm_Attack);
+HHGear^.Message := HHGear^.Message and (not gmAttack);
 DeleteCI(HHGear);
 Gear^.IntersectGear:= nil;
 FollowGear := Gear;
 procedure doStepBallgun(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
-HHGear^.Message := HHGear^.Message and not (gm_Up or gm_Down);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmDown);
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepBallgunWork
 end;
 ////////////////////////////////////////////////////////////////////////////////
 if Gear^.Angle < 2048 then inc(Gear^.Angle)
 else fChanged := false
 end
 else
 begin
-if ((Gear^.Message and gm_Left) <> 0) then
+if ((Gear^.Message and gmLeft) <> 0) then
 begin
 fChanged := true;
 Gear^.Angle := (Gear^.Angle + (4096 - cAngleSpeed)) mod 4096
 end;
-if ((Gear^.Message and gm_Right) <> 0) then
+if ((Gear^.Message and gmRight) <> 0) then
 begin
 fChanged := true;
 Gear^.Angle := (Gear^.Angle + cAngleSpeed) mod 4096
 end
 end;
 if Gear^.Timer < 3500 then
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtEvilTrace)
 else
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
-if ((HHGear^.Message and gm_Attack) <> 0) and (Gear^.Health <> 0) then
+if ((HHGear^.Message and gmAttack) <> 0) and (Gear^.Health <> 0) then
 begin
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtAirBomb, 0, Gear^.dX * _0_5, Gear^.dY *
 _0_5, 0);
 dec(Gear^.Health)
 end;
-if ((HHGear^.Message and gm_LJump) <> 0)
+if ((HHGear^.Message and gmLJump) <> 0)
 and ((Gear^.State and gsttmpFlag) = 0) then
 begin
 Gear^.State := Gear^.State or gsttmpFlag;
 PauseMusic;
 playSound(sndRideOfTheValkyries);
 AllInactive := false;
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
 //dec(Gear^.Timer);
 move := _0_1;
 fuel := 50;
-(*if (HHGear^.Message and gm_Precise) <> 0 then
+(*if (HHGear^.Message and gmPrecise) <> 0 then
 begin
 move:= _0_02;
 fuel:= 5;
 end;*)
-if (HHGear^.Message and gm_Up) <> 0 then
+if (HHGear^.Message and gmUp) <> 0 then
 begin
 if (not HHGear^.dY.isNegative) or (HHGear^.Y > -_256) then
 HHGear^.dY := HHGear^.dY - move;
 HHGear^.dY := HHGear^.dY - move;
 dec(Gear^.Health, fuel);
-Gear^.MsgParam := Gear^.MsgParam or gm_Up;
+Gear^.MsgParam := Gear^.MsgParam or gmUp;
 Gear^.Timer := GameTicks
 end;
-if (HHGear^.Message and gm_Left) <> 0 then move.isNegative := true;
+if (HHGear^.Message and gmLeft) <> 0 then move.isNegative := true;
-if (HHGear^.Message and (gm_Left or gm_Right)) <> 0 then
+if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then
 begin
 HHGear^.dX := HHGear^.dX + (move * _0_2);
 dec(Gear^.Health, fuel div 5);
-Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gm_Left or gm_Right));
+Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight));
 Gear^.Timer := GameTicks
 end;
 // erases them all at once :-/
 if (Gear^.Timer <> 0) and (GameTicks - Gear^.Timer > 250) then
 if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);
 Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(round(Gear^.Health / 20)) +
 '%', cWhiteColor, fntSmall)
 end;
-if HHGear^.Message and (gm_Attack or gm_Up or gm_Precise or gm_Left or gm_Right) <> 0 then Gear^
+if HHGear^.Message and (gmAttack or gmUp or gmPrecise or gmLeft or gmRight) <> 0 then Gear^
 .State := Gear^.State and not gsttmpFlag;
-HHGear^.Message := HHGear^.Message and not (gm_Up or gm_Precise or gm_Left or gm_Right);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
 or CheckGearDrowning(HHGear)
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
 or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
 HHGear, 1))
-or ((Gear^.Message and gm_Attack) <> 0) then
+or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 begin
 Message := 0;
 Active := true;
 FollowGear := HHGear;
 AfterAttack;
 with HHGear^ do
 begin
 State := State and not gstAttacking;
-Message := Message and not (gm_Attack or gm_Up or gm_Precise or gm_Left or gm_Right);
+Message := Message and not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight);
 if (dY < _0_1) and (dY > -_0_1) then
 begin
 Gear^.State := Gear^.State or gsttmpFlag;
 dY := dY - _0_2
 end
 move := _0_1;
 fuel := 50;
 if Gear^.Pos > 0 then
 dec(Gear^.Pos, 1)
-else if (HHGear^.Message and (gm_Left or gm_Right or gm_Up)) <> 0 then
+else if (HHGear^.Message and (gmLeft or gmRight or gmUp)) <> 0 then
 Gear^.Pos := 500;
 if HHGear^.dX.isNegative then
 Gear^.Tag := -1
 else
 Gear^.Tag := 1;
-if (HHGear^.Message and gm_Up) <> 0 then
+if (HHGear^.Message and gmUp) <> 0 then
 begin
 if (not HHGear^.dY.isNegative) or (HHGear^.Y > -_256) then
 HHGear^.dY := HHGear^.dY - move;
 HHGear^.dY := HHGear^.dY - move;
 dec(Gear^.Health, fuel);
-Gear^.MsgParam := Gear^.MsgParam or gm_Up;
+Gear^.MsgParam := Gear^.MsgParam or gmUp;
 end;
-if (HHGear^.Message and gm_Left) <> 0 then move.isNegative := true;
+if (HHGear^.Message and gmLeft) <> 0 then move.isNegative := true;
-if (HHGear^.Message and (gm_Left or gm_Right)) <> 0 then
+if (HHGear^.Message and (gmLeft or gmRight)) <> 0 then
 begin
 HHGear^.dX := HHGear^.dX + (move * _0_2);
 dec(Gear^.Health, fuel div 5);
-Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gm_Left or gm_Right));
+Gear^.MsgParam := Gear^.MsgParam or (HHGear^.Message and (gmLeft or gmRight));
 end;
 if Gear^.Health < 0 then Gear^.Health := 0;
 if ((GameTicks and $FF) = 0) and (Gear^.Health < 500) then
 for i:= ((500-Gear^.Health) div 250) downto 0 do
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtFeather);
-if (HHGear^.Message and gm_Attack <> 0) then
+if (HHGear^.Message and gmAttack <> 0) then
 begin
-HHGear^.Message := HHGear^.Message and not gm_Attack;
+HHGear^.Message := HHGear^.Message and not gmAttack;
 if Gear^.FlightTime > 0 then
 begin
 AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + 32, gtEgg, 0, Gear^.dX * _0_5, Gear^.dY, 0)
 ;
 PlaySound(sndBirdyLay);
 dec(Gear^.FlightTime)
 end;
 end;
-if HHGear^.Message and (gm_Up or gm_Precise or gm_Left or gm_Right) <> 0 then
+if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
 Gear^.State := Gear^.State and not gsttmpFlag;
-HHGear^.Message := HHGear^.Message and not (gm_Up or gm_Precise or gm_Left or gm_Right);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y - int2hwFloat(32);
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
 or CheckGearDrowning(HHGear)
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
 or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(
 HHGear, 1))
-or ((Gear^.Message and gm_Attack) <> 0) then
+or ((Gear^.Message and gmAttack) <> 0) then
 begin
 with HHGear^ do
 begin
 Message := 0;
 Active := true;
 DeleteGear(Gear);
 AfterAttack;
 exit
 end;
 HHGear := CurrentHedgehog^.Gear;
-HHGear^.Message := HHGear^.Message and not (gm_Up or gm_Precise or gm_Left or gm_Right);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
 if abs(hwRound(HHGear^.Y - Gear^.Y)) > 32 then
 begin
 if Gear^.Timer = 0 then
 Gear^.Y := Gear^.Y + _0_1
 end
 AllInactive := false;
 FollowGear := HHGear;
 with HHGear^ do
 begin
 State := State and not gstAttacking;
-Message := Message and not (gm_Attack or gm_Up or gm_Precise or gm_Left or gm_Right)
+Message := Message and not (gmAttack or gmUp or gmPrecise or gmLeft or gmRight)
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepEggWork(Gear: PGear);
 var flags: LongWord;
 CurWeapon: PAmmo;
 begin
 if (CurrentHedgehog <> nil)
 and (CurrentHedgehog^.Gear <> nil)
-and ((CurrentHedgehog^.Gear^.Message and gm_Switch) <> 0) then
+and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then
 With CurrentHedgehog^ do
 if (CurAmmoType = amPortalGun) then
 begin
-CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gm_Switch;
+CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gmSwitch;
 CurWeapon:= GetAmmoEntry(CurrentHedgehog^);
 flags := CurWeapon^.Timer and not 2;
 if (flags and 1) = 0 then
 CurWeapon^.Timer := flags or 1
 r0, r1: LongInt;
 odY: hwFloat;
 begin
 AllInactive := false;
 if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.
-Message and gm_Slot) <> 0) then
+Message and gmSlot) <> 0) then
 begin
 case CurrentHedgehog^.Gear^.MsgParam of
 0: PlaySound(sndPiano0);
 1: PlaySound(sndPiano1);
 2: PlaySound(sndPiano2);
 7: PlaySound(sndPiano7);
 else PlaySound(sndPiano8);
 end;
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
 CurrentHedgehog^.Gear^.MsgParam := 0;
-CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gm_Slot;
+CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gmSlot;
 end;
 if (*((Gear^.Pos = 3) and ((GameFlags and gfSolidLand) <> 0)) or*) (Gear^.Pos = 5) then
 // bounce up to 10 times (3 times on gameflagged solid land) before dropping past landscape
 begin
 gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
 gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
 if (GameTicks and $FF) = 0 then
 begin
-if (HHGear^.Message and gm_Right) <> 0 then
+if (HHGear^.Message and gmRight) <> 0 then
 begin
 if HHGear^.dX.isNegative and (Gear^.Tag < 20) then inc(Gear^.Tag)
 else if Gear^.Tag > 5 then dec(Gear^.Tag);
 end
-else if (HHGear^.Message and gm_Left) <> 0 then
+else if (HHGear^.Message and gmLeft) <> 0 then
 begin
 if HHGear^.dX.isNegative and (Gear^.Tag > 5) then dec(Gear^.Tag)
 else if Gear^.Tag < 20 then inc(Gear^.Tag);
 end
 end;
 procedure doStepFlamethrower(Gear: PGear);
 var
 HHGear: PGear;
 begin
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
-HHGear^.Message := HHGear^.Message and not (gm_Up or gm_Down or gm_Left or gm_Right);
+HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight);
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepFlamethrowerWork
 end;
 procedure doStepPoisonCloud(Gear: PGear);
 HHGear: PGear;
 begin
 AllInactive := false;
 HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
 dec(Gear^.Timer);
-if (HHGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gm_Destroy) <> 0) then
+if (HHGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
 begin
 DeleteGear(Gear);
 exit
 end;

changeset 3894	9abce5468583
parent 3852	37f883cc7edb
child 3907	5b516f0d9957