[PlaneShift-svn] SF.net SVN: planeshift:[1990] trunk

[<hei...@us...>]

Revision: 1990
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1990&view=rev
Author:   heinchen
Date:     2008-08-02 17:43:09 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
fixing fs#1731 - bogus anims in chars

Modified Paths:
--------------
    trunk/docs/history.txt
    trunk/src/client/pscelclient.cpp

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2008-08-02 16:25:16 UTC (rev 1989)
+++ trunk/docs/history.txt	2008-08-02 17:43:09 UTC (rev 1990)
@@ -1,7 +1,7 @@
 *** 2008-08-02 by Andreas Heinchen
 - Patch for FS#2048 from Arerano
 - Patch for FS#2049 to FS#2055 from Arerano
-- Patch for FS#1283 from weltall
+- Patch for FS#1283, FS#1731 from weltall
 
 *** 2008-07-31 by Andreas Heinchen
 - Fixed FS#426 - stamina drain on map load

Modified: trunk/src/client/pscelclient.cpp
===================================================================
--- trunk/src/client/pscelclient.cpp	2008-08-02 16:25:16 UTC (rev 1989)
+++ trunk/src/client/pscelclient.cpp	2008-08-02 17:43:09 UTC (rev 1990)
@@ -1725,6 +1725,9 @@
         fadein = 0.0;
         fadeout = 1.5;
     }
+    
+    //removes the idle_var animation if it's in execution to avoid interferences.
+    cal3dstate->GetCal3DModel()->getMixer()->removeAction(cal3dstate->FindAnim("idle_var"));
 
     return cal3dstate->SetAnimAction(anim,fadein,fadeout);
 }
@@ -1755,11 +1758,11 @@
             SetIdleAnimation(psengine->GetCharControl()->GetMovementManager()->GetModeIdleAnim(movementMode));
             break;
         case psModeMessage::SPELL_CASTING:
-            SetIdleAnimation("cast");
             break;
 
         case psModeMessage::COMBAT:
             // TODO: Get stance and set anim for that stance
+            cal3dstate->ClearAllAnims();
             SetIdleAnimation("combat stand");
             break;
             


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