diff spe/chara_state4.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_state4.cc	Sat Jan 15 19:13:03 2011 +0900
+++ b/spe/chara_state4.cc	Fri Jan 21 22:18:28 2011 +0900
@@ -1,22 +1,25 @@
-#include "chara_state3.h"
-#include "tobject.h"
+#include "task_base.h"
+#include "task_object.h"
 
-SchedDefineTask(STATE4);
+SchedDefineTask1(State4, state4);
 
 static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
+state4(SchedTask *smanager, void *rbuf, void *wbuf)
 {
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
+    CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);    
+    player *jiki = (player*)smanager->get_input(rbuf, 1);
     
     p->y += p->vy;
     p->x += p->vx;
-    if(p->y < jiki.y && p->y + 16 > jiki.y)
+    if(p->y < jiki->y && p->y + 16 > jiki->y)
     {
 	p->vy = -2;
-	p->vx = ((jiki.x > p->x) ? 4 : -4);
+	p->vx = ((jiki->x > p->x) ? 4 : -4);
 	p->task = STATE7;
     }
     else p->task = STATE4;
-    smanager->swap();
+
+    *q = *p;
     return 0;
 }