sheepy-clone: comparison hedgewars/CCHandlers.inc

equal deleted inserted replaced

-:78a68cc4d846
+:f7628ebfccde
 *)
 function CheckNoTeamOrHH: boolean;
 var Result: boolean;
 begin
-Result:= (CurrentTeam = nil) or (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear = nil);
+Result:= (CurrentTeam = nil) or (CurrentHedgehog^.Gear = nil);
 {$IFDEF DEBUGFILE}
 if Result then
 if CurrentTeam = nil then AddFileLog('CONSOLE: CurTeam = nil')
 else AddFileLog('CONSOLE: CurTeam <> nil, Gear = nil');
 {$ENDIF}
 begin
 if (not isDeveloperMode) or (CurrentTeam = nil) then exit;
 with CurrentTeam^ do
 begin
 SplitBySpace(id, s);
-val(id, Hedgehogs[HedgehogsNumber].BotLevel);
+CurrentHedgehog:= @Hedgehogs[HedgehogsNumber];
+val(id, CurrentHedgehog^.BotLevel);
 Gear:= AddGear(0, 0, gtHedgehog, 0, _0, _0, 0);
-Gear^.Hedgehog:= @Hedgehogs[HedgehogsNumber];
 val(s, Gear^.Health);
 TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
 PHedgehog(Gear^.Hedgehog)^.Team:= CurrentTeam;
 Hedgehogs[HedgehogsNumber].AmmoStore:= TeamsCount - 1;
 Hedgehogs[HedgehogsNumber].Gear:= Gear;
 procedure chLeft_p(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('L');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_Left
 end;
 procedure chLeft_m(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('l');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message and not gm_Left
 end;
 procedure chRight_p(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('R');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_Right
 end;
 procedure chRight_m(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('r');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message and not gm_Right
 end;
 procedure chUp_p(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('U');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_Up
 end;
 procedure chUp_m(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('u');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message and not gm_Up
 end;
 procedure chDown_p(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('D');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_Down
 end;
 procedure chDown_m(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('d');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message and not gm_Down
 end;
 procedure chLJump(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('j');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_LJump
 end;
 procedure chHJump(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('J');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_HJump
 end;
 procedure chAttack_p(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= false;
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 begin
 {$IFDEF DEBUGFILE}AddFileLog('/+attack: Gear^.State = '+inttostr(State));{$ENDIF}
 if ((State and gstHHDriven) <> 0) and
 ((State and (gstAttacked or gstHHChooseTarget)) = 0) then
 begin
-FollowGear:= CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear;
+FollowGear:= CurrentHedgehog^.Gear;
 if not CurrentTeam^.ExtDriven then SendIPC('A');
 Message:= Message or gm_Attack
 end
 end
 end;
 procedure chAttack_m(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 begin
 if not CurrentTeam^.ExtDriven and
 ((Message and gm_Attack) <> 0) then SendIPC('a');
 Message:= Message and not gm_Attack
 end
 procedure chSwitch(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('S');
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^ do
+with CurrentHedgehog^.Gear^ do
 Message:= Message or gm_Switch
 end;
 procedure chNextTurn(var s: shortstring);
 begin
 procedure chTimer(var s: shortstring);
 begin
 if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5') or (CurrentTeam = nil) then exit;
 bShowFinger:= false;
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog] do
+with CurrentHedgehog^ do
 if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_Timerable) <> 0 then
 begin
 Ammo^[CurSlot, CurAmmo].Timer:= 1000 * (byte(s[1]) - 48);
 with CurrentTeam^ do
 ApplyAmmoChanges(Hedgehogs[CurrHedgehog]);
 begin
 bSelected:= true;
 exit
 end;
-with CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^,
+with CurrentHedgehog^.Gear^,
-CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog] do
+CurrentHedgehog^ do
 if (State and gstHHChooseTarget) <> 0 then
 begin
 isCursorVisible:= false;
 if not CurrentTeam^.ExtDriven then
 begin
 procedure chFindhh(var s: shortstring);
 begin
 if CheckNoTeamOrHH then exit;
 bShowFinger:= true;
-FollowGear:= CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear
+FollowGear:= CurrentHedgehog^.Gear
 end;
 procedure chPause(var s: shortstring);
 begin
 isPaused:= not isPaused;

changeset 602	f7628ebfccde
parent 595	5ee863f2f568
child 604	2f1165467a66