# HG changeset patch
# User koba <koba@cr.ie.u-ryukyu.ac.jp>
# Date 1293386282 -32400
# Node ID c4210c1053e85fe1adcfb5c32140a68fe5c4e249
# Parent  ee4c488d48a375c1ee218d6668ff2763f09a6072
add state7.

diff -r ee4c488d48a3 -r c4210c1053e8 TaskDandy.cc
--- a/TaskDandy.cc	Mon Dec 27 02:35:06 2010 +0900
+++ b/TaskDandy.cc	Mon Dec 27 02:58:02 2010 +0900
@@ -280,6 +280,7 @@
 	// timeprof_end(timeprof_move);
 	state_update();
 	asteroidi = 0;
+	printf("frame = %d\n", filpcount);
 	//charpatern();
 	//bosguage();
 
diff -r ee4c488d48a3 -r c4210c1053e8 ppe/chara_state7.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ppe/chara_state7.cc	Mon Dec 27 02:58:02 2010 +0900
@@ -0,0 +1,23 @@
+#include "task_base.h"
+#include "task_object.h"
+
+SchedDefineTask(State7);
+
+static int
+run(SchedTask *smanager, void *rbuf, void *wbuf)
+{
+    CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
+    TamaContainerPtr tama = (TamaContainerPtr)smanager->get_input(rbuf, 1);
+
+    p->x += p->vx;
+    p->y += p->vy;
+    if((p->dt1 == 60) || (p->dt1 == 90)
+       || (p->dt1 == 30))
+    {
+	Puttama(1, p->x, p->y, tama);
+    }
+    p->dt1++;
+    p->task = STATE7;
+    smanager->swap();
+    return 0;
+}
diff -r ee4c488d48a3 -r c4210c1053e8 ppe/task_init.cc
--- a/ppe/task_init.cc	Mon Dec 27 02:35:06 2010 +0900
+++ b/ppe/task_init.cc	Mon Dec 27 02:58:02 2010 +0900
@@ -11,6 +11,7 @@
 SchedExternTask(State4);
 SchedExternTask(State5);
 SchedExternTask(State6);
+SchedExternTask(State7);
 
 SchedExternTask(State20);
 SchedExternTask(State21);
@@ -33,6 +34,7 @@
     SchedRegisterTask(STATE4, State4);
     SchedRegisterTask(STATE5, State5);
     SchedRegisterTask(STATE6, State6);
+    SchedRegisterTask(STATE7, State7);
 
     SchedRegisterTask(STATE20, State20);
     SchedRegisterTask(STATE21, State21);
diff -r ee4c488d48a3 -r c4210c1053e8 schedule3.c
--- a/schedule3.c	Mon Dec 27 02:35:06 2010 +0900
+++ b/schedule3.c	Mon Dec 27 02:58:02 2010 +0900
@@ -175,7 +175,6 @@
 	    Putenemy(40, 1280 - 256 - 128, 1088, 0, -1, chara_state6);
 	    break;
 
-#if 0
 	case FRAME_RATE * 80:
 	    Putenemy(42, rand() % (1280 - 256) + 128, -128, 0, 1, chara_state7);
 	    break;
@@ -229,7 +228,7 @@
 	    Putenemy(41, 256, -128, 0, 1, chara_state7);
 	    Putenemy(41, 1280 - 256 - 128, -128, 0, 1, chara_state7);
 	    break;
-
+#if 0
 	case FRAME_RATE * 130:
 	    SoundStop();
 	    SoundPlay(4);
diff -r ee4c488d48a3 -r c4210c1053e8 state_task.cc
--- a/state_task.cc	Mon Dec 27 02:35:06 2010 +0900
+++ b/state_task.cc	Mon Dec 27 02:58:02 2010 +0900
@@ -194,7 +194,7 @@
   return p;
 }
 
-CHARACTER *
+CHARACTER*
 delete_chara(CHARACTER *p)
 {
 
@@ -205,65 +205,64 @@
   return parent;
 }
 
-CHARACTER * chara_state0(CHARACTER *p)
+CHARACTER*
+chara_state0(CHARACTER *p)
 {
     p->task = STATE0;
     return SimpleStateTask(p);
 }
 
-CHARACTER * chara_state1(CHARACTER *p)
+CHARACTER*
+chara_state1(CHARACTER *p)
 {
     p->task = STATE1;
     return SimpleStateTask(p);
 }
 
-CHARACTER * chara_state2(CHARACTER *p)
+CHARACTER*
+chara_state2(CHARACTER *p)
 {
     p->task = STATE2;
     return SimpleStateTask(p);
 }
 
 
-CHARACTER * chara_state3(CHARACTER *p)
+CHARACTER*
+chara_state3(CHARACTER *p)
 {
     p->task = STATE3;
     return putTamaTask1(p);
 }
 
-CHARACTER * chara_state4(CHARACTER *p)
+CHARACTER*
+chara_state4(CHARACTER *p)
 {
         p->task = STATE4;
     return withJikiTask(p);
 }
 
-CHARACTER * chara_state5(CHARACTER *p)
+CHARACTER*
+chara_state5(CHARACTER *p)
 {
     p->task = STATE5;
     return withJikiTask(p);
 }
 
-CHARACTER * chara_state6(CHARACTER *p)
+CHARACTER*
+chara_state6(CHARACTER *p)
 {
     p->task = STATE6;
     return withJikiTask(p);
 }
 
-#if 0
-CHARACTER * chara_state7(CHARACTER *p)
+CHARACTER*
+chara_state7(CHARACTER *p)
 {
-  p->x += p->vx;
-  p->y += p->vy;
-  if((p->dt1 == 60) || (p->dt1 == 90)
-     || (p->dt1 == 30))
-    {
-      Puttama(1, p->x, p->y);
-    }
-  p->dt1++;
-  p->state = chara_state7;
-  //PutSprite(count, p->x, p->y, p->charano);
-  return p;
+    p->task = STATE7;
+    return putTamaTask1(p);
 }
 
+#if 0
 // state1 boss patern
 CHARACTER * chara_state8(CHARACTER *p)
 {