diff state_task.cc @ 26:c4210c1053e8

add state7.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Mon, 27 Dec 2010 02:58:02 +0900
parents ee4c488d48a3
children 871f7d9a2f35
line wrap: on
line diff
--- 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)
 {