Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix an oops with chat string appearing between two net commands (it's very rare and random condition, but I caught it while playing via net)
authorunc0rr
Sun, 08 Jun 2008 18:53:02 +0000
changeset 977 fdbf2a5c1ad7
parent 976 368a8926632b
child 978 4d4f290d05c5
Fix an oops with chat string appearing between two net commands (it's very rare and random condition, but I caught it while playing via net)
hedgewars/uIO.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uIO.pas	Fri Jun 06 16:14:23 2008 +0000
+++ b/hedgewars/uIO.pas	Sun Jun 08 18:53:02 2008 +0000
@@ -212,61 +212,60 @@
 
 procedure NetGetNextCmd;
 var tmpflag: boolean;
-    s: shortstring;
+	s: shortstring;
 begin
-while (headcmd <> nil) and (headcmd^.cmd = 's') do
-      begin
-      s:= copy(headcmd^.str, 2, Pred(headcmd^.len));
-      AddChatString(s);
-      WriteLnToConsole(s);
-      RemoveCmd
-      end;
+tmpflag:= true;
+
+while (headcmd <> nil) and ((GameTicks = headcmd^.Time) or (headcmd^.cmd = 's')) do
+	begin
+	tmpflag:= true;
+	case headcmd^.cmd of
+		'L': ParseCommand('+left', true);
+		'l': ParseCommand('-left', true);
+		'R': ParseCommand('+right', true);
+		'r': ParseCommand('-right', true);
+		'U': ParseCommand('+up', true);
+		'u': ParseCommand('-up', true);
+		'D': ParseCommand('+down', true);
+		'd': ParseCommand('-down', true);
+		'A': ParseCommand('+attack', true);
+		'a': ParseCommand('-attack', true);
+		'S': ParseCommand('switch', true);
+		'j': ParseCommand('ljump', true);
+		'J': ParseCommand('hjump', true);
+		',': ParseCommand('skip', true);
+		's': begin
+			s:= copy(headcmd^.str, 2, Pred(headcmd^.len));
+			AddChatString(s);
+			WriteLnToConsole(s)
+			end;
+		'N': begin
+			tmpflag:= false;
+			{$IFDEF DEBUGFILE}AddFileLog('got cmd "N": time '+inttostr(headcmd^.Time)){$ENDIF}
+			end;
+		'p': begin
+			TargetPoint.X:= SmallInt(SDLNet_Read16(@(headcmd^.X)));
+			TargetPoint.Y:= SmallInt(SDLNet_Read16(@(headcmd^.Y)));
+			ParseCommand('put', true)
+			end;
+		'P': begin
+			CursorPoint.X:= SmallInt(SDLNet_Read16(@(headcmd^.X)) + WorldDx);
+			CursorPoint.Y:= SmallInt(SDLNet_Read16(@(headcmd^.Y)) + WorldDy);
+			end;
+		'w': ParseCommand('setweap ' + headcmd^.str[2], true);
+		'1'..'5': ParseCommand('timer ' + headcmd^.cmd, true);
+		#128..char(128 + cMaxSlotIndex): ParseCommand('slot ' + char(byte(headcmd^.cmd) - 79), true)
+		end;
+	RemoveCmd
+	end;
 
 if (headcmd <> nil) then
-   TryDo(GameTicks <= headcmd^.Time,
-         'oops, queue error. in buffer: ' + headcmd^.cmd +
-         ' (' + inttostr(GameTicks) + ' > ' +
-         inttostr(headcmd^.Time) + ')',
-         true);
+	TryDo(GameTicks < headcmd^.Time,
+			'oops, queue error. in buffer: ' + headcmd^.cmd +
+			' (' + inttostr(GameTicks) + ' > ' +
+			inttostr(headcmd^.Time) + ')',
+			true);
 
-tmpflag:= true;
-while (headcmd <> nil) and (GameTicks = headcmd^.Time) do
-   begin
-   tmpflag:= true;
-   case headcmd^.cmd of
-        'L': ParseCommand('+left', true);
-        'l': ParseCommand('-left', true);
-        'R': ParseCommand('+right', true);
-        'r': ParseCommand('-right', true);
-        'U': ParseCommand('+up', true);
-        'u': ParseCommand('-up', true);
-        'D': ParseCommand('+down', true);
-        'd': ParseCommand('-down', true);
-        'A': ParseCommand('+attack', true);
-        'a': ParseCommand('-attack', true);
-        'S': ParseCommand('switch', true);
-        'j': ParseCommand('ljump', true);
-        'J': ParseCommand('hjump', true);
-        ',': ParseCommand('skip', true);
-        'N': begin
-             tmpflag:= false;
-             {$IFDEF DEBUGFILE}AddFileLog('got cmd "N": time '+inttostr(headcmd^.Time)){$ENDIF}
-             end;
-        'p': begin
-             TargetPoint.X:= SmallInt(SDLNet_Read16(@(headcmd^.X)));
-             TargetPoint.Y:= SmallInt(SDLNet_Read16(@(headcmd^.Y)));
-             ParseCommand('put', true)
-             end;
-        'P': begin
-             CursorPoint.X:= SmallInt(SDLNet_Read16(@(headcmd^.X)) + WorldDx);
-             CursorPoint.Y:= SmallInt(SDLNet_Read16(@(headcmd^.Y)) + WorldDy);
-             end;
-        'w': ParseCommand('setweap ' + headcmd^.str[2], true);
-        '1'..'5': ParseCommand('timer ' + headcmd^.cmd, true);
-        #128..char(128 + cMaxSlotIndex): ParseCommand('slot ' + char(byte(headcmd^.cmd) - 79), true)
-        end;
-   RemoveCmd
-   end;
 isInLag:= (headcmd = nil) and tmpflag
 end;
sheepy-clone