X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_msg.pas;h=a2ecc52e3e9a40e6a2c58dede4d26344e35847b3;hb=69ed21bb4a9cd4c59ba1acfd5971c7be5f854ee2;hp=1ed3809b3f313c857b086a2e906a00c512875f83;hpb=1bddfaf7b6421f1659a6f211dfdb1dfaef5d5173;p=d2df-sdl.git

diff --git a/src/engine/e_msg.pas b/src/engine/e_msg.pas
index 1ed3809..a2ecc52 100644
--- a/src/engine/e_msg.pas
+++ b/src/engine/e_msg.pas
@@ -39,6 +39,9 @@ type
     function AssignBuffer(P: Pointer; N: Integer; Full: Boolean = False): Boolean;
 
     procedure BeginReading();
+    procedure Seek(Pos: Integer);
+    procedure Skip(Size: Integer);
+    function BytesLeft(): Integer;
     function ReadData(V: Pointer; N: Integer): Integer;
     function ReadChar(): Char;
     function ReadByte(): Byte;
@@ -61,6 +64,7 @@ type
     procedure Write(V: Int64); overload;
     procedure Write(V: String); overload;
     procedure Write(V: TMD5Digest); overload;
+    procedure Write(V: TMsg);
   end;
 
 type
@@ -97,6 +101,7 @@ procedure TMsg.Free();
 begin
   if not OwnMemory then
     raise Exception.Create('TMsg.Free: called on borrowed memory');
+  Clear();
   OwnMemory := False;
   FreeMem(Data);
   Data := nil;
@@ -147,6 +152,18 @@ begin
   CurSize := CurSize + N;
 end;
 
+procedure TMsg.Write(V: TMsg);
+begin
+  if CurSize + V.CurSize > MaxSize then
+  begin
+    Overflow := True;
+    raise Exception.Create('TMsg.WriteData: buffer overrun!');
+    Exit;
+  end;
+  Move(V.Data^, (Data + CurSize)^, V.CurSize);
+  CurSize := CurSize + V.CurSize;
+end;
+
 procedure TMsg.Write(V: Byte); overload;
 begin
   WriteData(@V, 1);
@@ -164,12 +181,12 @@ end;
 
 procedure TMsg.Write(V: ShortInt); overload;
 begin
-  WriteData(@V, 2);
+  WriteData(@V, 1);
 end;
 
 procedure TMsg.Write(V: SmallInt); overload;
 begin
-  WriteData(@V, 1);
+  WriteData(@V, 2);
 end;
 
 procedure TMsg.Write(V: LongInt); overload;
@@ -206,6 +223,25 @@ begin
   Bit := 0;
 end;
 
+procedure TMsg.Seek(Pos: Integer);
+begin
+  if Pos > CurSize then
+    raise Exception.Create('TMsg.Seek: buffer overrun!');
+  ReadCount := Pos;
+end;
+
+procedure TMsg.Skip(Size: Integer);
+begin
+  if ReadCount + Size > CurSize then
+    raise Exception.Create('TMsg.Skip: buffer overrun!');
+  ReadCount := ReadCount + Size;
+end;
+
+function TMsg.BytesLeft(): Integer;
+begin
+  Result := CurSize - ReadCount;
+end;
+
 function TMsg.ReadData(V: Pointer; N: Integer): Integer;
 begin
   Result := 0;
@@ -248,13 +284,13 @@ end;
 function TMsg.ReadShortInt(): ShortInt;
 begin
   Result := 0;
-  ReadData(@Result, 2);
+  ReadData(@Result, 1);
 end;
 
 function TMsg.ReadSmallInt(): SmallInt;
 begin
   Result := 0;
-  ReadData(@Result, 1);
+  ReadData(@Result, 2);
 end;
 
 function TMsg.ReadLongInt(): LongInt;