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

[<wel...@us...>]

Revision: 4634
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4634&view=rev
Author:   weltall2
Date:     2009-10-11 08:16:56 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
committed a fix for  PS#569 - Annoying camera mode behaviour when camera auto-switches to First Person when zooming in. patch by entur

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

Modified: trunk/src/client/pscharcontrol.cpp
===================================================================
--- trunk/src/client/pscharcontrol.cpp	2009-10-11 07:58:03 UTC (rev 4633)
+++ trunk/src/client/pscharcontrol.cpp	2009-10-11 08:16:56 UTC (rev 4634)
@@ -556,7 +556,8 @@
     }
     else
     {
-        if (psengine->GetPSCamera()->GetMinDistance() == psengine->GetPSCamera()->GetDistance())
+        if (psengine->GetPSCamera()->GetMinDistance() == psengine->GetPSCamera()->GetDistance() &&
+            psengine->GetPSCamera()->GetCameraMode() == psengine->GetPSCamera()->CAMERA_FIRST_PERSON)
         {
             psengine->GetPSCamera()->SetCameraMode(psengine->GetPSCamera()->GetLastCameraMode());
         }


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