[Pythianproject-cvsmail] CVS: PythianProject/Source/Units conversationObjectsUnit.pas,1.6,1.7

[Kamil K. <kkr...@us...>]

Update of /cvsroot/pythianproject/PythianProject/Source/Units
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1976

Modified Files:
	conversationObjectsUnit.pas 
Log Message:
kk:
corrected
 - freechildren bug
 - freeconversations bug

corrected
 - parent = nil bug by Disable/Enable commands.

and more...

Index: conversationObjectsUnit.pas
===================================================================
RCS file: /cvsroot/pythianproject/PythianProject/Source/Units/conversationObjectsUnit.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** conversationObjectsUnit.pas	2000/09/17 10:46:17	1.6
--- conversationObjectsUnit.pas	2000/09/18 19:35:16	1.7
***************
*** 329,340 ****
  
  procedure TConversationGroup.FreeChildren;
! var a:integer;
  begin
!   a := FChildren.Count;
!   if a > 0 then
      repeat
!       TObject(FChildren.Items[a-1]).Free;
!       a := FChildren.Count;
!     until a = 0;
  end;
  
--- 329,343 ----
  
  procedure TConversationGroup.FreeChildren;
! var
!   o: TObject;
  begin
!   FChildren.Pack;
!   if FChildren.Count > 0 then
      repeat
!       o := FChildren.Items[0];
!       FChildren.Delete(0);
!       o.Free;
!     until FChildren.Count = 0;
!   FChildren.Clear;
  end;
  
***************
*** 348,353 ****
      begin
        Result := TConversationGroup(Children.Items[a]);
!       if result.enabled then
!         break;
      end;
    // 1st child (item) [that is enabled]
--- 351,356 ----
      begin
        Result := TConversationGroup(Children.Items[a]);
!       if Result.Enabled then
!         Break;
      end;
    // 1st child (item) [that is enabled]
***************
*** 517,526 ****
  
  procedure TConversationEngine.FreeConversations;
  begin
!   if Conversations.Count = 0 then exit;
!   repeat
!     TConversation(Conversations.Items[0]).Free;
!     Conversations.Delete(0);
!   until Conversations.Count = 0;
  end;
  
--- 520,533 ----
  
  procedure TConversationEngine.FreeConversations;
+ var
+   o: TObject;
  begin
!   // @kk 18/9/00 - found a bug - changed
!   if Conversations.Count > 0 then
!     repeat
!       o := Conversations.Items[0];
!       Conversations.Delete(0);
!       o.Free;
!     until Conversations.Count = 0;
  end;
  
***************
*** 670,676 ****
    else begin
      if Length(FTarget.ReturnStrRepr) > 20 then
!       inherited Create('Enable "'+Copy(FTarget.ReturnStrRepr,0,20)+'..."')
      else
!       inherited Create('Enable "'+FTarget.ReturnStrRepr+'"');
    end;
  end;
--- 677,683 ----
    else begin
      if Length(FTarget.ReturnStrRepr) > 20 then
!       Name := ('Enable "'+Copy(FTarget.ReturnStrRepr,0,20)+'..."')
      else
!       Name := ('Enable "'+FTarget.ReturnStrRepr+'"');
    end;
  end;
***************
*** 682,691 ****
    FTarget := ATarget;
    if FTarget = nil then
!     inherited Create('Disable (untargeted)')
    else begin
      if Length(FTarget.ReturnStrRepr) > 20 then
!       inherited Create('Disable "'+Copy(FTarget.ReturnStrRepr,0,20)+'..."')
      else
!       inherited Create('Disable "'+FTarget.ReturnStrRepr+'"');
    end;
  end;
--- 689,698 ----
    FTarget := ATarget;
    if FTarget = nil then
!     Name := ('Disable (untargeted)')
    else begin
      if Length(FTarget.ReturnStrRepr) > 20 then
!       Name := ('Disable "'+Copy(FTarget.ReturnStrRepr,0,20)+'..."')
      else
!       Name := ('Disable "'+FTarget.ReturnStrRepr+'"');
    end;
  end;