hedgewars: comparison hedgewars/CCHandlers.inc

equal deleted inserted replaced

-:60d9709f2d8e
+:9abce5468583
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('L');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Left
+Message:= Message or gmLeft
 end;
 procedure chLeft_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('l');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Left
+Message:= Message and not gmLeft
 end;
 procedure chRight_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('R');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Right
+Message:= Message or gmRight
 end;
 procedure chRight_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('r');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Right
+Message:= Message and not gmRight
 end;
 procedure chUp_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('U');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Up
+Message:= Message or gmUp
 end;
 procedure chUp_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('u');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Up
+Message:= Message and not gmUp
 end;
 procedure chDown_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('D');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Down
+Message:= Message or gmDown
 end;
 procedure chDown_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('d');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Down
+Message:= Message and not gmDown
 end;
 procedure chPrecise_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('Z');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Precise
+Message:= Message or gmPrecise
 end;
 procedure chPrecise_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('z');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Precise
+Message:= Message and not gmPrecise
 end;
 procedure chLJump(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('j');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_LJump
+Message:= Message or gmLJump
 end;
 procedure chHJump(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('J');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_HJump
+Message:= Message or gmHJump
 end;
 procedure chAttack_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 {$IFDEF DEBUGFILE}AddFileLog('/+attack: hedgehog''s Gear^.State = '+inttostr(State));{$ENDIF}
 if ((State and gstHHDriven) <> 0) then
 begin
 FollowGear:= CurrentHedgehog^.Gear;
 if not CurrentTeam^.ExtDriven then SendIPC('A');
-Message:= Message or gm_Attack
+Message:= Message or gmAttack
 end
 end
 end;
 procedure chAttack_m(var s: shortstring);
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 with CurrentHedgehog^.Gear^ do
 begin
 if not CurrentTeam^.ExtDriven and
-((Message and gm_Attack) <> 0) then SendIPC('a');
+((Message and gmAttack) <> 0) then SendIPC('a');
-Message:= Message and not gm_Attack
+Message:= Message and not gmAttack
 end
 end;
 procedure chSwitch(var s: shortstring);
 begin
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('S');
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
-Message:= Message or gm_Switch
+Message:= Message or gmSwitch
 end;
 procedure chNextTurn(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if not CurrentTeam^.ExtDriven then SendIPC(s);
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Timer;
+Message:= Message or gmTimer;
 MsgParam:= byte(s[1]) - ord('0')
 end
 end;
 procedure chSlot(var s: shortstring);
 if not CurrentTeam^.ExtDriven then SendIPC(char(byte(s[1]) + 79));
 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Slot;
+Message:= Message or gmSlot;
 MsgParam:= slot
 end
 end;
 procedure chSetWeapon(var s: shortstring);
 if not CurrentTeam^.ExtDriven then SendIPC('w' + s);
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Weapon;
+Message:= Message or gmWeapon;
 MsgParam:= byte(s[1]);
 end;
 end;
 procedure chTaunt(var s: shortstring);
 if not CurrentTeam^.ExtDriven then SendIPC('t' + s);
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Animate;
+Message:= Message or gmAnimate;
 MsgParam:= byte(s[1])
 end
 end;
 procedure chHogSay(var s: shortstring);
 TargetPoint.Y:= putY
 end;
 {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF}
 State:= State and not gstHHChooseTarget;
 if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then
-Message:= Message or gm_Attack;
+Message:= Message or gmAttack;
 end
 else
 if CurrentTeam^.ExtDriven then
 OutError('got /put while not being in choose target mode', false)
 end;

changeset 3894	9abce5468583
parent 3836	833c0f32e326
child 3928	2560731c860d