hedgewars-draft: comparison hedgewars/uCommandHandlers.pas

equal deleted inserted replaced

-:f98ec3aecf4e
+:b1b7eb9c8cc9
 procedure chConfirm(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if GameState = gsConfirm then
 begin
-SendIPCc('Q');
+SendIPC(_S'Q');
 GameState:= gsExit
 end
 else
 ParseCommand('chat team', true);
 end;
 procedure chHalt (var s: shortstring);
 begin
 s:= s; // avoid compiler hint
-SendIPCc('H');
+SendIPC(_S'H');
 GameState:= gsExit
 end;
 procedure chCheckProto(var s: shortstring);
 var i: LongInt;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('L');
+SendIPC(_S'L');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmLeft and InputMask);
 ScriptCall('onLeft');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('l');
+SendIPC(_S'l');
 with CurrentHedgehog^.Gear^ do
 Message:= Message and (not (gmLeft and InputMask));
 ScriptCall('onLeftUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('R');
+SendIPC(_S'R');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmRight and InputMask);
 ScriptCall('onRight');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('r');
+SendIPC(_S'r');
 with CurrentHedgehog^.Gear^ do
 Message:= Message and (not (gmRight and InputMask));
 ScriptCall('onRightUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('U');
+SendIPC(_S'U');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmUp and InputMask);
 ScriptCall('onUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('u');
+SendIPC(_S'u');
 with CurrentHedgehog^.Gear^ do
 Message:= Message and (not (gmUp and InputMask));
 ScriptCall('onUpUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('D');
+SendIPC(_S'D');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmDown and InputMask);
 ScriptCall('onDown');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('d');
+SendIPC(_S'd');
 with CurrentHedgehog^.Gear^ do
 Message:= Message and (not (gmDown and InputMask));
 ScriptCall('onDownUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('Z');
+SendIPC(_S'Z');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmPrecise and InputMask);
 ScriptCall('onPrecise');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('z');
+SendIPC(_S'z');
 with CurrentHedgehog^.Gear^ do
 Message:= Message and (not (gmPrecise and InputMask));
 ScriptCall('onPreciseUp');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('j');
+SendIPC(_S'j');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmLJump and InputMask);
 ScriptCall('onLJump');
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('J');
+SendIPC(_S'J');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmHJump and InputMask);
 ScriptCall('onHJump');
 end;
 AddFileLog('/+attack: hedgehog''s Gear^.State = '+inttostr(State));
 if ((State and gstHHDriven) <> 0) then
 begin
 FollowGear:= CurrentHedgehog^.Gear;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('A');
+SendIPC(_S'A');
 Message:= Message or (gmAttack and InputMask);
 ScriptCall('onAttack');
 end
 end
 end;
 exit;
 with CurrentHedgehog^.Gear^ do
 begin
 if not CurrentTeam^.ExtDriven and
 ((Message and gmAttack) <> 0) then
-SendIPCc('a');
+SendIPC(_S'a');
 Message:= Message and (not (gmAttack and InputMask));
 ScriptCall('onAttackUp');
 end
 end;
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc('S');
+SendIPC(_S'S');
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 Message:= Message or (gmSwitch and InputMask);
 ScriptCall('onSwitch');
 end;
 begin
 s:= s; // avoid compiler hint
 TryDo(AllInactive, '/nextturn called when not all gears are inactive', true);
 if not CurrentTeam^.ExtDriven then
-SendIPCc('N');
+SendIPC(_S'N');
 AddFileLog('Doing SwitchHedgehog: time '+inttostr(GameTicks));
 end;
 procedure chTimer(var s: shortstring);
 begin
 end
 end;
 procedure chSlot(var s: shortstring);
 var slot: LongWord;
+ss: shortstring;
 begin
 if (s[0] <> #1) or CheckNoTeamOrHH then
 exit;
 slot:= byte(s[1]) - 49;
 if slot > cMaxSlotIndex then
 exit;
 if not CurrentTeam^.ExtDriven then
-SendIPCc(char(byte(s[1]) + 79));
+begin
+ss[0]:= #1;
+ss[1]:= char(byte(s[1]) + 79);
+SendIPC(ss);
+end;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 begin
 Message:= Message or (gmSlot and InputMask);
 MsgParam:= slot;

changeset 7068	b1b7eb9c8cc9
parent 7058	56596f3531d9
child 7103	1c1afb5a1565