Mercurial > hg > Members > koba > t_dandy

changeset 50:0d29c70579c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix spe files.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 21 Jan 2011 22:31:08 +0900
parents f4140672ef9f
children 2e123c4bf5ca
files spe/chara_state0.h spe/chara_state1.h spe/chara_state10.h spe/chara_state11.h spe/chara_state12.h spe/chara_state13.h spe/chara_state2.h spe/chara_state20.h spe/chara_state21.h spe/chara_state22.h spe/chara_state23.cc spe/chara_state23.h spe/chara_state24.cc spe/chara_state24.h spe/chara_state25.h spe/chara_state26.h spe/chara_state27.h spe/chara_state28.h spe/chara_state29.h spe/chara_state3.h spe/chara_state30.h spe/chara_state31.h spe/chara_state32.h spe/chara_state33.h spe/chara_state34.h spe/chara_state35.h spe/chara_state4.h spe/chara_state40.h spe/chara_state400.h spe/chara_state401.h spe/chara_state402.h spe/chara_state41.h spe/chara_state410.cc spe/chara_state410.h spe/chara_state411.h spe/chara_state5.h spe/chara_state500.h spe/chara_state501.h spe/chara_state6.h spe/chara_state600.h spe/chara_state601.h spe/chara_state602.h spe/chara_state7.h spe/chara_state8.h spe/chara_state9.h spe/task_init.cc
diffstat 46 files changed, 112 insertions(+), 387 deletions(-) [+]
line wrap: on
line diff
--- a/spe/chara_state0.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state1.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state10.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state11.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state12.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state13.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state2.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state20.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state21.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state22.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state23.cc	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#include "chara_state23.h"
-#include "tobject.h"
-
-SchedDefineTask(STATE23);
-
-static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
-{
-    CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
-
-    p=asteroid(p);
-    return 0;
-}
--- a/spe/chara_state23.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state24.cc	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#include "chara_state24.h"
-#include "tobject.h"
-
-SchedDefineTask(STATE24);
-
-static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
-{
-    CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
-
-    kyeenemyno = p;
-    tekino0 = 0;
-    enemy_part1 = p->next;
-    enemy_part2 = enemy_part1->next;
-    enemy_part3 = enemy_part2->next;
-    enemy_part4 = enemy_part3->next;
-    enemy_part5 = enemy_part4->next;
-    rinkx = 0;
-    rinky = 0;
-    rinkf1 = 0;
-    rinkf2 = 0;
-    p->task = STATE25;
-    return 0;
-}
--- a/spe/chara_state24.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state25.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state26.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state27.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state28.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state29.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state3.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state30.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state31.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state32.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state33.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state34.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state35.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state4.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state40.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state400.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state401.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state402.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state41.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state410.cc	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#include "chara_state410.h"
-#include "tobject.h"
-
-SchedDefineTask(STATE410);
-
-static int
-run(SchedTask *smanager, void *rbuf, void *wbuf)
-{
-    CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
-
-    kyeenemyno = p;
-    p->task = STATE411;
-    return 0;
-}
--- a/spe/chara_state410.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state411.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state5.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state500.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state501.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state6.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state600.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state601.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state602.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state7.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state8.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- a/spe/chara_state9.h	Fri Jan 21 22:18:28 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#ifndef INCLUDE_COLLISION
-#define INCLUDE_COLLISION
-
-#ifndef INCLUDED_SCHED_TASK
-#include "SchedTask.h"
-#endif
-
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/spe/task_init.cc	Fri Jan 21 22:31:08 2011 +0900
@@ -0,0 +1,112 @@
+#include "Func.h"
+#include "Scheduler.h"
+
+/* 必ずこの位置に書いて */
+SchedExternTask(Atari);
+
+SchedExternTask(State0);
+SchedExternTask(State1);
+SchedExternTask(State2);
+SchedExternTask(State3);
+SchedExternTask(State4);
+SchedExternTask(State5);
+SchedExternTask(State6);
+SchedExternTask(State7);
+SchedExternTask(State8);
+SchedExternTask(State9);
+SchedExternTask(State10);
+SchedExternTask(State11);
+SchedExternTask(State12);
+SchedExternTask(State13);
+
+SchedExternTask(State20);
+SchedExternTask(State21);
+SchedExternTask(State22);
+SchedExternTask(State25);
+SchedExternTask(State26);
+SchedExternTask(State27);
+SchedExternTask(State28);
+SchedExternTask(State29);
+SchedExternTask(State30);
+SchedExternTask(State31);
+SchedExternTask(State32);
+SchedExternTask(State33);
+SchedExternTask(State34);
+SchedExternTask(State35);
+
+SchedExternTask(State40);
+SchedExternTask(State41);
+
+SchedExternTask(State400);
+SchedExternTask(State401);
+SchedExternTask(State402);
+
+SchedExternTask(State411);
+
+SchedExternTask(State500);
+SchedExternTask(State501);
+
+SchedExternTask(State600);
+SchedExternTask(State601);
+SchedExternTask(State602);
+
+SchedExternTask(Asteroid);
+
+/**
+ * この関数は ../spe/spe-main と違って
+ * 自分で呼び出せばいい関数なので
+ * 好きな関数名でおk (SchedRegisterTask は必須)
+ */
+void
+task_init(void)
+{
+    SchedRegisterTask(ATARI, Atari);
+
+    SchedRegisterTask(STATE0, State0);
+    SchedRegisterTask(STATE1, State1);
+    SchedRegisterTask(STATE2, State2);
+    SchedRegisterTask(STATE3, State3);
+    SchedRegisterTask(STATE4, State4);
+    SchedRegisterTask(STATE5, State5);
+    SchedRegisterTask(STATE6, State6);
+    SchedRegisterTask(STATE7, State7);
+    SchedRegisterTask(STATE8, State8);
+    SchedRegisterTask(STATE9, State9);
+    SchedRegisterTask(STATE10, State10);
+    SchedRegisterTask(STATE11, State11);
+    SchedRegisterTask(STATE12, State12);
+    SchedRegisterTask(STATE13, State13);
+
+    SchedRegisterTask(STATE20, State20);
+    SchedRegisterTask(STATE21, State21);
+    SchedRegisterTask(STATE22, State22);
+    SchedRegisterTask(STATE25, State25);
+    SchedRegisterTask(STATE26, State26);
+    SchedRegisterTask(STATE27, State27);
+    SchedRegisterTask(STATE28, State28);
+    SchedRegisterTask(STATE29, State29);
+    SchedRegisterTask(STATE30, State30);
+    SchedRegisterTask(STATE31, State31);
+    SchedRegisterTask(STATE32, State32);
+    SchedRegisterTask(STATE33, State33);
+    SchedRegisterTask(STATE34, State34);
+    SchedRegisterTask(STATE35, State35);
+
+    SchedRegisterTask(STATE40, State40);
+    SchedRegisterTask(STATE41, State41);
+
+    SchedRegisterTask(STATE400, State400);
+    SchedRegisterTask(STATE401, State401);
+    SchedRegisterTask(STATE402, State402);
+
+    SchedRegisterTask(STATE411, State411);
+
+    SchedRegisterTask(STATE500, State500);
+    SchedRegisterTask(STATE501, State501);
+
+    SchedRegisterTask(STATE600, State600);
+    SchedRegisterTask(STATE601, State601);
+    SchedRegisterTask(STATE602, State602);
+
+    SchedRegisterTask(ASTEROID_TASK, Asteroid);
+}