diff state_task.cc @ 27:871f7d9a2f35

running.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Mon, 27 Dec 2010 17:21:24 +0900
parents c4210c1053e8
children 813f5461daab
line wrap: on
line diff
--- a/state_task.cc	Mon Dec 27 02:58:02 2010 +0900
+++ b/state_task.cc	Mon Dec 27 17:21:24 2010 +0900
@@ -66,25 +66,29 @@
     SetTaskState(STATE4, chara_state4);
     SetTaskState(STATE5, chara_state5);
     SetTaskState(STATE6, chara_state6);
+    SetTaskState(STATE7, chara_state7);
 #if 0
-    SetTaskState(STATE7, chara_state7);
     SetTaskState(STATE8, chara_state8);
     SetTaskState(STATE9, chara_state9);
     SetTaskState(STATE10, chara_state10);
     SetTaskState(STATE11, chara_state11);
     SetTaskState(STATE12, chara_state12);
     SetTaskState(STATE13, chara_state13);
+#endif
     SetTaskState(STATE20, chara_state20);
     SetTaskState(STATE21, chara_state21);
     SetTaskState(STATE22, chara_state22);
     SetTaskState(STATE23, chara_state23);
+#if 0
     SetTaskState(STATE24, chara_state24);
     SetTaskState(STATE25, chara_state25);
     SetTaskState(STATE26, chara_state26);
     SetTaskState(STATE27, chara_state27);
     SetTaskState(STATE28, chara_state28);
     SetTaskState(STATE29, chara_state29);
+#endif
     SetTaskState(STATE30, chara_state30);
+#if 0
     SetTaskState(STATE31, chara_state31);
     SetTaskState(STATE32, chara_state32);
     SetTaskState(STATE33, chara_state33);
@@ -111,7 +115,7 @@
     CHARACTER *p = (CHARACTER*)chara;
 
     int num = GetStateNum(p->task);
-    p=state_list[num](p);
+    p->state = state_list[num];
 }
 
 void
@@ -226,7 +230,6 @@
     return SimpleStateTask(p);
 }
 
-
 CHARACTER*
 chara_state3(CHARACTER *p)
 {
@@ -525,7 +528,7 @@
     return SimpleStateTask(p);
 }
 
-#if 0
+
 //ここまでgetate boss
 
 
@@ -533,13 +536,15 @@
 {
     return SimpleStateTask(p);
 }
-	  
+
+
 CHARACTER * chara_state23(CHARACTER *p)
 {
-  p=asteroid(p);
+//  p=asteroid(p);
   return p;
 }
 
+#if 0
 CHARACTER * chara_state24(CHARACTER *p)
 {
   kyeenemyno = p;