--- a/spe/chara_state41.cc	Sat Jan 15 19:13:03 2011 +0900
+++ b/spe/chara_state41.cc	Fri Jan 21 22:18:28 2011 +0900
@@ -1,19 +1,27 @@
-#include "chara_state41.h"
-#include "tobject.h"
+#include "task_base.h"
+#include "task_object.h"
 
-SchedDefineTask(STATE41);
+SchedDefineTask1(State41, state41);
 
 static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
+state41(SchedTask *smanager, void *rbuf, void *wbuf)
 {
+    int enemy_part2_f = (int)smanager->get_param(1);
+    int rand = (int)smanager->get_param(6);
+    
+    int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
+    CHARACTER *kyeenemyno = (CHARACTER*)smanager->get_input(rbuf, 1);
+    int rinkf1 = *(int*)smanager->get_input(rbuf, 3);
 
-    if (enemy_part2->f == FALSE)
+    if (enemy_part2_f == FALSE)
     {
-	Bom(p->x, p->y);
+	CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
+//	Bom(p->x, p->y);
 	p->f = FALSE;
-	p->state = delete_chara;
-	p->collision = noaction;
+	p->task = DELETE_CHARA;
+      
+	*q = *p;
 	return 0;
     }
     p->x = kyeenemyno->x - 20 - 7;
@@ -22,12 +30,22 @@
     {
 	if ((p->dt2 < 16))
 	{
+	    length = 1;
+	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->setup_outputData();
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    sprite->flag = true;
+	    sprite->length = length;
+
 	    p->dt2++;
-	    DefSprite(77, "boss2_leftarmbattery", p->dt2, 16, 480, boss);	/*左腕アップアーム砲 */
+	    DefSprite(77, p->dt2, 16, 480, &sprite->data[0]);	/*左腕アップアーム砲 */
 	}
 	else
 	{
+	    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
+
 	    rinkf1 = 9;
+	    *q = *p;
 	    return 0;
 	}
     }
@@ -35,24 +53,44 @@
     {
 	if (p->dt1 % 15 == 1) 
 	{
-	    Puttama(9 + rand() % 2, p->x, p->y);
+	    length = 1;
+	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->setup_outputData();
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    sprite->flag = true;
+	    sprite->length = length;
+
+	    Puttama(9 + rand % 2, p->x, p->y, &sprite->data[0]);
 	}
     }
     if (rinkf1 == 10)
     {
 	if (p->dt2 != 0)
 	{
+	    length = 1;
+	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->setup_outputData();
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    sprite->flag = true;
+	    sprite->length = length;
+
 	    p->dt2--;
-	    DefSprite(77, "boss2_leftarmbattery", p->dt2, 16, 480, boss);
+	    DefSprite(77, p->dt2, 16, 480, &sprite->data[0]);
 	}
 	else
 	{
+	    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
+
 	    p->f = FALSE;
-	    p->state = delete_chara;
-	    p->collision = noaction;
+	    p->task = DELETE_CHARA;
+
+	    *q = *p;
 	    return 0;
 	}
     }
+    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
+
     p->dt1++;
+    *q = *p;
     return 0;
 }