diff spe/chara_state33.cc @ 49:f4140672ef9f

fix.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 21 Jan 2011 22:18:28 +0900
parents c330ded6d728
children cfd42ee2ad28
line wrap: on
line diff
--- a/spe/chara_state33.cc	Sat Jan 15 19:13:03 2011 +0900
+++ b/spe/chara_state33.cc	Fri Jan 21 22:18:28 2011 +0900
@@ -1,19 +1,35 @@
-#include "chara_state33.h"
-#include "tobject.h"
+#include "task_base.h"
+#include "task_object.h"
 
-SchedDefineTask(STATE33);
+SchedDefineTask1(State33, state33);
 
 static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
+state33(SchedTask *smanager, void *rbuf, void *wbuf)
 {
+    int enemystate_11 = (int)smanager->get_param(4);
+    int enemystate_19 = (int)smanager->get_param(5);
+
+    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);
+    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 
     if (kyeenemyno->f == FALSE)
     {
-	Bom(p->x, p->y);
+	length = 1;
+	smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	smanager->setup_outputData();
+	CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
+	ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	sprite->flag = true;
+	sprite->length = length;
+
+	Bom(p->x, p->y, &sprite->data[0]);
 	p->f = FALSE;
-	p->state = delete_chara;
-	p->collision = noaction;
+	p->task = DELETE_CHARA;
+
+	*q = *p;
 	return 0;
     }
     p->x = kyeenemyno->x + 32;
@@ -22,11 +38,12 @@
     {
 	p->x = kyeenemyno->x + 32 - 4;
 	p->y = kyeenemyno->y;
-	p->charano = enemystate[19].charano;
+	p->charano = enemystate_19;
     }
     if (rinkf1 == 6)
     {
-	p->charano = enemystate[11].charano;
+	p->charano = enemystate_11;
     }
+    *q = *p;
     return 0;
 }