# HG changeset patch
# User koba <koba@cr.ie.u-ryukyu.ac.jp>
# Date 1297180347 -32400
# Node ID 3c2fc35a6b55c9dddb56c80ba43123cae8a195a8
# Parent  a5ddd99181df3e72616c6b50857072555d5c19a2
fix code.

diff -r a5ddd99181df -r 3c2fc35a6b55 collision_task.cc
--- a/collision_task.cc	Wed Feb 09 00:39:35 2011 +0900
+++ b/collision_task.cc	Wed Feb 09 00:52:27 2011 +0900
@@ -89,7 +89,9 @@
 
     enemycount = property->enemycount;
 
-    jiki = property->jiki;
+    if (jiki.bf == FALSE) {
+	jiki = property->jiki;
+    }
 
     lg = property->lg;
     infg = property->infg;
diff -r a5ddd99181df -r 3c2fc35a6b55 ppe/chara_state10.cc
--- a/ppe/chara_state10.cc	Wed Feb 09 00:39:35 2011 +0900
+++ b/ppe/chara_state10.cc	Wed Feb 09 00:52:27 2011 +0900
@@ -28,7 +28,7 @@
     p->dt1 = rinkx;
     p->dt2 = rinky;
     
-    p->state_task = STATE13;
+    p->state_task = STATE10;
     *q = *p;
     return 0;
 }
diff -r a5ddd99181df -r 3c2fc35a6b55 ppe/chara_state11.cc
--- a/ppe/chara_state11.cc	Wed Feb 09 00:39:35 2011 +0900
+++ b/ppe/chara_state11.cc	Wed Feb 09 00:52:27 2011 +0900
@@ -37,7 +37,7 @@
     p->dt1 = 0;
     p->dt2 = 0;
 
-    p->state_task = STATE12;
+    p->state_task = STATE11;
     *q = *p;
     return 0;
 }
diff -r a5ddd99181df -r 3c2fc35a6b55 spe/chara_state10.cc
--- a/spe/chara_state10.cc	Wed Feb 09 00:39:35 2011 +0900
+++ b/spe/chara_state10.cc	Wed Feb 09 00:52:27 2011 +0900
@@ -28,7 +28,7 @@
     p->dt1 = rinkx;
     p->dt2 = rinky;
     
-    p->state_task = STATE13;
+    p->state_task = STATE10;
     *q = *p;
     return 0;
 }