[PlaneShift-svn] SF.net SVN: planeshift:[4847] trunk/src/client/pscamera.cpp

[<Kha...@us...>]

Revision: 4847
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4847&view=rev
Author:   Khakilord
Date:     2009-12-01 01:22:07 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Cleaned up some of the camera warping code.

Modified Paths:
--------------
    trunk/src/client/pscamera.cpp

Modified: trunk/src/client/pscamera.cpp
===================================================================
--- trunk/src/client/pscamera.cpp	2009-12-01 01:07:28 UTC (rev 4846)
+++ trunk/src/client/pscamera.cpp	2009-12-01 01:22:07 UTC (rev 4847)
@@ -745,20 +745,20 @@
 			if(dist > minPortalDist)
 				continue;
 			
-			minPortalDist = dist;
-			closestMesh = pmw;
 			int portalCount = pmw->GetPortalContainer()->GetPortalCount();
 			for(int portalIndex = 0; portalIndex < portalCount; portalIndex++)
 			{
 				iPortal *po = pmw->GetPortalContainer()->GetPortal(portalIndex);
-				if (po->GetSector() == targetSector && po->GetFlags ().Check (CS_PORTAL_WARP))
-				{
+				if(po->GetSector() == targetSector)
+				{			
+					minPortalDist = dist;
+					closestMesh = pmw;
 					closestPortal = po;
 				}
 			}
 		}
 		// Apply the warp from the closest portal
-		if(closestPortal)
+		if(closestPortal && closestPortal->GetFlags ().Check (CS_PORTAL_WARP))
 		{
 			csReversibleTransform warp_wor;
 			closestPortal->ObjectToWorld (closestMesh->GetMovable ()->GetTransform (), warp_wor);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.