diff spe/chara_state41.cc @ 60:cfd42ee2ad28

change makefile, spe/task. adjust scale api. worked on ps3-ppe.
author yutaka@localhost.localdomain
date Sun, 06 Feb 2011 17:16:43 +0900
parents f4140672ef9f
children
line wrap: on
line diff
--- a/spe/chara_state41.cc	Mon Feb 07 03:31:18 2011 +0900
+++ b/spe/chara_state41.cc	Sun Feb 06 17:16:43 2011 +0900
@@ -12,14 +12,14 @@
     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);
+    int rinkf1 = *(int*)smanager->get_input(rbuf, 2);
 
     if (enemy_part2_f == FALSE)
     {
 	CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 //	Bom(p->x, p->y);
 	p->f = FALSE;
-	p->task = DELETE_CHARA;
+	p->collision_task = true;
       
 	*q = *p;
 	return 0;
@@ -31,9 +31,9 @@
 	if ((p->dt2 < 16))
 	{
 	    length = 1;
-	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->set_outputSize(1, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
 	    smanager->setup_outputData();
-	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 1);
 	    sprite->flag = true;
 	    sprite->length = length;
 
@@ -54,9 +54,9 @@
 	if (p->dt1 % 15 == 1) 
 	{
 	    length = 1;
-	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->set_outputSize(1, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
 	    smanager->setup_outputData();
-	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 1);
 	    sprite->flag = true;
 	    sprite->length = length;
 
@@ -68,9 +68,9 @@
 	if (p->dt2 != 0)
 	{
 	    length = 1;
-	    smanager->set_outputSize(2, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
+	    smanager->set_outputSize(1, sizeof(ObjContainer)+sizeof(ObjData)*(length-1));
 	    smanager->setup_outputData();
-	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 2);
+	    ObjContainerPtr sprite = (ObjContainerPtr)smanager->get_output(wbuf, 1);
 	    sprite->flag = true;
 	    sprite->length = length;
 
@@ -82,7 +82,7 @@
 	    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 
 	    p->f = FALSE;
-	    p->task = DELETE_CHARA;
+	    p->collision_task = true;
 
 	    *q = *p;
 	    return 0;