[Openmugen-cvs] CVS: OpenMugen/src VM.cpp,1.4,1.5

[SakirSoft <sak...@us...>]

Update of /cvsroot/openmugen/OpenMugen/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9250

Modified Files:
	VM.cpp 
Log Message:
Added InGuardDist trigger

Index: VM.cpp
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/VM.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- VM.cpp	29 Jun 2005 12:21:27 -0000	1.4
+++ VM.cpp	6 Jul 2005 18:56:43 -0000	1.5
@@ -868,7 +868,7 @@ void CVirtualMachine::AnimTime()
     if( tActionElement == NULL)
        return;  
     
-    nAnimTime=tActionElement->nCompletAnimTime-m_CurrentPlayer->GetCurrentAnimTime();
+    nAnimTime=tActionElement->nCompletAnimTime- (m_CurrentPlayer->GetCurrentAnimTime());
     //PrintMessage("AnimTime= %i",nAnimTime);
     m_Stack.Push((float)nAnimTime,"#");
 }
@@ -1605,7 +1605,10 @@ opponent's HitDef. Returns 0 if out of g
 */
 void CVirtualMachine::InGuardDist()
 {
-    m_Stack.Push(0,"#");
+    if(  m_CurrentPlayer->GetDistX() <= m_pPlayer2->GetAttackDist() && m_pPlayer2->GetMoveType() == attack)
+       m_Stack.Push(1,"#");
+    else
+       m_Stack.Push(0,"#");
 }
 
 //Is helper