Mercurial > hg > Members > koba > t_dandy

changeset 63:3c2fc35a6b55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix code.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Wed, 09 Feb 2011 00:52:27 +0900
parents a5ddd99181df
children 07bc996c8e49
files collision_task.cc ppe/chara_state10.cc ppe/chara_state11.cc spe/chara_state10.cc
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
 }
--- 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;
 }
--- 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;
 }