changeset 4:a87dd72ce1b3

collision task moved.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Tue, 14 Dec 2010 04:36:05 +0900
parents 3415feffc433
children c9e9b605f08e
files Dandy.cc game_task.h ppe/Atari.cc tcollision.cc
diffstat 4 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Dandy.cc	Tue Dec 14 01:00:10 2010 +0900
+++ b/Dandy.cc	Tue Dec 14 04:36:05 2010 +0900
@@ -49,6 +49,8 @@
 extern void keybord();
 static int gamesyokika(int gamef);
 static int game_pause(int);
+
+extern void task_init();
 //static char *pad_trace_file;
 
 /**
@@ -123,14 +125,6 @@
     return next;
 };
 
-
-
-
-static void
-task_init() 
-{
-}
-
 int
 TMmain(TaskManager *manager,int argc, char *argv[])
 {
--- a/game_task.h	Tue Dec 14 01:00:10 2010 +0900
+++ b/game_task.h	Tue Dec 14 04:36:05 2010 +0900
@@ -1,2 +1,2 @@
 // Game で使用する Task ID
-    ATARI,
+     ATARI,
--- a/ppe/Atari.cc	Tue Dec 14 01:00:10 2010 +0900
+++ b/ppe/Atari.cc	Tue Dec 14 04:36:05 2010 +0900
@@ -1,6 +1,5 @@
 #include "Atari.h"
 #include "tobject.h"
-#include "Func.h"
 
 SchedDefineTask(Atari);
 
--- a/tcollision.cc	Tue Dec 14 01:00:10 2010 +0900
+++ b/tcollision.cc	Tue Dec 14 04:36:05 2010 +0900
@@ -94,7 +94,7 @@
 
     collision_task->add_inData(property, sizeof(CollisionProperty));
     collision_task->add_outData(property, sizeof(CollisionProperty));
-//    collision_task->set_post(free_property, property, p);
+    collision_task->set_post(free_property, property, p);
 
     collision_task->set_cpu(SPE_ANY);
     collision_task->spawn();