# HG changeset patch
# User koba <koba@cr.ie.u-ryukyu.ac.jp>
# Date 1293519004 -32400
# Node ID 813f5461daabb58976f35e906922843212c7c557
# Parent  871f7d9a2f351125bf82d6549f32583ae445b1cf
collision bug fix.

diff -r 871f7d9a2f35 -r 813f5461daab TaskDandy.cc
--- a/TaskDandy.cc	Mon Dec 27 17:21:24 2010 +0900
+++ b/TaskDandy.cc	Tue Dec 28 15:50:04 2010 +0900
@@ -289,9 +289,6 @@
 	printf("frame = %d\n", filpcount);
 	//charpatern();
 	//bosguage();
-
-	Putbom();
-	tokuten();
     
 	count++;
 	//PutSprite(count, 0, 960 - 96, 10);
@@ -302,6 +299,9 @@
 	obj_draw();
 	gamef = game_pause(gamef);
 
+
+	Putbom();
+	tokuten();
 	if (use_keybord) {
 	    keybord();
 	} else {
diff -r 871f7d9a2f35 -r 813f5461daab collision_task.cc
--- a/collision_task.cc	Mon Dec 27 17:21:24 2010 +0900
+++ b/collision_task.cc	Tue Dec 28 15:50:04 2010 +0900
@@ -88,10 +88,10 @@
     collision_task->set_param(3,(memaddr)tama_lv2_end);
     collision_task->set_param(4,(memaddr)laser_lv1_end);
 
+    collision_task->add_inData(p, sizeof(CHARACTER));
     collision_task->add_inData(property, sizeof(CollisionProperty));
-    collision_task->add_inData(p, sizeof(CHARACTER));
+    collision_task->add_outData(p, sizeof(CHARACTER));
     collision_task->add_outData(property, sizeof(CollisionProperty));
-    collision_task->add_outData(p, sizeof(CHARACTER));
     collision_task->set_post(free_property, (void*)property, NULL);
 
     collision_task->set_cpu(SPE_ANY);
diff -r 871f7d9a2f35 -r 813f5461daab ppe/Atari.cc
--- a/ppe/Atari.cc	Mon Dec 27 17:21:24 2010 +0900
+++ b/ppe/Atari.cc	Tue Dec 28 15:50:04 2010 +0900
@@ -12,9 +12,9 @@
     int tama_lv2_end = (int)smanager->get_param(3);
     int laser_lv1_end = (int)smanager->get_param(4);
 
+    CHARACTER *p =  (CHARACTER*)smanager->get_input(rbuf, 0);
     CollisionPropertyPtr property
-	= (CollisionPropertyPtr)smanager->get_input(rbuf, 0);
-    CHARACTER *p =  (CHARACTER*)smanager->get_input(rbuf, 1);
+	= (CollisionPropertyPtr)smanager->get_input(rbuf, 1);
 
     int *bomend = &property->bomend;
     int *enemycount = &property->enemycount;
diff -r 871f7d9a2f35 -r 813f5461daab ppe/task_object.h
--- a/ppe/task_object.h	Mon Dec 27 17:21:24 2010 +0900
+++ b/ppe/task_object.h	Tue Dec 28 15:50:04 2010 +0900
@@ -95,10 +95,9 @@
   int enemycount;
   int infg_level;
 
+  player jiki;
   stge lg;
   stge infg;
-  player jiki;
-  CHARACTER p;
 
   tama1 tama_lv1[20];
   tama2 tama_lv2[20];
diff -r 871f7d9a2f35 -r 813f5461daab state_task.cc
--- a/state_task.cc	Mon Dec 27 17:21:24 2010 +0900
+++ b/state_task.cc	Tue Dec 28 15:50:04 2010 +0900
@@ -140,9 +140,7 @@
     HTaskPtr state_task = tmanager->create_task(task_num);
     
     state_task->add_inData(p, sizeof(CHARACTER));
-
     state_task->add_outData(p, sizeof(CHARACTER));
-
     state_task->set_post(updateState, (void*)p, NULL);
 
     state_task->set_cpu(SPE_ANY);
@@ -159,9 +157,7 @@
 
     state_task->add_inData(p, sizeof(CHARACTER));
     state_task->add_inData(&jiki, sizeof(player));
-
     state_task->add_outData(p, sizeof(CHARACTER));
-
     state_task->set_post(updateState, (void*)p, NULL);
     
     state_task->set_cpu(SPE_ANY);
@@ -240,7 +236,7 @@
 CHARACTER*
 chara_state4(CHARACTER *p)
 {
-        p->task = STATE4;
+    p->task = STATE4;
     return withJikiTask(p);
 }