[Planeshift-cvs] CVS: planeshift/src/common/effects pseffectobj.cpp,1.25,1.26 pseffectobjtext.cpp,1.4,1.5

[Andrew R. <aar...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/effects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16130/src/common/effects

Modified Files:
	pseffectobj.cpp pseffectobjtext.cpp 
Log Message:
Small change for switch to spr2d.


Index: pseffectobj.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobj.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pseffectobj.cpp	30 Mar 2005 19:48:42 -0000	1.25
--- pseffectobj.cpp	24 May 2005 08:26:25 -0000	1.26
***************
*** 464,473 ****
  
      if (isAlive && anchorMesh && anchor->IsReady())
! 	{
!    		mesh->GetMovable()->SetSector(anchorMesh->GetMovable()->GetSectors()->Get(0));
! 		mesh->GetMovable()->SetPosition(anchorMesh->GetMovable()->GetFullPosition());
          if (dir == DT_NONE)
              matBase = anchorMesh->GetMovable()->GetFullTransform().GetT2O();
! 	}
  
      if (keyFrames->Length() == 0)
--- 464,473 ----
  
      if (isAlive && anchorMesh && anchor->IsReady())
!     {
!         mesh->GetMovable()->SetSector(anchorMesh->GetMovable()->GetSectors()->Get(0));
!         mesh->GetMovable()->SetPosition(anchorMesh->GetMovable()->GetFullPosition());
          if (dir == DT_NONE)
              matBase = anchorMesh->GetMovable()->GetFullTransform().GetT2O();
!     }
  
      if (keyFrames->Length() == 0)

Index: pseffectobjtext.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/effects/pseffectobjtext.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pseffectobjtext.cpp	24 May 2005 07:55:05 -0000	1.4
--- pseffectobjtext.cpp	24 May 2005 08:26:25 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  #include <iengine/region.h>
  #include <ivideo/graph2d.h>
+ #include <iengine/sector.h>
  
  
***************
*** 212,217 ****
          return true;
  
!     if (!psEffectObj::Update(elapsed))
!         return false;
  
      int cell = 0;
--- 213,240 ----
          return true;
  
!     life += (float)elapsed;
!     while (life > animLength && killTime <= 0)
!         life -= animLength;
! 
!     if (life >= birth && !isAlive)
!     {
!         isAlive = true;
! //        if (anchorMesh)
! //            anchorMesh->GetChildren()->Add(mesh);
!     }
! 
!     if (isAlive && anchorMesh && anchor->IsReady())
!     {
!         mesh->GetMovable()->SetSector(anchorMesh->GetMovable()->GetSectors()->Get(0));
!         mesh->GetMovable()->SetPosition(anchorMesh->GetMovable()->GetFullPosition());
!         mesh->GetMovable()->UpdateMove();
!         if (dir == DT_NONE)
!             matBase = anchorMesh->GetMovable()->GetFullTransform().GetT2O();
!     }
! 
!     return true;    
!     
!     //if (!psEffectObj::Update(elapsed))
!     //    return false;
  
      int cell = 0;