hedgewars: comparison hedgewars/uIO.pas

equal deleted inserted replaced

-:56d2f2d5aad8
+:4feced261c68
 TCmd = packed record
 Next: PCmd;
 loTime: Word;
 case byte of
 1: (len: byte;
-cmd: Char;
+cmd: Char);
-X, Y: LongInt);
 2: (str: shortstring);
 end;
 var IPCSock: PTCPSocket;
 fds: PSDLNet_SocketSet;
 end;
 procedure ParseIPCCommand(s: shortstring);
 var loTicks: Word;
 begin
 case s[1] of
 '!': begin AddFileLog('Ping? Pong!'); isPonged:= true; end;
 '?': SendIPC(_S'!');
 'e': ParseCommand(copy(s, 2, Length(s) - 1), true);
 'E': OutError(copy(s, 2, Length(s) - 1), true);
 OutError('IPC connection lost', true)
 end;
 end;
 procedure LoadRecordFromFile(fileName: shortstring);
-var f: file;
+var f  : File;
-ss: shortstring = '';
+ss : shortstring = '';
-i: LongInt;
+i  : LongInt;
-s: shortstring;
+s  : shortstring;
 begin
 // set RDNLY on file open
 filemode:= 0;
 {$I-}
 assign(f, fileName);
 reset(f, 1);
 tryDo(IOResult = 0, 'Error opening file ' + fileName, true);
 i:= 0; // avoid compiler hints
 s[0]:= #0;
 repeat
 BlockRead(f, s[1], 255 - Length(ss), i);
 if i > 0 then
 begin
 s[0]:= char(i);
 ss:= ss + s;
 while (Length(ss) > 1)and(Length(ss) > byte(ss[1])) do
 begin
 ParseIPCCommand(copy(ss, 2, byte(ss[1])));
-Delete(ss, 1, Succ(byte(ss[1])))
+Delete(ss, 1, Succ(byte(ss[1])));
 end
 end
 until i = 0;
 close(f)
 SendIPCRaw(@buf[0], length(buf) + 1)
 end;
 function isSyncedCommand(c: char): boolean;
 begin
-isSyncedCommand:= (c in ['+', '#', 'L', 'l', 'R', 'r', 'U', 'u', 'D', 'd', 'Z', 'z', 'A', 'a', 'S', 'j', 'J', ',', 'c', 'N', 'p', 'P', 'w', 't', '1', '2', '3', '4', '5']) or ((c >= #128) and (c <= char(128 + cMaxSlotIndex)))
+case c of
+'+', '#', 'L', 'l', 'R', 'r', 'U', 'u', 'D', 'd', 'Z', 'z', 'A', 'a', 'S', 'j', 'J', ',', 'c', 'N', 'p', 'P', 'w', 't', '1', '2', '3', '4', '5': isSyncedCommand:= true;
+else
+isSyncedCommand:= ((c >= #128) and (c <= char(128 + cMaxSlotIndex)))
+end
 end;
 procedure flushBuffer();
 begin
 if IPCSock <> nil then
 begin
 if IPCSock <> nil then
 begin
 if s[0] > #251 then
 s[0]:= #251;
 SDLNet_Write16(GameTicks, @s[Succ(byte(s[0]))]);
 AddFileLog('[IPC out] '+ sanitizeCharForLog(s[1]));
 inc(s[0], 2);
 if isSyncedCommand(s[1]) then
 begin
 if sendBuffer.count + byte(s[0]) >= cSendBufferSize then
 flushBuffer();
 Move(s, sendBuffer.buf[sendBuffer.count], byte(s[0]) + 1);
 inc(sendBuffer.count, byte(s[0]) + 1);
 if (s[1] = 'N') or (s[1] = '#') then
 flushBuffer();
 end else
 SDLNet_TCP_Send(IPCSock, @s, Succ(byte(s[0])))
 end
 inc(flushDelayTicks, Lag);
 if (flushDelayTicks >= cSendEmptyPacketTime) then
 begin
 if sendBuffer.count = 0 then
 SendIPC(_S'+');
 flushBuffer()
 end
 end;
 procedure NetGetNextCmd;
 var tmpflag: boolean;
 tmpflag:= false;
 lastTurnChecksum:= SDLNet_Read32(@headcmd^.str[2]);
 AddFileLog('got cmd "N": time '+IntToStr(hiTicks shl 16 + headcmd^.loTime))
 end;
 'p': begin
-x32:= SDLNet_Read32(@(headcmd^.X));
+x32:= SDLNet_Read32(@(headcmd^.str[2]));
-y32:= SDLNet_Read32(@(headcmd^.Y));
+y32:= SDLNet_Read32(@(headcmd^.str[6]));
 doPut(x32, y32, false)
 end;
 'P': begin
 // these are equations solved for CursorPoint
 // SDLNet_Read16(@(headcmd^.X)) == CursorPoint.X - WorldDx;
 // SDLNet_Read16(@(headcmd^.Y)) == cScreenHeight - CursorPoint.Y - WorldDy;
 if CurrentTeam^.ExtDriven then
 begin
-TargetCursorPoint.X:= LongInt(SDLNet_Read32(@(headcmd^.X))) + WorldDx;
+TargetCursorPoint.X:= LongInt(SDLNet_Read32(@(headcmd^.str[2]))) + WorldDx;
-TargetCursorPoint.Y:= cScreenHeight - LongInt(SDLNet_Read32(@(headcmd^.Y))) - WorldDy;
+TargetCursorPoint.Y:= cScreenHeight - LongInt(SDLNet_Read32(@(headcmd^.str[6]))) - WorldDy;
 if not bShowAmmoMenu and autoCameraOn then
 CursorPoint:= TargetCursorPoint
 end
 end;
 'w': ParseCommand('setweap ' + headcmd^.str[2], true);
 't': ParseCommand('taunt ' + headcmd^.str[2], true);
 'h': ParseCommand('hogsay ' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true);
 '1'..'5': ParseCommand('timer ' + headcmd^.cmd, true);
 else
-if (headcmd^.cmd >= #128) and (headcmd^.cmd <= char(128 + cMaxSlotIndex)) then
+if (byte(headcmd^.cmd) >= 128) and (byte(headcmd^.cmd) <= 128 + cMaxSlotIndex) then
 ParseCommand('slot ' + char(byte(headcmd^.cmd) - 79), true)
 else
 OutError('Unexpected protocol command: ' + headcmd^.cmd, True)
 end;
 RemoveCmd
 procedure doPut(putX, putY: LongInt; fromAI: boolean);
 begin
 if CheckNoTeamOrHH or isPaused then
 exit;
 bShowFinger:= false;
-if not CurrentTeam^.ExtDriven and bShowAmmoMenu then
+if (not CurrentTeam^.ExtDriven) and bShowAmmoMenu then
 begin
 bSelected:= true;
 exit
 end;
 headcmd:= nil;
 lastcmd:= nil;
 isPonged:= false;
 SocketString:= '';
 hiTicks:= 0;
 flushDelayTicks:= 0;
 sendBuffer.count:= 0;
 end;
 begin
 while headcmd <> nil do RemoveCmd;
 SDLNet_FreeSocketSet(fds);
 SDLNet_TCP_Close(IPCSock);
 SDLNet_Quit();
 end;
 end.

changeset 10015	4feced261c68
parent 9998	736015b847e3
parent 9974	fb84e878111d
child 10108	c68cf030eded